zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

G722 implementation of the AudioDecoderFactoryTemplate API

Browse Source 
Now the templated AudioDecoderFactory can create G722 decoders!

BUG=webrtc:7839

Review-Url: https://codereview.webrtc.org/2940833002
Cr-Commit-Position: refs/heads/master@{#18643}
This commit is contained in:
kwiberg
2017-06-17 17:30:09 -07:00
committed by Commit Bot
parent 0eacd88568
commit b1ed7f09c0
9 changed files with 138 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc
View File

@ -130,7 +130,7 @@ NamedDecoderConstructor decoder_constructors[] = {
if (format.clockrate_hz == 8000) {
if (format.num_channels == 1) {
if (out) {
out->reset(new AudioDecoderG722);
out->reset(new AudioDecoderG722Impl);
}
return true;
} else if (format.num_channels == 2) {

28
webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc
View File

@ -18,24 +18,24 @@
namespace webrtc {
AudioDecoderG722::AudioDecoderG722() {
AudioDecoderG722Impl::AudioDecoderG722Impl() {
WebRtcG722_CreateDecoder(&dec_state_);
WebRtcG722_DecoderInit(dec_state_);
}
AudioDecoderG722::~AudioDecoderG722() {
AudioDecoderG722Impl::~AudioDecoderG722Impl() {
WebRtcG722_FreeDecoder(dec_state_);
}
bool AudioDecoderG722::HasDecodePlc() const {
bool AudioDecoderG722Impl::HasDecodePlc() const {
return false;
}
int AudioDecoderG722::DecodeInternal(const uint8_t* encoded,
size_t encoded_len,
int sample_rate_hz,
int16_t* decoded,
SpeechType* speech_type) {
int AudioDecoderG722Impl::DecodeInternal(const uint8_t* encoded,
size_t encoded_len,
int sample_rate_hz,
int16_t* decoded,
SpeechType* speech_type) {
RTC_DCHECK_EQ(SampleRateHz(), sample_rate_hz);
int16_t temp_type = 1; // Default is speech.
size_t ret =
@ -44,28 +44,28 @@ int AudioDecoderG722::DecodeInternal(const uint8_t* encoded,
return static_cast<int>(ret);
}
void AudioDecoderG722::Reset() {
void AudioDecoderG722Impl::Reset() {
WebRtcG722_DecoderInit(dec_state_);
}
std::vector<AudioDecoder::ParseResult> AudioDecoderG722::ParsePayload(
std::vector<AudioDecoder::ParseResult> AudioDecoderG722Impl::ParsePayload(
rtc::Buffer&& payload,
uint32_t timestamp) {
return LegacyEncodedAudioFrame::SplitBySamples(this, std::move(payload),
timestamp, 8, 16);
}
int AudioDecoderG722::PacketDuration(const uint8_t* encoded,
size_t encoded_len) const {
int AudioDecoderG722Impl::PacketDuration(const uint8_t* encoded,
size_t encoded_len) const {
// 1/2 encoded byte per sample per channel.
return static_cast<int>(2 * encoded_len / Channels());
}
int AudioDecoderG722::SampleRateHz() const {
int AudioDecoderG722Impl::SampleRateHz() const {
return 16000;
}
size_t AudioDecoderG722::Channels() const {
size_t AudioDecoderG722Impl::Channels() const {
return 1;
}

8
webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h
View File

@ -18,10 +18,10 @@ typedef struct WebRtcG722DecInst G722DecInst;
namespace webrtc {
class AudioDecoderG722 final : public AudioDecoder {
class AudioDecoderG722Impl final : public AudioDecoder {
public:
AudioDecoderG722();
~AudioDecoderG722() override;
AudioDecoderG722Impl();
~AudioDecoderG722Impl() override;
bool HasDecodePlc() const override;
void Reset() override;
std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
@ -39,7 +39,7 @@ class AudioDecoderG722 final : public AudioDecoder {
private:
G722DecInst* dec_state_;
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Impl);
};
class AudioDecoderG722Stereo final : public AudioDecoder {