summaryrefslogtreecommitdiff
path: root/modules/audio_coding/neteq/interface
diff options
context:
space:
mode:
Diffstat (limited to 'modules/audio_coding/neteq/interface')
-rw-r--r--modules/audio_coding/neteq/interface/audio_decoder.h10
-rw-r--r--modules/audio_coding/neteq/interface/neteq.h2
2 files changed, 2 insertions, 10 deletions
diff --git a/modules/audio_coding/neteq/interface/audio_decoder.h b/modules/audio_coding/neteq/interface/audio_decoder.h
index 9a2fb8b4..16d78c9e 100644
--- a/modules/audio_coding/neteq/interface/audio_decoder.h
+++ b/modules/audio_coding/neteq/interface/audio_decoder.h
@@ -63,12 +63,7 @@ class AudioDecoder {
// Used by PacketDuration below. Save the value -1 for errors.
enum { kNotImplemented = -2 };
- explicit AudioDecoder(enum NetEqDecoder type)
- : codec_type_(type),
- channels_(1),
- state_(NULL) {
- }
-
+ AudioDecoder() : channels_(1), state_(NULL) {}
virtual ~AudioDecoder() {}
// Decodes |encode_len| bytes from |encoded| and writes the result in
@@ -119,8 +114,6 @@ class AudioDecoder {
// Returns true if the packet has FEC and false otherwise.
virtual bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const;
- virtual NetEqDecoder codec_type() const;
-
// Returns the underlying decoder state.
void* state() { return state_; }
@@ -140,7 +133,6 @@ class AudioDecoder {
protected:
static SpeechType ConvertSpeechType(int16_t type);
- enum NetEqDecoder codec_type_;
size_t channels_;
void* state_;
diff --git a/modules/audio_coding/neteq/interface/neteq.h b/modules/audio_coding/neteq/interface/neteq.h
index 925cb231..560e77ba 100644
--- a/modules/audio_coding/neteq/interface/neteq.h
+++ b/modules/audio_coding/neteq/interface/neteq.h
@@ -248,7 +248,7 @@ class NetEq {
// Returns the error code for the last occurred error. If no error has
// occurred, 0 is returned.
- virtual int LastError() = 0;
+ virtual int LastError() const = 0;
// Returns the error code last returned by a decoder (audio or comfort noise).
// When LastError() returns kDecoderErrorCode or kComfortNoiseErrorCode, check