diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 1035b79f1a..582937eb25 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -171,7 +171,6 @@ source_set("webrtc") { sources = [ "call.h", "config.h", - "experiments.h", "frame_callback.h", "transport.h", ] diff --git a/webrtc/experiments.h b/webrtc/experiments.h deleted file mode 100644 index ec871f2aa3..0000000000 --- a/webrtc/experiments.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#ifndef WEBRTC_EXPERIMENTS_H_ -#define WEBRTC_EXPERIMENTS_H_ - -#include "webrtc/typedefs.h" - -namespace webrtc { -struct RemoteBitrateEstimatorMinRate { - RemoteBitrateEstimatorMinRate() : min_rate(30000) {} - RemoteBitrateEstimatorMinRate(uint32_t min_rate) : min_rate(min_rate) {} - - uint32_t min_rate; -}; - -struct AimdRemoteRateControl { - AimdRemoteRateControl() : enabled(false) {} - explicit AimdRemoteRateControl(bool set_enabled) - : enabled(set_enabled) {} - virtual ~AimdRemoteRateControl() {} - - const bool enabled; -}; -} // namespace webrtc -#endif // WEBRTC_EXPERIMENTS_H_ diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h index 2e436a91fc..8e365a9ee6 100644 --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h @@ -17,7 +17,6 @@ #include "webrtc/base/scoped_ptr.h" #include "webrtc/common.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/experiments.h" #include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 31b92ea960..1869a382f2 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -23,7 +23,6 @@ #include "webrtc/common.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/experiments.h" #include "webrtc/modules/interface/module_common_types.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video_engine/encoder_state_feedback_unittest.cc index 07e1990481..4102367f12 100644 --- a/webrtc/video_engine/encoder_state_feedback_unittest.cc +++ b/webrtc/video_engine/encoder_state_feedback_unittest.cc @@ -31,7 +31,7 @@ namespace webrtc { class MockVieEncoder : public ViEEncoder { public: explicit MockVieEncoder(ProcessThread* process_thread, PacedSender* pacer) - : ViEEncoder(1, 1, config_, *process_thread, pacer, NULL, NULL, false) {} + : ViEEncoder(1, 1, *process_thread, pacer, NULL, NULL, false) {} ~MockVieEncoder() {} MOCK_METHOD1(OnReceivedIntraFrameRequest, @@ -42,8 +42,6 @@ class MockVieEncoder : public ViEEncoder { void(uint32_t ssrc, uint64_t picture_id)); MOCK_METHOD2(OnLocalSsrcChanged, void(uint32_t old_ssrc, uint32_t new_ssrc)); - - const Config config_; }; class VieKeyRequestTest : public ::testing::Test { diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index 05671e46fa..a01a408c85 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -17,7 +17,6 @@ #include "webrtc/common.h" #include "webrtc/common_video/interface/incoming_video_stream.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/experiments.h" #include "webrtc/frame_callback.h" #include "webrtc/modules/pacing/include/paced_sender.h" #include "webrtc/modules/pacing/include/packet_router.h" @@ -81,7 +80,6 @@ class ViEChannelProtectionCallback : public VCMProtectionCallback { ViEChannel::ViEChannel(int32_t channel_id, int32_t engine_id, uint32_t number_of_cores, - const Config& config, Transport* transport, ProcessThread* module_process_thread, RtcpIntraFrameObserver* intra_frame_observer, diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h index f18ada5d44..86969e71cf 100644 --- a/webrtc/video_engine/vie_channel.h +++ b/webrtc/video_engine/vie_channel.h @@ -99,7 +99,6 @@ class ViEChannel : public VCMFrameTypeCallback, ViEChannel(int32_t channel_id, int32_t engine_id, uint32_t number_of_cores, - const Config& config, Transport* transport, ProcessThread* module_process_thread, RtcpIntraFrameObserver* intra_frame_observer, diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc index 4a088c836a..084ffefbe1 100644 --- a/webrtc/video_engine/vie_channel_group.cc +++ b/webrtc/video_engine/vie_channel_group.cc @@ -13,7 +13,6 @@ #include "webrtc/base/checks.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/common.h" -#include "webrtc/experiments.h" #include "webrtc/modules/pacing/include/paced_sender.h" #include "webrtc/modules/pacing/include/packet_router.h" #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h" @@ -34,16 +33,15 @@ namespace webrtc { namespace { static const uint32_t kTimeOffsetSwitchThreshold = 30; +static const uint32_t kMinBitrateBps = 30000; class WrappingBitrateEstimator : public RemoteBitrateEstimator { public: - WrappingBitrateEstimator(RemoteBitrateObserver* observer, - Clock* clock, - const Config& config) + WrappingBitrateEstimator(RemoteBitrateObserver* observer, Clock* clock) : observer_(observer), clock_(clock), crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), - min_bitrate_bps_(config.Get().min_rate), + min_bitrate_bps_(kMinBitrateBps), rbe_(new RemoteBitrateEstimatorSingleStream(observer_, clock_, min_bitrate_bps_)), @@ -153,7 +151,6 @@ ChannelGroup::ChannelGroup(ProcessThread* process_thread) PacedSender::kDefaultPaceMultiplier * BitrateController::kDefaultStartBitrateKbps, 0)), - config_(new Config), process_thread_(process_thread), pacer_thread_(ProcessThread::Create()), // Constructed last as this object calls the provided callback on @@ -162,7 +159,7 @@ ChannelGroup::ChannelGroup(ProcessThread* process_thread) BitrateController::CreateBitrateController(Clock::GetRealTimeClock(), this)) { remote_bitrate_estimator_.reset(new WrappingBitrateEstimator( - remb_.get(), Clock::GetRealTimeClock(), *config_.get())); + remb_.get(), Clock::GetRealTimeClock())); call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get()); @@ -194,10 +191,9 @@ bool ChannelGroup::CreateSendChannel(int channel_id, // TODO(pbos): Remove checks for empty ssrcs and add this check when there's // no base channel. // DCHECK(!ssrcs.empty()); - rtc::scoped_ptr vie_encoder( - new ViEEncoder(channel_id, number_of_cores, *config_.get(), - *process_thread_, pacer_.get(), bitrate_allocator_.get(), - bitrate_controller_.get(), false)); + rtc::scoped_ptr vie_encoder(new ViEEncoder( + channel_id, number_of_cores, *process_thread_, pacer_.get(), + bitrate_allocator_.get(), bitrate_controller_.get(), false)); if (!vie_encoder->Init()) { return false; } @@ -236,8 +232,8 @@ bool ChannelGroup::CreateChannel(int channel_id, size_t max_rtp_streams, bool sender) { rtc::scoped_ptr channel(new ViEChannel( - channel_id, engine_id, number_of_cores, *config_.get(), transport, - process_thread_, encoder_state_feedback_->GetRtcpIntraFrameObserver(), + channel_id, engine_id, number_of_cores, transport, process_thread_, + encoder_state_feedback_->GetRtcpIntraFrameObserver(), bitrate_controller_->CreateRtcpBandwidthObserver(), remote_bitrate_estimator_.get(), call_stats_->rtcp_rtt_stats(), pacer_.get(), packet_router_.get(), max_rtp_streams, sender)); diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h index 499ec7305d..5d4d9afd64 100644 --- a/webrtc/video_engine/vie_channel_group.h +++ b/webrtc/video_engine/vie_channel_group.h @@ -95,8 +95,6 @@ class ChannelGroup : public BitrateObserver { mutable rtc::CriticalSection encoder_map_crit_; EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_); - const rtc::scoped_ptr config_; - // Registered at construct time and assumed to outlive this class. ProcessThread* process_thread_; rtc::scoped_ptr pacer_thread_; diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc index 173ca9684a..07efd18b50 100644 --- a/webrtc/video_engine/vie_encoder.cc +++ b/webrtc/video_engine/vie_encoder.cc @@ -103,7 +103,6 @@ class ViEBitrateObserver : public BitrateObserver { ViEEncoder::ViEEncoder(int32_t channel_id, uint32_t number_of_cores, - const Config& config, ProcessThread& module_process_thread, PacedSender* pacer, BitrateAllocator* bitrate_allocator, diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h index 6ecf6a7b31..e346f522f9 100644 --- a/webrtc/video_engine/vie_encoder.h +++ b/webrtc/video_engine/vie_encoder.h @@ -73,7 +73,6 @@ class ViEEncoder : public RtcpIntraFrameObserver, ViEEncoder(int32_t channel_id, uint32_t number_of_cores, - const Config& config, ProcessThread& module_process_thread, PacedSender* pacer, BitrateAllocator* bitrate_allocator, diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp index 1f0412e845..fef36871af 100644 --- a/webrtc/webrtc.gyp +++ b/webrtc/webrtc.gyp @@ -68,7 +68,6 @@ 'audio_send_stream.h', 'call.h', 'config.h', - 'experiments.h', 'frame_callback.h', 'stream.h', 'transport.h',