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

Reland "Fix LibvpxVp8Encoder::FrameDropThreshold"

Browse Source 
This is a reland of 159e53a66eceb79003741ba0d990c502595c27bb
Reason for reland: Got Aliby for Android FEC test flakes.

Original change's description:
> Fix LibvpxVp8Encoder::FrameDropThreshold
>
> Bug: webrtc:10387
> Change-Id: I17b575546d6718f905429ac45705cb923ee52c10
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126232
> Commit-Queue: Elad Alon <eladalon@webrtc.org>
> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27032}

Bug: webrtc:10387
Change-Id: Iaed760464d71ccfc6ad0e442b99f20c40c03e1e2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126762
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27058}
This commit is contained in:
Elad Alon
2019-03-08 11:05:57 +01:00
committed by Commit Bot
parent e448a3fb54
commit a5c0ba1861
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,10 +695,9 @@ uint32_t LibvpxVp8Encoder::FrameDropThreshold(size_t spatial_idx) const {
// setting, as eg. ScreenshareLayers does not work as intended with frame // setting, as eg. ScreenshareLayers does not work as intended with frame
// dropping on and DefaultTemporalLayers will have performance issues with // dropping on and DefaultTemporalLayers will have performance issues with
// frame dropping off. // frame dropping off.
if (frame_buffer_controllers_.size() <= spatial_idx) { RTC_CHECK_LT(spatial_idx, frame_buffer_controllers_.size());
enable_frame_dropping = enable_frame_dropping =
frame_buffer_controllers_[spatial_idx]->SupportsEncoderFrameDropping(); frame_buffer_controllers_[spatial_idx]->SupportsEncoderFrameDropping();
}
return enable_frame_dropping ? 30 : 0; return enable_frame_dropping ? 30 : 0;
} }

4
video/quality_scaling_tests.cc
View File

@ -169,7 +169,9 @@ TEST_F(QualityScalingTest, NoAdaptDownForHighQpWithResizeOff_Vp8) {
kFrameDropping, kExpectAdapt); kFrameDropping, kExpectAdapt);
} }
TEST_F(QualityScalingTest, NoAdaptDownForHighQpWithFrameDroppingOff_Vp8) { // TODO(bugs.webrtc.org/10388): Fix and re-enable.
TEST_F(QualityScalingTest,
DISABLED_NoAdaptDownForHighQpWithFrameDroppingOff_Vp8) {
// VP8 QP thresholds, low:1, high:1 -> high QP. // VP8 QP thresholds, low:1, high:1 -> high QP.
test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd);