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

Unified Diff: webrtc/audio/audio_send_stream_unittest.cc

Issue 2772773002: Adding cbr support for Opus (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/audio/audio_send_stream_unittest.cc
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc
index 318ea955cf79dd0906c0d17164235d9330ff6d16..6ba7a3aa8573cd49056a659bb1efc91835bdc05b 100644
--- a/webrtc/audio/audio_send_stream_unittest.cc
+++ b/webrtc/audio/audio_send_stream_unittest.cc
@@ -285,8 +285,9 @@ TEST(AudioSendStreamTest, ConfigToString) {
"{rtp_history_ms: 0}, c_name: foo_name}, send_transport: null, "
"voe_channel_id: 1, min_bitrate_bps: 12000, max_bitrate_bps: 34000, "
"send_codec_spec: {nack_enabled: true, transport_cc_enabled: false, "
- "enable_codec_fec: true, enable_opus_dtx: false, opus_max_playback_rate: "
- "32000, cng_payload_type: 42, cng_plfreq: 56, min_ptime: 20, max_ptime: "
+ "enable_codec_fec: true, enable_opus_dtx: false, enable_opus_cbr: false, "
+ "opus_max_playback_rate: 32000, "
+ "cng_payload_type: 42, cng_plfreq: 56, min_ptime: 20, max_ptime: "
"60, codec_inst: {pltype: 103, plname: \"isac\", plfreq: 16000, pacsize: "
"320, channels: 1, rate: 32000}}}",
config.ToString());
@@ -395,6 +396,7 @@ TEST(AudioSendStreamTest, SendCodecAppliesConfigParams) {
stream_config.send_codec_spec.codec_inst = kOpusCodec;
stream_config.send_codec_spec.enable_codec_fec = true;
stream_config.send_codec_spec.enable_opus_dtx = true;
+ stream_config.send_codec_spec.enable_opus_cbr = true;
stream_config.send_codec_spec.opus_max_playback_rate = 12345;
stream_config.send_codec_spec.cng_plfreq = 16000;
stream_config.send_codec_spec.cng_payload_type = 105;
@@ -410,6 +412,10 @@ TEST(AudioSendStreamTest, SendCodecAppliesConfigParams) {
.WillOnce(Return(true));
EXPECT_CALL(
*helper.channel_proxy(),
+ SetOpusCbr(stream_config.send_codec_spec.enable_opus_cbr))
+ .WillOnce(Return(true));
+ EXPECT_CALL(
+ *helper.channel_proxy(),
SetOpusMaxPlaybackRate(
stream_config.send_codec_spec.opus_max_playback_rate))
.WillOnce(Return(true));

Powered by Google App Engine
This is Rietveld 408576698