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

Disable frame dropping from codec settings.

Browse Source 
This was broken in https://webrtc-review.googlesource.com/c/src/+/99062/

Bug: webrtc:9734
Change-Id: Ibce41a732cb2e943354c87fbb05be0dd218acf27
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/242366
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35568}
This commit is contained in:
Sergey Silkin
2021-12-22 12:09:37 +01:00
committed by WebRTC LUCI CQ
parent dbef2bd276
commit 34aba3cefd
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View File

@ -864,6 +864,7 @@ uint32_t LibvpxVp8Encoder::FrameDropThreshold(size_t spatial_idx) const {
RTC_DCHECK(frame_buffer_controller_); RTC_DCHECK(frame_buffer_controller_);
RTC_DCHECK_LT(spatial_idx, frame_buffer_controller_->StreamCount()); RTC_DCHECK_LT(spatial_idx, frame_buffer_controller_->StreamCount());
enable_frame_dropping = enable_frame_dropping =
enable_frame_dropping &&
frame_buffer_controller_->SupportsEncoderFrameDropping(spatial_idx); frame_buffer_controller_->SupportsEncoderFrameDropping(spatial_idx);
return enable_frame_dropping ? 30 : 0; return enable_frame_dropping ? 30 : 0;
} }

5
modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
View File

@ -76,9 +76,6 @@ class TestVp8Impl : public VideoCodecUnitTest {
webrtc::test::CodecSettings(kVideoCodecVP8, codec_settings); webrtc::test::CodecSettings(kVideoCodecVP8, codec_settings);
codec_settings->width = kWidth; codec_settings->width = kWidth;
codec_settings->height = kHeight; codec_settings->height = kHeight;
codec_settings->VP8()->denoisingOn = true;
codec_settings->VP8()->frameDroppingOn = false;
codec_settings->VP8()->automaticResizeOn = false;
codec_settings->VP8()->complexity = VideoCodecComplexity::kComplexityNormal; codec_settings->VP8()->complexity = VideoCodecComplexity::kComplexityNormal;
} }
@ -408,7 +405,6 @@ TEST_F(TestVp8Impl, EncoderWith2TemporalLayers) {
} }
TEST_F(TestVp8Impl, ScalingDisabledIfAutomaticResizeOff) { TEST_F(TestVp8Impl, ScalingDisabledIfAutomaticResizeOff) {
codec_settings_.VP8()->frameDroppingOn = true;
codec_settings_.VP8()->automaticResizeOn = false; codec_settings_.VP8()->automaticResizeOn = false;
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
encoder_->InitEncode(&codec_settings_, kSettings)); encoder_->InitEncode(&codec_settings_, kSettings));
@ -419,7 +415,6 @@ TEST_F(TestVp8Impl, ScalingDisabledIfAutomaticResizeOff) {
} }
TEST_F(TestVp8Impl, ScalingEnabledIfAutomaticResizeOn) { TEST_F(TestVp8Impl, ScalingEnabledIfAutomaticResizeOn) {
codec_settings_.VP8()->frameDroppingOn = true;
codec_settings_.VP8()->automaticResizeOn = true; codec_settings_.VP8()->automaticResizeOn = true;
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
encoder_->InitEncode(&codec_settings_, kSettings)); encoder_->InitEncode(&codec_settings_, kSettings));