Adding cbr support for Opus

webrtc/media/engine/webrtcvoiceengine.cc

 /*
  *  Copyright (c) 2004 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 237 matching lines @@
                     << bitrate;
   }
   return bitrate;
 }
 
 void GetOpusConfig(const AudioCodec& codec,
                    webrtc::CodecInst* voe_codec,
                    bool* enable_codec_fec,
                    int* max_playback_rate,
                    bool* enable_codec_dtx,
+                   bool* enable_codec_cbr,
                    int* min_ptime_ms,
                    int* max_ptime_ms) {
   *enable_codec_fec = IsCodecFeatureEnabled(codec, kCodecParamUseInbandFec);
   *enable_codec_dtx = IsCodecFeatureEnabled(codec, kCodecParamUseDtx);
+  *enable_codec_cbr = IsCodecFeatureEnabled(codec, kCodecParamUseCbr);
   *max_playback_rate = GetCodecFeatureInt(codec, kCodecParamMaxPlaybackRate,
                                           kOpusDefaultMaxPlaybackRate);
   *max_ptime_ms =
       GetCodecFeatureInt(codec, kCodecParamMaxPTime, kOpusDefaultMaxPTime);
   *min_ptime_ms =
       GetCodecFeatureInt(codec, kCodecParamMinPTime, kOpusDefaultMinPTime);
   if (*max_ptime_ms < *min_ptime_ms) {
     // If min ptime or max ptime defined by codec parameter is wrong, we use
     // the default values.
     *max_ptime_ms = kOpusDefaultMaxPTime;
@@ skipping 1695 matching lines @@
       return false;
     }
 
     send_codec_spec.transport_cc_enabled = HasTransportCc(*codec);
     send_codec_spec.nack_enabled = HasNack(*codec);
     bitrate_config_ = GetBitrateConfigForCodec(*codec);
 
     // For Opus as the send codec, we are to determine inband FEC, maximum
     // playback rate, and opus internal dtx.
     if (IsCodec(*codec, kOpusCodecName)) {
-      GetOpusConfig(*codec, &send_codec_spec.codec_inst,
-                    &send_codec_spec.enable_codec_fec,
-                    &send_codec_spec.opus_max_playback_rate,
-                    &send_codec_spec.enable_opus_dtx,
-                    &send_codec_spec.min_ptime_ms,
-                    &send_codec_spec.max_ptime_ms);
+      GetOpusConfig(
+          *codec, &send_codec_spec.codec_inst,
+          &send_codec_spec.enable_codec_fec,
+          &send_codec_spec.opus_max_playback_rate,
+          &send_codec_spec.enable_opus_dtx, &send_codec_spec.enable_opus_cbr,
+          &send_codec_spec.min_ptime_ms, &send_codec_spec.max_ptime_ms);
     }
 
     // Set packet size if the AudioCodec param kCodecParamPTime is set.
     int ptime_ms = 0;
     if (codec->GetParam(kCodecParamPTime, &ptime_ms)) {
       if (!WebRtcVoiceCodecs::SetPTimeAsPacketSize(
           &send_codec_spec.codec_inst, ptime_ms)) {
         LOG(LS_WARNING) << "Failed to set packet size for codec "
                         << send_codec_spec.codec_inst.plname;
         return false;
@@ skipping 700 matching lines @@
                       ssrc);
   if (it != unsignaled_recv_ssrcs_.end()) {
     unsignaled_recv_ssrcs_.erase(it);
     return true;
   }
   return false;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE