Adding cbr support for Opus

webrtc/audio/audio_send_stream_unittest.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 267 matching lines @@
   config.send_codec_spec.max_ptime_ms = 60;
   config.send_codec_spec.codec_inst = kIsacCodec;
   config.rtp.extensions.push_back(
       RtpExtension(RtpExtension::kAudioLevelUri, kAudioLevelId));
   EXPECT_EQ(
       "{rtp: {ssrc: 1234, extensions: [{uri: "
       "urn:ietf:params:rtp-hdrext:ssrc-audio-level, id: 2}], nack: "
       "{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());
 }
 
 TEST(AudioSendStreamTest, ConstructDestruct) {
   ConfigHelper helper(false);
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.packet_router(), helper.congestion_controller(),
@@ skipping 88 matching lines @@
   EXPECT_FALSE(send_stream.GetStats().typing_noise_detected);
 }
 
 TEST(AudioSendStreamTest, SendCodecAppliesConfigParams) {
   ConfigHelper helper(false);
   auto stream_config = helper.config();
   const CodecInst kOpusCodec = {111, "opus", 48000, 960, 2, 64000};
   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;
   stream_config.send_codec_spec.min_ptime_ms = 10;
   stream_config.send_codec_spec.max_ptime_ms = 60;
   stream_config.audio_network_adaptor_config =
       rtc::Optional<std::string>("abced");
   EXPECT_CALL(*helper.channel_proxy(), SetCodecFECStatus(true))
       .WillOnce(Return(true));
   EXPECT_CALL(
       *helper.channel_proxy(),
       SetOpusDtx(stream_config.send_codec_spec.enable_opus_dtx))
       .WillOnce(Return(true));
-  EXPECT_CALL(
-      *helper.channel_proxy(),
-      SetOpusMaxPlaybackRate(
-          stream_config.send_codec_spec.opus_max_playback_rate))
+  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));
   EXPECT_CALL(*helper.channel_proxy(),
               SetSendCNPayloadType(
                   stream_config.send_codec_spec.cng_payload_type,
                   webrtc::kFreq16000Hz))
       .WillOnce(Return(true));
   EXPECT_CALL(
       *helper.channel_proxy(),
       SetReceiverFrameLengthRange(stream_config.send_codec_spec.min_ptime_ms,
                                   stream_config.send_codec_spec.max_ptime_ms));
@@ skipping 40 matching lines @@
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.packet_router(), helper.congestion_controller(),
       helper.bitrate_allocator(), helper.event_log(), helper.rtcp_rtt_stats());
   EXPECT_CALL(*helper.channel_proxy(), SetBitrate(_, 5000));
   send_stream.OnBitrateUpdated(50000, 0.0, 50, 5000);
 }
 
 }  // namespace test
 }  // namespace webrtc