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

Removes trial to enable BBR congestion controller.

Browse Source 
The BBR controller can still be injected, but the trials
will no longer work. This reduces the binary size.

Bug: webrtc:8415
Change-Id: I2c32c414d08ef0cc16bfd72651535a755cde9916
Reviewed-on: https://webrtc-review.googlesource.com/c/114120
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26077}
This commit is contained in:
Sebastian Jansson
2018-12-20 09:46:29 +01:00
committed by Commit Bot
parent e2e000059d
commit 7f57788ab7
11 changed files with 7 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pc/BUILD.gn
View File

@ -208,12 +208,10 @@ rtc_static_library("peerconnection") {
"../logging:rtc_event_log_impl_output",
"../media:rtc_data",
"../media:rtc_media_base",
"../modules/congestion_controller/bbr",
"../p2p:rtc_p2p",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved",
"../rtc_base/experiments:congestion_controller_experiment",
"../rtc_base/system:rtc_export",
"../rtc_base/third_party/base64",
"../rtc_base/third_party/sigslot",

12
pc/peerconnectionfactory.cc
View File

@ -37,7 +37,6 @@
#include "media/engine/webrtcvideodecoderfactory.h" // nogncheck
#include "media/engine/webrtcvideoencoderfactory.h" // nogncheck
#include "modules/audio_device/include/audio_device.h" // nogncheck
#include "modules/congestion_controller/bbr/bbr_factory.h"
#include "p2p/base/basicpacketsocketfactory.h"
#include "p2p/client/basicportallocator.h"
#include "pc/audiotrack.h"
@ -46,7 +45,6 @@
#include "pc/peerconnection.h"
#include "pc/videocapturertracksource.h"
#include "pc/videotrack.h"
#include "rtc_base/experiments/congestion_controller_experiment.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc {
@ -147,9 +145,7 @@ PeerConnectionFactory::PeerConnectionFactory(
event_log_factory_(std::move(event_log_factory)),
fec_controller_factory_(std::move(fec_controller_factory)),
injected_network_controller_factory_(
std::move(network_controller_factory)),
bbr_network_controller_factory_(
absl::make_unique<BbrNetworkControllerFactory>()) {
std::move(network_controller_factory)) {
if (!network_thread_) {
owned_network_thread_ = rtc::Thread::CreateWithSocketServer();
owned_network_thread_->SetName("pc_network_thread", nullptr);
@ -478,11 +474,7 @@ std::unique_ptr<Call> PeerConnectionFactory::CreateCall_w(
call_config.fec_controller_factory = fec_controller_factory_.get();
if (CongestionControllerExperiment::BbrControllerEnabled()) {
RTC_LOG(LS_INFO) << "Using BBR network controller factory";
call_config.network_controller_factory =
bbr_network_controller_factory_.get();
} else if (CongestionControllerExperiment::InjectedControllerEnabled()) {
if (field_trial::IsEnabled("WebRTC-Bwe-InjectedCongestionController")) {
RTC_LOG(LS_INFO) << "Using injected network controller factory";
call_config.network_controller_factory =
injected_network_controller_factory_.get();

2
pc/peerconnectionfactory.h
View File

@ -151,8 +151,6 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory_;
std::unique_ptr<NetworkControllerFactoryInterface>
injected_network_controller_factory_;
std::unique_ptr<NetworkControllerFactoryInterface>
bbr_network_controller_factory_;
std::unique_ptr<MediaTransportFactory> media_transport_factory_;
};