9e525585fd
The subclasses that need a state pointer should declare them---with
the right type, not void*, to get rid of all those casts.
Two small but not quite trivial cleanups are included because they
blocked the state_ removal:
- AudioDecoderG722Stereo now inherits directly from AudioDecoder
instead of being a subclass of AudioDecoderG722.
- AudioDecoder now has a CngDecoderInstance member function, which
is implemented only by AudioDecoderCng. This replaces the previous
practice of calling AudioDecoder::state() and casting the result
to a CNG_dec_inst*. It still isn't pretty, but now the blemish is
plainly visible in the AudioDecoder class declaration.
R=henrik.lundin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/24169005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7623 4adac7df-926f-26a2-2b94-8c16560cd09d
285 lines
9.7 KiB
C++
285 lines
9.7 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
|
|
|
|
#include <assert.h>
|
|
|
|
#ifndef AUDIO_DECODER_UNITTEST
|
|
// If this is compiled as a part of the audio_deoder_unittest, the codec
|
|
// selection is made in the gypi file instead of in engine_configurations.h.
|
|
#include "webrtc/engine_configurations.h"
|
|
#endif
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
|
|
#ifdef WEBRTC_CODEC_G722
|
|
#include "webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h"
|
|
#endif
|
|
#ifdef WEBRTC_CODEC_ILBC
|
|
#include "webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h"
|
|
#endif
|
|
#ifdef WEBRTC_CODEC_ISACFX
|
|
#include "webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h"
|
|
#endif
|
|
#ifdef WEBRTC_CODEC_ISAC
|
|
#include "webrtc/modules/audio_coding/codecs/isac/main/interface/isac.h"
|
|
#endif
|
|
#ifdef WEBRTC_CODEC_OPUS
|
|
#include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h"
|
|
#endif
|
|
#include "webrtc/modules/audio_coding/neteq/interface/audio_decoder.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioDecoderPcmU : public AudioDecoder {
|
|
public:
|
|
AudioDecoderPcmU() {}
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init() { return 0; }
|
|
virtual int PacketDuration(const uint8_t* encoded, size_t encoded_len);
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
|
|
};
|
|
|
|
class AudioDecoderPcmA : public AudioDecoder {
|
|
public:
|
|
AudioDecoderPcmA() {}
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init() { return 0; }
|
|
virtual int PacketDuration(const uint8_t* encoded, size_t encoded_len);
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
|
|
};
|
|
|
|
class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU {
|
|
public:
|
|
explicit AudioDecoderPcmUMultiCh(size_t channels) : AudioDecoderPcmU() {
|
|
assert(channels > 0);
|
|
channels_ = channels;
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
|
|
};
|
|
|
|
class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA {
|
|
public:
|
|
explicit AudioDecoderPcmAMultiCh(size_t channels) : AudioDecoderPcmA() {
|
|
assert(channels > 0);
|
|
channels_ = channels;
|
|
}
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
|
|
};
|
|
|
|
#ifdef WEBRTC_CODEC_PCM16
|
|
// This class handles all four types (i.e., sample rates) of PCM16B codecs.
|
|
// The type is specified in the constructor parameter |type|.
|
|
class AudioDecoderPcm16B : public AudioDecoder {
|
|
public:
|
|
AudioDecoderPcm16B();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init() { return 0; }
|
|
virtual int PacketDuration(const uint8_t* encoded, size_t encoded_len);
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16B);
|
|
};
|
|
|
|
// This class handles all four types (i.e., sample rates) of PCM16B codecs.
|
|
// The type is specified in the constructor parameter |type|, and the number
|
|
// of channels is derived from the type.
|
|
class AudioDecoderPcm16BMultiCh : public AudioDecoderPcm16B {
|
|
public:
|
|
explicit AudioDecoderPcm16BMultiCh(int num_channels);
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcm16BMultiCh);
|
|
};
|
|
#endif
|
|
|
|
#ifdef WEBRTC_CODEC_ILBC
|
|
class AudioDecoderIlbc : public AudioDecoder {
|
|
public:
|
|
AudioDecoderIlbc();
|
|
virtual ~AudioDecoderIlbc();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual bool HasDecodePlc() const { return true; }
|
|
virtual int DecodePlc(int num_frames, int16_t* decoded);
|
|
virtual int Init();
|
|
|
|
private:
|
|
iLBC_decinst_t* dec_state_;
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderIlbc);
|
|
};
|
|
#endif
|
|
|
|
#ifdef WEBRTC_CODEC_ISAC
|
|
class AudioDecoderIsac : public AudioDecoder {
|
|
public:
|
|
explicit AudioDecoderIsac(int decode_sample_rate_hz);
|
|
virtual ~AudioDecoderIsac();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int DecodeRedundant(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual bool HasDecodePlc() const { return true; }
|
|
virtual int DecodePlc(int num_frames, int16_t* decoded);
|
|
virtual int Init();
|
|
virtual int IncomingPacket(const uint8_t* payload,
|
|
size_t payload_len,
|
|
uint16_t rtp_sequence_number,
|
|
uint32_t rtp_timestamp,
|
|
uint32_t arrival_timestamp);
|
|
virtual int ErrorCode();
|
|
|
|
private:
|
|
ISACStruct* isac_state_;
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsac);
|
|
};
|
|
#endif
|
|
|
|
#ifdef WEBRTC_CODEC_ISACFX
|
|
class AudioDecoderIsacFix : public AudioDecoder {
|
|
public:
|
|
AudioDecoderIsacFix();
|
|
virtual ~AudioDecoderIsacFix();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init();
|
|
virtual int IncomingPacket(const uint8_t* payload,
|
|
size_t payload_len,
|
|
uint16_t rtp_sequence_number,
|
|
uint32_t rtp_timestamp,
|
|
uint32_t arrival_timestamp);
|
|
virtual int ErrorCode();
|
|
|
|
private:
|
|
ISACFIX_MainStruct* isac_state_;
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacFix);
|
|
};
|
|
#endif
|
|
|
|
#ifdef WEBRTC_CODEC_G722
|
|
class AudioDecoderG722 : public AudioDecoder {
|
|
public:
|
|
AudioDecoderG722();
|
|
virtual ~AudioDecoderG722();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual bool HasDecodePlc() const { return false; }
|
|
virtual int Init();
|
|
virtual int PacketDuration(const uint8_t* encoded, size_t encoded_len);
|
|
|
|
private:
|
|
G722DecInst* dec_state_;
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
|
|
};
|
|
|
|
class AudioDecoderG722Stereo : public AudioDecoder {
|
|
public:
|
|
AudioDecoderG722Stereo();
|
|
virtual ~AudioDecoderG722Stereo();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init();
|
|
|
|
private:
|
|
// Splits the stereo-interleaved payload in |encoded| into separate payloads
|
|
// for left and right channels. The separated payloads are written to
|
|
// |encoded_deinterleaved|, which must hold at least |encoded_len| samples.
|
|
// The left channel starts at offset 0, while the right channel starts at
|
|
// offset encoded_len / 2 into |encoded_deinterleaved|.
|
|
void SplitStereoPacket(const uint8_t* encoded, size_t encoded_len,
|
|
uint8_t* encoded_deinterleaved);
|
|
|
|
G722DecInst* dec_state_left_;
|
|
G722DecInst* dec_state_right_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
|
|
};
|
|
#endif
|
|
|
|
#ifdef WEBRTC_CODEC_CELT
|
|
class AudioDecoderCelt : public AudioDecoder {
|
|
public:
|
|
explicit AudioDecoderCelt(int num_channels);
|
|
virtual ~AudioDecoderCelt();
|
|
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init();
|
|
virtual bool HasDecodePlc() const;
|
|
virtual int DecodePlc(int num_frames, int16_t* decoded);
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderCelt);
|
|
};
|
|
#endif
|
|
|
|
#ifdef WEBRTC_CODEC_OPUS
|
|
class AudioDecoderOpus : public AudioDecoder {
|
|
public:
|
|
explicit AudioDecoderOpus(int num_channels);
|
|
virtual ~AudioDecoderOpus();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int DecodeRedundant(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type);
|
|
virtual int Init();
|
|
virtual int PacketDuration(const uint8_t* encoded, size_t encoded_len);
|
|
virtual int PacketDurationRedundant(const uint8_t* encoded,
|
|
size_t encoded_len) const;
|
|
virtual bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const;
|
|
|
|
private:
|
|
OpusDecInst* dec_state_;
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus);
|
|
};
|
|
#endif
|
|
|
|
// AudioDecoderCng is a special type of AudioDecoder. It inherits from
|
|
// AudioDecoder just to fit in the DecoderDatabase. None of the class methods
|
|
// should be used, except constructor, destructor, and accessors.
|
|
// TODO(hlundin): Consider the possibility to create a super-class to
|
|
// AudioDecoder that is stored in DecoderDatabase. Then AudioDecoder and a
|
|
// specific CngDecoder class could both inherit from that class.
|
|
class AudioDecoderCng : public AudioDecoder {
|
|
public:
|
|
explicit AudioDecoderCng();
|
|
virtual ~AudioDecoderCng();
|
|
virtual int Decode(const uint8_t* encoded, size_t encoded_len,
|
|
int16_t* decoded, SpeechType* speech_type) { return -1; }
|
|
virtual int Init();
|
|
virtual int IncomingPacket(const uint8_t* payload,
|
|
size_t payload_len,
|
|
uint16_t rtp_sequence_number,
|
|
uint32_t rtp_timestamp,
|
|
uint32_t arrival_timestamp) { return -1; }
|
|
|
|
virtual CNG_dec_inst* CngDecoderInstance() OVERRIDE { return dec_state_; }
|
|
|
|
private:
|
|
CNG_dec_inst* dec_state_;
|
|
DISALLOW_COPY_AND_ASSIGN(AudioDecoderCng);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_AUDIO_DECODER_IMPL_H_
|