zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace GetScalingSettings() with GetEnocderInfo() in TestEncoder

Browse Source 
Bug: webrtc:9890
Change-Id: I00c0d95739fe1e90df464a6a7402410ee070f840
Reviewed-on: https://webrtc-review.googlesource.com/c/109028
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25500}
This commit is contained in:
Erik Språng
2018-11-05 12:57:17 +01:00
committed by Commit Bot
parent f418bcbcf1
commit aed3070ad4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
video/video_stream_encoder_unittest.cc
View File

@ -508,11 +508,14 @@ class VideoStreamEncoderTest : public ::testing::Test {
block_next_encode_ = true; block_next_encode_ = true;
} }
VideoEncoder::ScalingSettings GetScalingSettings() const override { VideoEncoder::EncoderInfo GetEncoderInfo() const override {
EncoderInfo info;
rtc::CritScope lock(&local_crit_sect_); rtc::CritScope lock(&local_crit_sect_);
if (quality_scaling_) if (quality_scaling_) {
return VideoEncoder::ScalingSettings(1, 2, kMinPixelsPerFrame); info.scaling_settings =
return VideoEncoder::ScalingSettings::kOff; VideoEncoder::ScalingSettings(1, 2, kMinPixelsPerFrame);
}
return info;
} }
void ContinueEncode() { continue_encode_event_.Set(); } void ContinueEncode() { continue_encode_event_.Set(); }