From 9665b7d1017bc5b44ffe550c4625921d0315df90 Mon Sep 17 00:00:00 2001 From: Ilya Nikolaevskiy Date: Thu, 23 Apr 2020 09:25:04 +0000 Subject: [PATCH] Revert "Launch external ref control for vp9 encoder" This reverts commit 9427b51d6ff50af73c217cb725b1c59b9d701796. Reason for revert: Breaks downstream tests Original change's description: > Launch external ref control for vp9 encoder > > Change field trial condition to killswitch instead. > > Finch trial is going to 100% public today. > > Bug: chromium:1027108,webrtc:11319 > Change-Id: I29494a7c8515a454706983dd15ae444d3f85271f > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173752 > Reviewed-by: Sergey Silkin > Commit-Queue: Ilya Nikolaevskiy > Cr-Commit-Position: refs/heads/master@{#31122} TBR=ilnik@webrtc.org,ssilkin@webrtc.org Change-Id: I44436febb2b646cdd350fa9afee1c3a7ea307d04 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1027108, webrtc:11319 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173761 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#31123} --- modules/video_coding/codecs/vp9/vp9_impl.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index b0dc108daa..cf2d37000d 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -582,11 +582,10 @@ int VP9EncoderImpl::InitEncode(const VideoCodec* inst, // External reference control is required for different frame rate on spatial // layers because libvpx generates rtp incompatible references in this case. - external_ref_control_ = - !field_trial::IsDisabled("WebRTC-Vp9ExternalRefCtrl") || - (num_spatial_layers_ > 1 && - codec_.mode == VideoCodecMode::kScreensharing) || - inter_layer_pred_ == InterLayerPredMode::kOn; + external_ref_control_ = field_trial::IsEnabled("WebRTC-Vp9ExternalRefCtrl") || + (num_spatial_layers_ > 1 && + codec_.mode == VideoCodecMode::kScreensharing) || + inter_layer_pred_ == InterLayerPredMode::kOn; if (num_temporal_layers_ == 1) { gof_.SetGofInfoVP9(kTemporalStructureMode1);