Add AudioEncoder::GetTargetBitrate

webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h

 /*
  *  Copyright (c) 2014 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 34 matching lines @@
   };
 
   explicit AudioEncoderOpus(const Config& config);
   ~AudioEncoderOpus() override;
 
   int SampleRateHz() const override;
   int NumChannels() const override;
   size_t MaxEncodedBytes() const override;
   int Num10MsFramesInNextPacket() const override;
   int Max10MsFramesInAPacket() const override;
+  int GetTargetBitrate() const override;
   void SetTargetBitrate(int bits_per_second) override;
   void SetProjectedPacketLossRate(double fraction) override;
 
   double packet_loss_rate() const { return packet_loss_rate_; }
   ApplicationMode application() const { return application_; }
   bool dtx_enabled() const { return dtx_enabled_; }
+  int bitrate_bps() const { return bitrate_bps_; }

[kwiberg-webrtc, 2015/06/17 14:36:31]

Do you really need this anymore? GetTargetBitrate does exactly the same thing.

[hlundin-webrtc, 2015/06/18 08:52:18]

Done.

+
   EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
                              const int16_t* audio,
                              size_t max_encoded_bytes,
                              uint8_t* encoded) override;
 
  private:
   const int num_10ms_frames_per_packet_;
   const int num_channels_;
   const int payload_type_;
   const ApplicationMode application_;
@@ skipping 26 matching lines @@
     return encoder()->application();
   }
   double packet_loss_rate() const {
     CriticalSectionScoped cs(encoder_lock_.get());
     return encoder()->packet_loss_rate();
   }
   bool dtx_enabled() const {
     CriticalSectionScoped cs(encoder_lock_.get());
     return encoder()->dtx_enabled();
   }
+  int bitrate_bps() const {
+    CriticalSectionScoped cs(encoder_lock_.get());
+    return encoder()->bitrate_bps();
+  }
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_INTERFACE_AUDIO_ENCODER_OPUS_H_