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 <sprang@webrtc.org>.
Cr-Original-Commit-Position: refs/heads/master@{#8806}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 8904290aca8860cca4efb3a06f1557254b2401fb
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc
index a678d07..63ef227 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/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 @@
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 @@
}
}
-bool ScreenshareLayers::TargetBitrateExperimentEnabled() {
- std::string group =
- field_trial::FindFullName("WebRTC-ScreencastTargetBitrateOvershoot");
- return group == "Enabled";
-}
-
} // namespace webrtc
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.h b/modules/video_coding/codecs/vp8/screenshare_layers.h
index 2799c3b..0bc571e 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.h
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.h
@@ -49,9 +49,6 @@
virtual int CurrentLayerId() const;
- protected:
- virtual bool TargetBitrateExperimentEnabled();
-
private:
void CalculateFramerate(uint32_t timestamp);
bool TimeToSync(uint32_t timestamp) const;
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index 40677bb..e12f9ce 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -44,9 +44,6 @@
tl0_frame_dropper,
tl1_frame_dropper) {}
virtual ~ScreenshareLayersFT() {}
-
- protected:
- bool TargetBitrateExperimentEnabled() override { return true; }
};
class ScreenshareLayerTest : public ::testing::Test {
