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

Revert "Fix LibvpxVp8Encoder::FrameDropThreshold"

Browse Source 
This reverts commit 159e53a66eceb79003741ba0d990c502595c27bb.

Reason for revert: Might break downstream Android projects.

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}

TBR=ilnik@webrtc.org,eladalon@webrtc.org,sprang@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:10387
Change-Id: I08055d1b0234dccd4166a4eaf8eff56f909f99a8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126721
Reviewed-by: Yves Gerey <yvesg@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27055}
This commit is contained in:
Yves Gerey
2019-03-11 11:34:15 +00:00
committed by Commit Bot
parent 8a0c1f58cc
commit 55500d26b7
2 changed files with 5 additions and 6 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,9 +695,10 @@ uint32_t LibvpxVp8Encoder::FrameDropThreshold(size_t spatial_idx) const {
// setting, as eg. ScreenshareLayers does not work as intended with frame
// dropping on and DefaultTemporalLayers will have performance issues with
// frame dropping off.
RTC_CHECK_LT(spatial_idx, frame_buffer_controllers_.size());
enable_frame_dropping =
frame_buffer_controllers_[spatial_idx]->SupportsEncoderFrameDropping();
if (frame_buffer_controllers_.size() <= spatial_idx) {
enable_frame_dropping =
frame_buffer_controllers_[spatial_idx]->SupportsEncoderFrameDropping();
}
return enable_frame_dropping ? 30 : 0;
}

4
video/quality_scaling_tests.cc
View File

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