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

Side by Side Diff: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

Issue 2786363002: Revert of Loosening the coupling between WebRTC and //third_party/protobuf (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 ControllerManagerImpl::Config::Config(int min_reordering_time_ms, 188 ControllerManagerImpl::Config::Config(int min_reordering_time_ms,
189 float min_reordering_squared_distance, 189 float min_reordering_squared_distance,
190 const Clock* clock) 190 const Clock* clock)
191 : min_reordering_time_ms(min_reordering_time_ms), 191 : min_reordering_time_ms(min_reordering_time_ms),
192 min_reordering_squared_distance(min_reordering_squared_distance), 192 min_reordering_squared_distance(min_reordering_squared_distance),
193 clock(clock) {} 193 clock(clock) {}
194 194
195 ControllerManagerImpl::Config::~Config() = default; 195 ControllerManagerImpl::Config::~Config() = default;
196 196
197 std::unique_ptr<ControllerManager> ControllerManagerImpl::Create( 197 std::unique_ptr<ControllerManager> ControllerManagerImpl::Create(
198 const ProtoString& config_string, 198 const std::string& config_string,
199 size_t num_encoder_channels, 199 size_t num_encoder_channels,
200 rtc::ArrayView<const int> encoder_frame_lengths_ms, 200 rtc::ArrayView<const int> encoder_frame_lengths_ms,
201 int min_encoder_bitrate_bps, 201 int min_encoder_bitrate_bps,
202 size_t intial_channels_to_encode, 202 size_t intial_channels_to_encode,
203 int initial_frame_length_ms, 203 int initial_frame_length_ms,
204 int initial_bitrate_bps, 204 int initial_bitrate_bps,
205 bool initial_fec_enabled, 205 bool initial_fec_enabled,
206 bool initial_dtx_enabled, 206 bool initial_dtx_enabled,
207 const Clock* clock) { 207 const Clock* clock) {
208 #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP 208 #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 NormalizeUplinkBandwidth(scoring_point.uplink_bandwidth_bps) - 386 NormalizeUplinkBandwidth(scoring_point.uplink_bandwidth_bps) -
387 NormalizeUplinkBandwidth(uplink_bandwidth_bps); 387 NormalizeUplinkBandwidth(uplink_bandwidth_bps);
388 float diff_normalized_packet_loss = 388 float diff_normalized_packet_loss =
389 NormalizePacketLossFraction(scoring_point.uplink_packet_loss_fraction) - 389 NormalizePacketLossFraction(scoring_point.uplink_packet_loss_fraction) -
390 NormalizePacketLossFraction(uplink_packet_loss_fraction); 390 NormalizePacketLossFraction(uplink_packet_loss_fraction);
391 return std::pow(diff_normalized_bitrate_bps, 2) + 391 return std::pow(diff_normalized_bitrate_bps, 2) +
392 std::pow(diff_normalized_packet_loss, 2); 392 std::pow(diff_normalized_packet_loss, 2);
393 } 393 }
394 394
395 } // namespace webrtc 395 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698