| commit | 4aec1d4437a3944270c4d9de68b7a1c74a9f1185 | [log] [tgz] |
|---|---|---|
| author | minyue <minyue@webrtc.org> | Wed Sep 21 23:01:26 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Sep 22 06:01:34 2016 +0000 |
| tree | bead3b7980d27f544dcac891b668aac53522780f | |
| parent | 05bba2be48f241e865675fdffb17fff8f9efb62d [diff] [blame] |
Relanding of "Adding BitrateController to audio network adaptor." Adding BitrateController to audio network adaptor was first landed in https://codereview.webrtc.org/2334613002/ but reverted in https://codereview.webrtc.org/2352223002/ due to ODR violation. This CL tries to use namespace trick to solve the ODR problem. BUG=webrtc:6303 Review-Url: https://codereview.webrtc.org/2353293002 Cr-Commit-Position: refs/heads/master@{#14343}
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc index c17d389..6562674 100644 --- a/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc +++ b/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc
@@ -28,6 +28,7 @@ MATCHER_P(NetworkMetricsIs, metric, "") { return arg.uplink_bandwidth_bps == metric.uplink_bandwidth_bps && + arg.target_audio_bitrate_bps == metric.target_audio_bitrate_bps && arg.uplink_packet_loss_fraction == metric.uplink_packet_loss_fraction; }