Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

Issue 1348613003: Move AudioDecoderPcm* next to AudioEncoderPcm* (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-pcm16
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
diff --git a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
index 27f293effc61b49b732d72fcd83aac0b422f7226..f7d50d1f663fe59fc6dd87cce55b334fc5e61064 100644
--- a/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
+++ b/webrtc/modules/audio_coding/neteq/audio_decoder_impl.h
@@ -28,68 +28,6 @@
namespace webrtc {
-class AudioDecoderPcmU : public AudioDecoder {
- public:
- AudioDecoderPcmU() {}
- void Reset() override;
- int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
- size_t Channels() const override;
-
- protected:
- int DecodeInternal(const uint8_t* encoded,
- size_t encoded_len,
- int sample_rate_hz,
- int16_t* decoded,
- SpeechType* speech_type) override;
-
- private:
- RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
-};
-
-class AudioDecoderPcmA : public AudioDecoder {
- public:
- AudioDecoderPcmA() {}
- void Reset() override;
- int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
- size_t Channels() const override;
-
- protected:
- int DecodeInternal(const uint8_t* encoded,
- size_t encoded_len,
- int sample_rate_hz,
- int16_t* decoded,
- SpeechType* speech_type) override;
-
- private:
- RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
-};
-
-class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU {
- public:
- explicit AudioDecoderPcmUMultiCh(size_t channels)
- : AudioDecoderPcmU(), channels_(channels) {
- assert(channels > 0);
- }
- size_t Channels() const override;
-
- private:
- const size_t channels_;
- RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
-};
-
-class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA {
- public:
- explicit AudioDecoderPcmAMultiCh(size_t channels)
- : AudioDecoderPcmA(), channels_(channels) {
- assert(channels > 0);
- }
- size_t Channels() const override;
-
- private:
- const size_t channels_;
- RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
-};
-
// 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.

Powered by Google App Engine
This is Rietveld 408576698