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

Side by Side Diff: webrtc/modules/audio_coding/codecs/g711/include/audio_decoder_pcm.h

Issue 1353803002: Simple cleanups of AudioDecoder and AudioEncoder classes (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@dmove-isac
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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_DECODER_PCM_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_DECODER_PCM_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_DECODER_PCM_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_DECODER_PCM_H_
13 13
14 #include "webrtc/base/checks.h" 14 #include "webrtc/base/checks.h"
15 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 15 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 class AudioDecoderPcmU : public AudioDecoder { 19 class AudioDecoderPcmU final : public AudioDecoder {
20 public: 20 public:
21 AudioDecoderPcmU() {} 21 explicit AudioDecoderPcmU(size_t num_channels) : num_channels_(num_channels) {
22 RTC_DCHECK_GE(num_channels, 1u);
23 }
22 void Reset() override; 24 void Reset() override;
23 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 25 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
24 size_t Channels() const override; 26 size_t Channels() const override;
25 27
26 protected: 28 protected:
27 int DecodeInternal(const uint8_t* encoded, 29 int DecodeInternal(const uint8_t* encoded,
28 size_t encoded_len, 30 size_t encoded_len,
29 int sample_rate_hz, 31 int sample_rate_hz,
30 int16_t* decoded, 32 int16_t* decoded,
31 SpeechType* speech_type) override; 33 SpeechType* speech_type) override;
32 34
33 private: 35 private:
36 const size_t num_channels_;
34 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU); 37 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
35 }; 38 };
36 39
37 class AudioDecoderPcmA : public AudioDecoder { 40 class AudioDecoderPcmA final : public AudioDecoder {
38 public: 41 public:
39 AudioDecoderPcmA() {} 42 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) {
43 RTC_DCHECK_GE(num_channels, 1u);
44 }
40 void Reset() override; 45 void Reset() override;
41 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 46 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
42 size_t Channels() const override; 47 size_t Channels() const override;
43 48
44 protected: 49 protected:
45 int DecodeInternal(const uint8_t* encoded, 50 int DecodeInternal(const uint8_t* encoded,
46 size_t encoded_len, 51 size_t encoded_len,
47 int sample_rate_hz, 52 int sample_rate_hz,
48 int16_t* decoded, 53 int16_t* decoded,
49 SpeechType* speech_type) override; 54 SpeechType* speech_type) override;
50 55
51 private: 56 private:
57 const size_t num_channels_;
52 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA); 58 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
53 }; 59 };
54 60
55 class AudioDecoderPcmUMultiCh : public AudioDecoderPcmU { 61 } // namespace webrtc
56 public:
57 explicit AudioDecoderPcmUMultiCh(size_t channels)
58 : AudioDecoderPcmU(), channels_(channels) {
59 RTC_DCHECK_GT(channels, 0u);
60 }
61 size_t Channels() const override;
62 62
63 private:
64 const size_t channels_;
65 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmUMultiCh);
66 };
67
68 class AudioDecoderPcmAMultiCh : public AudioDecoderPcmA {
69 public:
70 explicit AudioDecoderPcmAMultiCh(size_t channels)
71 : AudioDecoderPcmA(), channels_(channels) {
72 RTC_DCHECK_GT(channels, 0u);
73 }
74 size_t Channels() const override;
75
76 private:
77 const size_t channels_;
78 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmAMultiCh);
79 };
80
81 } // namespace webrtc
82 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_DECODER_PCM_H_ 63 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_DECODER_PCM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698