From 8904290aca8860cca4efb3a06f1557254b2401fb Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Fri, 20 Mar 2015 12:49:38 +0000 Subject: [PATCH] Make screenshare target bitrate experiment always on BUG=4083 R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/44699004 Patch from sprang@webrtc.org . Cr-Commit-Position: refs/heads/master@{#8806} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8806 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_coding/codecs/vp8/screenshare_layers.cc | 13 +++---------- .../video_coding/codecs/vp8/screenshare_layers.h | 3 --- .../codecs/vp8/screenshare_layers_unittest.cc | 3 --- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc index a678d07dd2..63ef227812 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.cc @@ -14,7 +14,6 @@ #include "vpx/vpx_encoder.h" #include "vpx/vp8cx.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" -#include "webrtc/system_wrappers/interface/field_trial.h" namespace webrtc { @@ -96,13 +95,13 @@ bool ScreenshareLayers::ConfigureBitrates(int bitrate_kbit, int max_bitrate_kbit, int framerate, vpx_codec_enc_cfg_t* cfg) { - if (framerate > 0) { + if (framerate > 0) framerate_ = framerate; - } + tl0_frame_dropper_->SetRates(bitrate_kbit, framerate_); tl1_frame_dropper_->SetRates(max_bitrate_kbit, framerate_); - if (cfg != NULL && TargetBitrateExperimentEnabled()) { + if (cfg != nullptr) { // Calculate a codec target bitrate. This may be higher than TL0, gaining // quality at the expense of frame rate at TL0. Constraints: // - TL0 frame rate should not be less than framerate / kMaxTL0FpsReduction. @@ -175,10 +174,4 @@ void ScreenshareLayers::CalculateFramerate(uint32_t timestamp) { } } -bool ScreenshareLayers::TargetBitrateExperimentEnabled() { - std::string group = - field_trial::FindFullName("WebRTC-ScreencastTargetBitrateOvershoot"); - return group == "Enabled"; -} - } // namespace webrtc diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h index 2799c3bed8..0bc571ee0f 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h @@ -49,9 +49,6 @@ class ScreenshareLayers : public TemporalLayers { virtual int CurrentLayerId() const; - protected: - virtual bool TargetBitrateExperimentEnabled(); - private: void CalculateFramerate(uint32_t timestamp); bool TimeToSync(uint32_t timestamp) const; diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc index 40677bb32c..e12f9ce088 100644 --- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc +++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc @@ -44,9 +44,6 @@ class ScreenshareLayersFT : public ScreenshareLayers { tl0_frame_dropper, tl1_frame_dropper) {} virtual ~ScreenshareLayersFT() {} - - protected: - bool TargetBitrateExperimentEnabled() override { return true; } }; class ScreenshareLayerTest : public ::testing::Test {