Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

Issue 2907153004: Cosmetic change in ANA: renaming characteristic points for consistency. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc
index ce4e2f984ad675902e9d65517b1f63a1f3af87a5..d3f2e7969e3f5030b3caeae0e8b04d3229df0c2a 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc
@@ -206,7 +206,7 @@ std::unique_ptr<ControllerManager> ControllerManagerImpl::Create(
controller_manager_config.ParseFromString(config_string);
std::vector<std::unique_ptr<Controller>> controllers;
- std::map<const Controller*, std::pair<int, float>> chracteristic_points;
+ std::map<const Controller*, std::pair<int, float>> scoring_points;
for (int i = 0; i < controller_manager_config.controllers_size(); ++i) {
auto& controller_config = controller_manager_config.controllers(i);
@@ -243,12 +243,12 @@ std::unique_ptr<ControllerManager> ControllerManagerImpl::Create(
RTC_NOTREACHED();
}
if (controller_config.has_scoring_point()) {
- auto& characteristic_point = controller_config.scoring_point();
- RTC_CHECK(characteristic_point.has_uplink_bandwidth_bps());
- RTC_CHECK(characteristic_point.has_uplink_packet_loss_fraction());
- chracteristic_points[controller.get()] = std::make_pair<int, float>(
- characteristic_point.uplink_bandwidth_bps(),
- characteristic_point.uplink_packet_loss_fraction());
+ auto& scoring_point = controller_config.scoring_point();
+ RTC_CHECK(scoring_point.has_uplink_bandwidth_bps());
+ RTC_CHECK(scoring_point.has_uplink_packet_loss_fraction());
+ scoring_points[controller.get()] = std::make_pair<int, float>(
+ scoring_point.uplink_bandwidth_bps(),
+ scoring_point.uplink_packet_loss_fraction());
}
controllers.push_back(std::move(controller));
}
@@ -259,7 +259,7 @@ std::unique_ptr<ControllerManager> ControllerManagerImpl::Create(
ControllerManagerImpl::Config(
controller_manager_config.min_reordering_time_ms(),
controller_manager_config.min_reordering_squared_distance()),
- std::move(controllers), chracteristic_points));
+ std::move(controllers), scoring_points));
#else
RTC_NOTREACHED();
return nullptr;
@@ -275,8 +275,7 @@ ControllerManagerImpl::ControllerManagerImpl(const Config& config)
ControllerManagerImpl::ControllerManagerImpl(
const Config& config,
std::vector<std::unique_ptr<Controller>>&& controllers,
- const std::map<const Controller*, std::pair<int, float>>&
- chracteristic_points)
+ const std::map<const Controller*, std::pair<int, float>>& scoring_points)
: config_(config),
controllers_(std::move(controllers)),
last_reordering_time_ms_(rtc::Optional<int64_t>()),
@@ -284,7 +283,7 @@ ControllerManagerImpl::ControllerManagerImpl(
for (auto& controller : controllers_)
default_sorted_controllers_.push_back(controller.get());
sorted_controllers_ = default_sorted_controllers_;
- for (auto& controller_point : chracteristic_points) {
+ for (auto& controller_point : scoring_points) {
controller_scoring_points_.insert(std::make_pair(
controller_point.first, ScoringPoint(controller_point.second.first,
controller_point.second.second)));
@@ -313,7 +312,7 @@ std::vector<Controller*> ControllerManagerImpl::GetSortedControllers(
return sorted_controllers_;
// Sort controllers according to the distances of |scoring_point| to the
- // characteristic scoring points of controllers.
+ // scoring points of controllers.
//
// A controller that does not associate with any scoring point
// are treated as if
« no previous file with comments | « webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698