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

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

Issue 2673543004: Duplicate FecController in preparation of forking (Closed)
Patch Set: Rebased Created 3 years, 9 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
11 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h " 11 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h "
12 12
13 #include <cmath> 13 #include <cmath>
14 #include <utility> 14 #include <utility>
15 15
16 #include "webrtc/base/ignore_wundef.h" 16 #include "webrtc/base/ignore_wundef.h"
17 #include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h " 17 #include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h "
18 #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h " 18 #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h "
19 #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h" 19 #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h"
20 #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h" 20 #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_b ased.h"
21 #include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_control ler.h" 21 #include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_control ler.h"
22 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
23 23
24 #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP 24 #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
25 RTC_PUSH_IGNORING_WUNDEF() 25 RTC_PUSH_IGNORING_WUNDEF()
26 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 26 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
27 #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/conf ig.pb.h" 27 #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/conf ig.pb.h"
28 #else 28 #else
29 #include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" 29 #include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
30 #endif 30 #endif
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 NormalizeUplinkBandwidth(scoring_point.uplink_bandwidth_bps) - 344 NormalizeUplinkBandwidth(scoring_point.uplink_bandwidth_bps) -
345 NormalizeUplinkBandwidth(uplink_bandwidth_bps); 345 NormalizeUplinkBandwidth(uplink_bandwidth_bps);
346 float diff_normalized_packet_loss = 346 float diff_normalized_packet_loss =
347 NormalizePacketLossFraction(scoring_point.uplink_packet_loss_fraction) - 347 NormalizePacketLossFraction(scoring_point.uplink_packet_loss_fraction) -
348 NormalizePacketLossFraction(uplink_packet_loss_fraction); 348 NormalizePacketLossFraction(uplink_packet_loss_fraction);
349 return std::pow(diff_normalized_bitrate_bps, 2) + 349 return std::pow(diff_normalized_bitrate_bps, 2) +
350 std::pow(diff_normalized_packet_loss, 2); 350 std::pow(diff_normalized_packet_loss, 2);
351 } 351 }
352 352
353 } // namespace webrtc 353 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/BUILD.gn ('k') | webrtc/modules/audio_coding/audio_network_adaptor/fec_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698