| Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
|
| diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
|
| index beb49bc4ce5bcf5a8cc3b331b63eb600cb20716e..806373ec80b0afa38c598731f43de7e5c3da0548 100644
|
| --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
|
| +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
|
| @@ -31,7 +31,7 @@ namespace acm2 {
|
|
|
| class ACMDTMFDetection;
|
|
|
| -class AudioCodingModuleImpl : public AudioCodingModule {
|
| +class AudioCodingModuleImpl final : public AudioCodingModule {
|
| public:
|
| friend webrtc::AudioCodingImpl;
|
|
|
| @@ -42,9 +42,6 @@ class AudioCodingModuleImpl : public AudioCodingModule {
|
| // Sender
|
| //
|
|
|
| - // Reset send codec.
|
| - int ResetEncoder() override;
|
| -
|
| // Can be called multiple times for Codec, CNG, RED.
|
| int RegisterSendCodec(const CodecInst& send_codec) override;
|
|
|
| @@ -57,20 +54,11 @@ class AudioCodingModuleImpl : public AudioCodingModule {
|
| // Get current send frequency.
|
| int SendFrequency() const override;
|
|
|
| - // Get encode bit-rate.
|
| - // Adaptive rate codecs return their current encode target rate, while other
|
| - // codecs return there long-term average or their fixed rate.
|
| - int SendBitrate() const override;
|
| -
|
| // Sets the bitrate to the specified value in bits/sec. In case the codec does
|
| // not support the requested value it will choose an appropriate value
|
| // instead.
|
| void SetBitRate(int bitrate_bps) override;
|
|
|
| - // Set available bandwidth, inform the encoder about the
|
| - // estimated bandwidth received from the remote party.
|
| - int SetReceivedEstimatedBandwidth(int bw) override;
|
| -
|
| // Register a transport callback which will be
|
| // called to deliver the encoded buffers.
|
| int RegisterTransportCallback(AudioPacketizationCallback* transport) override;
|
| @@ -124,9 +112,6 @@ class AudioCodingModuleImpl : public AudioCodingModule {
|
| // Initialize receiver, resets codec database etc.
|
| int InitializeReceiver() override;
|
|
|
| - // Reset the decoder state.
|
| - int ResetDecoder() override;
|
| -
|
| // Get current receive frequency.
|
| int ReceiveFrequency() const override;
|
|
|
| @@ -180,11 +165,6 @@ class AudioCodingModuleImpl : public AudioCodingModule {
|
| // Get Dtmf playout status.
|
| bool DtmfPlayoutStatus() const override;
|
|
|
| - // Estimate the Bandwidth based on the incoming stream, needed
|
| - // for one way audio where the RTCP send the BW estimate.
|
| - // This is also done in the RTP module .
|
| - int DecoderEstimatedBandwidth() const override;
|
| -
|
| // Set playout mode voice, fax.
|
| int SetPlayoutMode(AudioPlayoutMode mode) override;
|
|
|
| @@ -204,26 +184,10 @@ class AudioCodingModuleImpl : public AudioCodingModule {
|
|
|
| int GetNetworkStatistics(NetworkStatistics* statistics) override;
|
|
|
| - // GET RED payload for iSAC. The method id called when 'this' ACM is
|
| - // the default ACM.
|
| - // TODO(henrik.lundin) Not used. Remove?
|
| - int REDPayloadISAC(int isac_rate,
|
| - int isac_bw_estimate,
|
| - uint8_t* payload,
|
| - int16_t* length_bytes);
|
| -
|
| - int ReplaceInternalDTXWithWebRtc(bool use_webrtc_dtx) override;
|
| -
|
| - int IsInternalDTXReplacedWithWebRtc(bool* uses_webrtc_dtx) override;
|
| -
|
| int SetISACMaxRate(int max_bit_per_sec) override;
|
|
|
| int SetISACMaxPayloadSize(int max_size_bytes) override;
|
|
|
| - int ConfigISACBandwidthEstimator(int frame_size_ms,
|
| - int rate_bit_per_sec,
|
| - bool enforce_frame_size = false) override;
|
| -
|
| int SetOpusApplication(OpusApplicationMode application) override;
|
|
|
| // If current send codec is Opus, informs it about the maximum playback rate
|
|
|