Index: webrtc/audio/test/low_bandwidth_audio_test.cc |
diff --git a/webrtc/audio/test/low_bandwidth_audio_test.cc b/webrtc/audio/test/low_bandwidth_audio_test.cc |
index de955f75e19c936b98e61692f832d62254d8ffcc..faa137b25475870b9ca317d209056ae677c72286 100644 |
--- a/webrtc/audio/test/low_bandwidth_audio_test.cc |
+++ b/webrtc/audio/test/low_bandwidth_audio_test.cc |
@@ -20,9 +20,6 @@ namespace { |
// Wait half a second between stopping sending and stopping receiving audio. |
constexpr int kExtraRecordTimeMs = 500; |
-// Large bitrate by default. |
-const webrtc::CodecInst kDefaultCodec{120, "OPUS", 48000, 960, 2, 64000}; |
- |
// The best that can be done with PESQ. |
constexpr int kAudioFileBitRate = 16000; |
} |
@@ -92,7 +89,12 @@ test::PacketTransport* AudioQualityTest::CreateReceiveTransport() { |
void AudioQualityTest::ModifyAudioConfigs( |
AudioSendStream::Config* send_config, |
std::vector<AudioReceiveStream::Config>* receive_configs) { |
- send_config->send_codec_spec.codec_inst = kDefaultCodec; |
+ // Large bitrate by default. |
+ const webrtc::SdpAudioFormat kDefaultFormat("OPUS", 48000, 2, |
+ {{"stereo", "1"}}); |
+ send_config->send_codec_spec = |
+ rtc::Optional<AudioSendStream::Config::SendCodecSpec>( |
+ {120, kDefaultFormat}); |
} |
void AudioQualityTest::PerformTest() { |
@@ -124,14 +126,15 @@ TEST_F(LowBandwidthAudioTest, GoodNetworkHighBitrate) { |
class Mobile2GNetworkTest : public AudioQualityTest { |
void ModifyAudioConfigs(AudioSendStream::Config* send_config, |
std::vector<AudioReceiveStream::Config>* receive_configs) override { |
- send_config->send_codec_spec.codec_inst = CodecInst{ |
- 120, // pltype |
- "OPUS", // plname |
- 48000, // plfreq |
- 2880, // pacsize |
- 1, // channels |
- 6000 // rate bits/sec |
- }; |
+ send_config->send_codec_spec = |
+ rtc::Optional<AudioSendStream::Config::SendCodecSpec>( |
+ {120, |
+ {"OPUS", |
+ 48000, |
+ 2, |
+ {{"maxaveragebitrate", "6000"}, |
+ {"ptime", "60"}, |
+ {"stereo", "1"}}}}); |
} |
FakeNetworkPipe::Config GetNetworkPipeConfig() override { |