Adding cbr support for Opus

webrtc/modules/audio_coding/acm2/audio_coding_module.cc

 /*
  *  Copyright (c) 2012 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 172 matching lines @@
   int SetOpusApplication(OpusApplicationMode application) override;
 
   // If current send codec is Opus, informs it about the maximum playback rate
   // the receiver will render.
   int SetOpusMaxPlaybackRate(int frequency_hz) override;
 
   int EnableOpusDtx() override;
 
   int DisableOpusDtx() override;
 
+  int EnableOpusCbr() override;

[minyue-webrtc, 2017/03/29 20:45:26]

nit: make order between Cbr and Dtx consistent

+
+  int DisableOpusCbr() override;
+
   int UnregisterReceiveCodec(uint8_t payload_type) override;
 
   int EnableNack(size_t max_nack_list_size) override;
 
   void DisableNack() override;
 
   std::vector<uint16_t> GetNackList(int64_t round_trip_time_ms) const override;
 
   void GetDecodingCallStatistics(AudioDecodingCallStats* stats) const override;
 
@@ skipping 190 matching lines @@
     return enc_->Max10MsFramesInAPacket();
   }
   int GetTargetBitrate() const override { return enc_->GetTargetBitrate(); }
   EncodedInfo EncodeImpl(uint32_t rtp_timestamp,
                          rtc::ArrayView<const int16_t> audio,
                          rtc::Buffer* encoded) override {
     return enc_->Encode(rtp_timestamp, audio, encoded);
   }
   void Reset() override { return enc_->Reset(); }
   bool SetFec(bool enable) override { return enc_->SetFec(enable); }
+  bool SetCbr(bool enable) override { return enc_->SetCbr(enable); }
   bool SetDtx(bool enable) override { return enc_->SetDtx(enable); }
   bool SetApplication(Application application) override {
     return enc_->SetApplication(application);
   }
   void SetMaxPlaybackRate(int frequency_hz) override {
     return enc_->SetMaxPlaybackRate(frequency_hz);
   }
 
  private:
   AudioEncoder* enc_;
@@ skipping 814 matching lines @@
 }
 
 int AudioCodingModuleImpl::DisableOpusDtx() {
   rtc::CritScope lock(&acm_crit_sect_);
   if (!HaveValidEncoder("DisableOpusDtx")) {
     return -1;
   }
   return encoder_stack_->SetDtx(false) ? 0 : -1;
 }
 
+int AudioCodingModuleImpl::EnableOpusCbr() {
+  rtc::CritScope lock(&acm_crit_sect_);
+  if (!HaveValidEncoder("EnableOpusCbr")) {
+    return -1;
+  }
+  return encoder_stack_->SetCbr(true) ? 0 : -1;
+}
+
+int AudioCodingModuleImpl::DisableOpusCbr() {
+  rtc::CritScope lock(&acm_crit_sect_);
+  if (!HaveValidEncoder("DisableOpusCbr")) {
+    return -1;
+  }
+  return encoder_stack_->SetCbr(false) ? 0 : -1;
+}
+
 int32_t AudioCodingModuleImpl::PlayoutTimestamp(uint32_t* timestamp) {
   rtc::Optional<uint32_t> ts = PlayoutTimestamp();
   if (!ts)
     return -1;
   *timestamp = *ts;
   return 0;
 }
 
 rtc::Optional<uint32_t> AudioCodingModuleImpl::PlayoutTimestamp() {
   return receiver_.GetPlayoutTimestamp();
@@ skipping 129 matching lines @@
 // Checks the validity of the parameters of the given codec
 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
   bool valid = acm2::RentACodec::IsCodecValid(codec);
   if (!valid)
     WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1,
                  "Invalid codec setting");
   return valid;
 }
 
 }  // namespace webrtc