Use VideoFrameBuffer::Scale in encoder wrappers
This sincludes the SimulcastEncoderAdapter and the
VideoEncoderSoftwareFallbackWrapper. This avoids converting
the frame when that is not needed.
Bug: webrtc:11976
Change-Id: I686725ecfb79c3b8d87d587a907da1602483bfe8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187343
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@google.com>
Cr-Commit-Position: refs/heads/master@{#32389}
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index 354e8c2..54f4731 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
@@ -367,9 +367,12 @@
RTC_LOG(LS_ERROR) << "Failed to convert from to I420";
return WEBRTC_VIDEO_CODEC_ENCODER_FAILURE;
}
- rtc::scoped_refptr<I420Buffer> dst_buffer =
- I420Buffer::Create(codec_settings_.width, codec_settings_.height);
- dst_buffer->ScaleFrom(*src_buffer);
+ rtc::scoped_refptr<VideoFrameBuffer> dst_buffer =
+ src_buffer->Scale(codec_settings_.width, codec_settings_.height);
+ if (!dst_buffer) {
+ RTC_LOG(LS_ERROR) << "Failed to scale video frame.";
+ return WEBRTC_VIDEO_CODEC_ENCODER_FAILURE;
+ }
VideoFrame scaled_frame = frame;
scaled_frame.set_video_frame_buffer(dst_buffer);
scaled_frame.set_update_rect(VideoFrame::UpdateRect{
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index 6e937578..961de15 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -377,7 +377,7 @@
}
// Temporary thay may hold the result of texture to i420 buffer conversion.
- rtc::scoped_refptr<I420BufferInterface> src_buffer;
+ rtc::scoped_refptr<VideoFrameBuffer> src_buffer;
int src_width = input_image.width();
int src_height = input_image.height();
for (size_t stream_idx = 0; stream_idx < streaminfos_.size(); ++stream_idx) {
@@ -433,12 +433,14 @@
}
} else {
if (src_buffer == nullptr) {
- src_buffer = input_image.video_frame_buffer()->ToI420();
+ src_buffer = input_image.video_frame_buffer();
}
- rtc::scoped_refptr<I420Buffer> dst_buffer =
- I420Buffer::Create(dst_width, dst_height);
-
- dst_buffer->ScaleFrom(*src_buffer);
+ rtc::scoped_refptr<VideoFrameBuffer> dst_buffer =
+ src_buffer->Scale(dst_width, dst_height);
+ if (!dst_buffer) {
+ RTC_LOG(LS_ERROR) << "Failed to scale video frame";
+ return WEBRTC_VIDEO_CODEC_ENCODER_FAILURE;
+ }
// UpdateRect is not propagated to lower simulcast layers currently.
// TODO(ilnik): Consider scaling UpdateRect together with the buffer.