admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use I420Buffer::ScaleFrom to clean scaling in SimulcastEncoderAdapter

Browse Source 
Bug: None
Change-Id: Ie02c18a4ce5b20f2a600a01874dc82f3af7d5d42
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168485
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@google.com>
Cr-Commit-Position: refs/heads/master@{#30497}
This commit is contained in:
Evan Shrubsole 2020-02-11 14:19:44 +01:00 committed by Commit Bot
parent e67c6bcd06
commit ccd49d9af6
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
media/BUILD.gn
View File

@ -197,7 +197,6 @@ rtc_library("rtc_simulcast_encoder_adapter") {
"../system_wrappers",
"../system_wrappers:field_trial",
"//third_party/abseil-cpp/absl/types:optional",
"//third_party/libyuv",
]
}

10
media/engine/simulcast_encoder_adapter.cc
View File

@ -34,7 +34,6 @@
#include "rtc_base/experiments/rate_control_settings.h"
#include "rtc_base/logging.h"
#include "system_wrappers/include/field_trial.h"
#include "third_party/libyuv/include/libyuv/scale.h"
namespace {
@ -433,14 +432,7 @@ int SimulcastEncoderAdapter::Encode(
I420Buffer::Create(dst_width, dst_height);
rtc::scoped_refptr<I420BufferInterface> src_buffer =
input_image.video_frame_buffer()->ToI420();
libyuv::I420Scale(src_buffer->DataY(), src_buffer->StrideY(),
src_buffer->DataU(), src_buffer->StrideU(),
src_buffer->DataV(), src_buffer->StrideV(), src_width,
src_height, dst_buffer->MutableDataY(),
dst_buffer->StrideY(), dst_buffer->MutableDataU(),
dst_buffer->StrideU(), dst_buffer->MutableDataV(),
dst_buffer->StrideV(), dst_width, dst_height,
libyuv::kFilterBilinear);
dst_buffer->ScaleFrom(*src_buffer);
// UpdateRect is not propagated to lower simulcast layers currently.
// TODO(ilnik): Consider scaling UpdateRect together with the buffer.