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

Make sure initial framedrop is off where quality scaling is off.

Browse Source 
BUG=chromium:689972,chromium:689915

Review-Url: https://codereview.webrtc.org/2684683004
Cr-Commit-Position: refs/heads/master@{#16602}
This commit is contained in:
kthelgason 2017-02-14 00:46:51 -08:00 committed by Commit bot
parent 1a95e61e37
commit ad9010c983
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/video/vie_encoder.cc
View File

@ -474,6 +474,7 @@ void ViEEncoder::ConfigureQualityScaler() {
}
} else {
quality_scaler_.reset(nullptr);
initial_rampup_ = kMaxInitialFramedrop;
}
stats_proxy_->SetResolutionRestrictionStats(
degradation_preference_allows_scaling, scale_counter_[kCpu] > 0,

22
webrtc/video/vie_encoder_unittest.cc
View File

@ -251,7 +251,9 @@ class ViEEncoderTest : public ::testing::Test {
}
VideoEncoder::ScalingSettings GetScalingSettings() const override {
return VideoEncoder::ScalingSettings(true, 1, 2);
if (quality_scaling_)
return VideoEncoder::ScalingSettings(true, 1, 2);
return VideoEncoder::ScalingSettings(false);
}
void ContinueEncode() { continue_encode_event_.Set(); }
@ -263,6 +265,8 @@ class ViEEncoderTest : public ::testing::Test {
EXPECT_EQ(ntp_time_ms_, ntp_time_ms);
}
void SetQualityScaling(bool b) { quality_scaling_ = b; }
private:
int32_t Encode(const VideoFrame& input_image,
const CodecSpecificInfo* codec_specific_info,
@ -295,6 +299,7 @@ class ViEEncoderTest : public ::testing::Test {
int64_t ntp_time_ms_ = 0;
int last_input_width_ = 0;
int last_input_height_ = 0;
bool quality_scaling_ = true;
};
class TestSink : public ViEEncoder::EncoderSink {
@ -1176,6 +1181,21 @@ TEST_F(ViEEncoderTest, InitialFrameDropOffWithMaintainResolutionPreference) {
vie_encoder_->Stop();
}
TEST_F(ViEEncoderTest, InitialFrameDropOffWhenEncoderDisabledScaling) {
int frame_width = 640;
int frame_height = 360;
fake_encoder_.SetQualityScaling(false);
vie_encoder_->OnBitrateUpdated(kLowTargetBitrateBps, 0, 0);
video_source_.IncomingCapturedFrame(
CreateFrame(1, frame_width, frame_height));
// Frame should not be dropped, even if it's too large.
sink_.WaitForEncodedFrame(1);
vie_encoder_->Stop();
fake_encoder_.SetQualityScaling(true);
}
// TODO(sprang): Extend this with fps throttling and any "balanced" extensions.
TEST_F(ViEEncoderTest, AdaptsResolutionOnOveruse) {
vie_encoder_->OnBitrateUpdated(kTargetBitrateBps, 0, 0);