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

Removes unnecessary webrtc_cc namespaces.

Browse Source 
Bug: webrtc:9586
Change-Id: I6407ee465d725d7469c409e5bea1c55354ab7f95
Reviewed-on: https://webrtc-review.googlesource.com/92385
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24199}
This commit is contained in:
Sebastian Jansson
2018-08-06 18:42:41 +02:00
committed by Commit Bot
parent 13ef7d25f6
commit eb73a7bd16
10 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/congestion_controller/goog_cc/alr_detector_unittest.cc
View File

@ -21,8 +21,6 @@ constexpr int kEstimatedBitrateBps = 300000;
} // namespace } // namespace
namespace webrtc { namespace webrtc {
namespace webrtc_cc {
namespace { namespace {
class SimulateOutgoingTrafficIn { class SimulateOutgoingTrafficIn {
public: public:
@ -173,5 +171,4 @@ TEST_F(AlrDetectorTest, ParseActiveFieldTrial) {
EXPECT_EQ(1, parsed_params->group_id); EXPECT_EQ(1, parsed_params->group_id);
} }
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc

6
modules/congestion_controller/goog_cc/goog_cc_factory.cc
View File

@ -19,8 +19,7 @@ GoogCcNetworkControllerFactory::GoogCcNetworkControllerFactory(
std::unique_ptr<NetworkControllerInterface> std::unique_ptr<NetworkControllerInterface>
GoogCcNetworkControllerFactory::Create(NetworkControllerConfig config) { GoogCcNetworkControllerFactory::Create(NetworkControllerConfig config) {
return absl::make_unique<webrtc_cc::GoogCcNetworkController>(event_log_, return absl::make_unique<GoogCcNetworkController>(event_log_, config, false);
config, false);
} }
TimeDelta GoogCcNetworkControllerFactory::GetProcessInterval() const { TimeDelta GoogCcNetworkControllerFactory::GetProcessInterval() const {
@ -34,8 +33,7 @@ GoogCcFeedbackNetworkControllerFactory::GoogCcFeedbackNetworkControllerFactory(
std::unique_ptr<NetworkControllerInterface> std::unique_ptr<NetworkControllerInterface>
GoogCcFeedbackNetworkControllerFactory::Create(NetworkControllerConfig config) { GoogCcFeedbackNetworkControllerFactory::Create(NetworkControllerConfig config) {
return absl::make_unique<webrtc_cc::GoogCcNetworkController>(event_log_, return absl::make_unique<GoogCcNetworkController>(event_log_, config, true);
config, true);
} }
TimeDelta GoogCcFeedbackNetworkControllerFactory::GetProcessInterval() const { TimeDelta GoogCcFeedbackNetworkControllerFactory::GetProcessInterval() const {

2
modules/congestion_controller/goog_cc/goog_cc_network_control.cc
View File

@ -33,7 +33,6 @@
#include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/field_trial.h"
namespace webrtc { namespace webrtc {
namespace webrtc_cc {
namespace { namespace {
const char kCwndExperiment[] = "WebRTC-CwndExperiment"; const char kCwndExperiment[] = "WebRTC-CwndExperiment";
@ -543,5 +542,4 @@ PacerConfig GoogCcNetworkController::GetPacingRates(Timestamp at_time) const {
msg.pad_window = padding_rate * msg.time_window; msg.pad_window = padding_rate * msg.time_window;
return msg; return msg;
} }
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc

2
modules/congestion_controller/goog_cc/goog_cc_network_control.h
View File

@ -27,7 +27,6 @@
#include "rtc_base/constructormagic.h" #include "rtc_base/constructormagic.h"
namespace webrtc { namespace webrtc {
namespace webrtc_cc {
class GoogCcNetworkController : public NetworkControllerInterface { class GoogCcNetworkController : public NetworkControllerInterface {
public: public:
@ -105,7 +104,6 @@ class GoogCcNetworkController : public NetworkControllerInterface {
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GoogCcNetworkController); RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(GoogCcNetworkController);
}; };
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_ #endif // MODULES_CONGESTION_CONTROLLER_GOOG_CC_GOOG_CC_NETWORK_CONTROL_H_

2
modules/congestion_controller/goog_cc/probe_controller_unittest.cc
View File

@ -24,7 +24,6 @@ using testing::NiceMock;
using testing::Return; using testing::Return;
namespace webrtc { namespace webrtc {
namespace webrtc_cc {
namespace test { namespace test {
namespace { namespace {
@ -264,5 +263,4 @@ TEST_F(ProbeControllerTest, TestExponentialProbingOverflow) {
} }
} // namespace test } // namespace test
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc

6
modules/congestion_controller/goog_cc/test/goog_cc_printer.cc
View File

@ -13,8 +13,7 @@ namespace webrtc {
GoogCcStatePrinter::GoogCcStatePrinter() = default; GoogCcStatePrinter::GoogCcStatePrinter() = default;
GoogCcStatePrinter::~GoogCcStatePrinter() = default; GoogCcStatePrinter::~GoogCcStatePrinter() = default;
void GoogCcStatePrinter::Attach( void GoogCcStatePrinter::Attach(GoogCcNetworkController* controller) {
webrtc_cc::GoogCcNetworkController* controller) {
controller_ = controller; controller_ = controller;
} }
@ -41,8 +40,7 @@ std::unique_ptr<NetworkControllerInterface> GoogCcDebugFactory::Create(
NetworkControllerConfig config) { NetworkControllerConfig config) {
RTC_CHECK(controller_ == nullptr); RTC_CHECK(controller_ == nullptr);
auto controller = GoogCcNetworkControllerFactory::Create(config); auto controller = GoogCcNetworkControllerFactory::Create(config);
controller_ = controller_ = static_cast<GoogCcNetworkController*>(controller.get());
static_cast<webrtc_cc::GoogCcNetworkController*>(controller.get());
printer_->Attach(controller_); printer_->Attach(controller_);
return controller; return controller;
} }

6
modules/congestion_controller/goog_cc/test/goog_cc_printer.h
View File

@ -21,7 +21,7 @@ class GoogCcStatePrinter : public DebugStatePrinter {
public: public:
GoogCcStatePrinter(); GoogCcStatePrinter();
~GoogCcStatePrinter() override; ~GoogCcStatePrinter() override;
void Attach(webrtc_cc::GoogCcNetworkController*); void Attach(GoogCcNetworkController*);
bool Attached() const override; bool Attached() const override;
void PrintHeaders(FILE* out) override; void PrintHeaders(FILE* out) override;
@ -30,7 +30,7 @@ class GoogCcStatePrinter : public DebugStatePrinter {
NetworkControlUpdate GetState(Timestamp at_time) const override; NetworkControlUpdate GetState(Timestamp at_time) const override;
private: private:
webrtc_cc::GoogCcNetworkController* controller_ = nullptr; GoogCcNetworkController* controller_ = nullptr;
}; };
class GoogCcDebugFactory : public GoogCcNetworkControllerFactory { class GoogCcDebugFactory : public GoogCcNetworkControllerFactory {
@ -41,7 +41,7 @@ class GoogCcDebugFactory : public GoogCcNetworkControllerFactory {
private: private:
GoogCcStatePrinter* printer_; GoogCcStatePrinter* printer_;
webrtc_cc::GoogCcNetworkController* controller_ = nullptr; GoogCcNetworkController* controller_ = nullptr;
}; };
} // namespace webrtc } // namespace webrtc

2
modules/congestion_controller/rtp/pacer_controller.cc
View File

@ -14,7 +14,6 @@
#include "rtc_base/logging.h" #include "rtc_base/logging.h"
namespace webrtc { namespace webrtc {
namespace webrtc_cc {
PacerController::PacerController(PacedSender* pacer) : pacer_(pacer) { PacerController::PacerController(PacedSender* pacer) : pacer_(pacer) {
sequenced_checker_.Detach(); sequenced_checker_.Detach();
@ -68,5 +67,4 @@ void PacerController::SetPacerState(bool paused) {
pacer_paused_ = paused; pacer_paused_ = paused;
} }
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc

3
modules/congestion_controller/rtp/pacer_controller.h
View File

@ -20,8 +20,6 @@
namespace webrtc { namespace webrtc {
class Clock; class Clock;
namespace webrtc_cc {
// Wrapper class to control pacer using task queues. Note that this class is // Wrapper class to control pacer using task queues. Note that this class is
// only designed to be used from a single task queue and has no built in // only designed to be used from a single task queue and has no built in
// concurrency safety. // concurrency safety.
@ -48,6 +46,5 @@ class PacerController {
rtc::SequencedTaskChecker sequenced_checker_; rtc::SequencedTaskChecker sequenced_checker_;
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PacerController); RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PacerController);
}; };
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc
#endif // MODULES_CONGESTION_CONTROLLER_RTP_PACER_CONTROLLER_H_ #endif // MODULES_CONGESTION_CONTROLLER_RTP_PACER_CONTROLLER_H_

2
modules/congestion_controller/rtp/send_time_history_unittest.cc
View File

@ -19,7 +19,6 @@
#include "test/gtest.h" #include "test/gtest.h"
namespace webrtc { namespace webrtc {
namespace webrtc_cc {
namespace test { namespace test {
static const int kDefaultHistoryLengthMs = 1000; static const int kDefaultHistoryLengthMs = 1000;
@ -254,5 +253,4 @@ TEST_F(SendTimeHistoryTest, InterlievedGetAndRemove) {
EXPECT_EQ(packets[2], packet3); EXPECT_EQ(packets[2], packet3);
} }
} // namespace test } // namespace test
} // namespace webrtc_cc
} // namespace webrtc } // namespace webrtc