Index: webrtc/modules/audio_coding/main/acm2/codec_owner.h |
diff --git a/webrtc/modules/audio_coding/main/acm2/codec_owner.h b/webrtc/modules/audio_coding/main/acm2/codec_owner.h |
index 29ac098906a8054f1859e77cc11a0ad6dd18ee4e..bfeaee6ddc63e261df12fda081b77522c163e1a6 100644 |
--- a/webrtc/modules/audio_coding/main/acm2/codec_owner.h |
+++ b/webrtc/modules/audio_coding/main/acm2/codec_owner.h |
@@ -16,7 +16,6 @@ |
#include "webrtc/common_types.h" |
#include "webrtc/modules/audio_coding/codecs/audio_encoder.h" |
#include "webrtc/modules/audio_coding/codecs/audio_decoder.h" |
-#include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h" |
#include "webrtc/modules/audio_coding/main/include/audio_coding_module_typedefs.h" |
namespace webrtc { |
@@ -27,13 +26,6 @@ class CodecOwner { |
CodecOwner(); |
~CodecOwner(); |
- // Start using the specified encoder. Returns false on error. |
- // TODO(kwiberg): Don't handle errors here (bug 5033) |
- bool SetEncoders(const CodecInst& speech_inst, |
- int cng_payload_type, |
- ACMVADMode vad_mode, |
- int red_payload_type) WARN_UNUSED_RESULT; |
- |
void SetEncoders(AudioEncoder* external_speech_encoder, |
int cng_payload_type, |
ACMVADMode vad_mode, |
@@ -43,10 +35,6 @@ class CodecOwner { |
ACMVADMode vad_mode, |
int red_payload_type); |
- // Returns a pointer to an iSAC decoder owned by the CodecOwner. The decoder |
- // will live as long as the CodecOwner exists. |
- AudioDecoder* GetIsacDecoder(); |
- |
AudioEncoder* Encoder(); |
const AudioEncoder* Encoder() const; |
@@ -58,8 +46,6 @@ class CodecOwner { |
rtc::scoped_ptr<AudioEncoder> cng_encoder_; |
rtc::scoped_ptr<AudioEncoder> red_encoder_; |
- RentACodec rent_a_codec_; |
- |
RTC_DISALLOW_COPY_AND_ASSIGN(CodecOwner); |
}; |