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

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

Issue 2024633002: AudioDecoder: New method SampleRateHz, + implementations for our codecs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: add TODO fix PCM A U at 8 kHz Created 4 years, 6 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_AUDIO_DECODER_PCM_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
13 13
14 #include "webrtc/base/checks.h" 14 #include "webrtc/base/checks.h"
15 #include "webrtc/base/constructormagic.h" 15 #include "webrtc/base/constructormagic.h"
16 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 16 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 19
20 class AudioDecoderPcmU final : public AudioDecoder { 20 class AudioDecoderPcmU final : public AudioDecoder {
21 public: 21 public:
22 explicit AudioDecoderPcmU(size_t num_channels) : num_channels_(num_channels) { 22 explicit AudioDecoderPcmU(size_t num_channels) : num_channels_(num_channels) {
23 RTC_DCHECK_GE(num_channels, 1u); 23 RTC_DCHECK_GE(num_channels, 1u);
24 } 24 }
25 void Reset() override; 25 void Reset() override;
26 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 26 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
27 int SampleRateHz() const override;
27 size_t Channels() const override; 28 size_t Channels() const override;
28 29
29 protected: 30 protected:
30 int DecodeInternal(const uint8_t* encoded, 31 int DecodeInternal(const uint8_t* encoded,
31 size_t encoded_len, 32 size_t encoded_len,
32 int sample_rate_hz, 33 int sample_rate_hz,
33 int16_t* decoded, 34 int16_t* decoded,
34 SpeechType* speech_type) override; 35 SpeechType* speech_type) override;
35 36
36 private: 37 private:
37 const size_t num_channels_; 38 const size_t num_channels_;
38 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU); 39 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
39 }; 40 };
40 41
41 class AudioDecoderPcmA final : public AudioDecoder { 42 class AudioDecoderPcmA final : public AudioDecoder {
42 public: 43 public:
43 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) { 44 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) {
44 RTC_DCHECK_GE(num_channels, 1u); 45 RTC_DCHECK_GE(num_channels, 1u);
45 } 46 }
46 void Reset() override; 47 void Reset() override;
47 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 48 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
49 int SampleRateHz() const override;
48 size_t Channels() const override; 50 size_t Channels() const override;
49 51
50 protected: 52 protected:
51 int DecodeInternal(const uint8_t* encoded, 53 int DecodeInternal(const uint8_t* encoded,
52 size_t encoded_len, 54 size_t encoded_len,
53 int sample_rate_hz, 55 int sample_rate_hz,
54 int16_t* decoded, 56 int16_t* decoded,
55 SpeechType* speech_type) override; 57 SpeechType* speech_type) override;
56 58
57 private: 59 private:
58 const size_t num_channels_; 60 const size_t num_channels_;
59 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA); 61 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
60 }; 62 };
61 63
62 } // namespace webrtc 64 } // namespace webrtc
63 65
64 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ 66 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698