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

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

Issue 2326003002: Moved codec-specific audio packet splitting into decoders. (Closed)
Patch Set: Fixed types in packet splitting (size_t vs. uint32_t) Created 4 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_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 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
27 uint32_t timestamp,
28 bool is_primary) override;
26 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 29 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
27 int SampleRateHz() const override; 30 int SampleRateHz() const override;
28 size_t Channels() const override; 31 size_t Channels() const override;
29 32
30 protected: 33 protected:
31 int DecodeInternal(const uint8_t* encoded, 34 int DecodeInternal(const uint8_t* encoded,
32 size_t encoded_len, 35 size_t encoded_len,
33 int sample_rate_hz, 36 int sample_rate_hz,
34 int16_t* decoded, 37 int16_t* decoded,
35 SpeechType* speech_type) override; 38 SpeechType* speech_type) override;
36 39
37 private: 40 private:
38 const size_t num_channels_; 41 const size_t num_channels_;
39 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU); 42 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
40 }; 43 };
41 44
42 class AudioDecoderPcmA final : public AudioDecoder { 45 class AudioDecoderPcmA final : public AudioDecoder {
43 public: 46 public:
44 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) { 47 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) {
45 RTC_DCHECK_GE(num_channels, 1u); 48 RTC_DCHECK_GE(num_channels, 1u);
46 } 49 }
47 void Reset() override; 50 void Reset() override;
51 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
52 uint32_t timestamp,
53 bool is_primary) override;
48 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 54 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
49 int SampleRateHz() const override; 55 int SampleRateHz() const override;
50 size_t Channels() const override; 56 size_t Channels() const override;
51 57
52 protected: 58 protected:
53 int DecodeInternal(const uint8_t* encoded, 59 int DecodeInternal(const uint8_t* encoded,
54 size_t encoded_len, 60 size_t encoded_len,
55 int sample_rate_hz, 61 int sample_rate_hz,
56 int16_t* decoded, 62 int16_t* decoded,
57 SpeechType* speech_type) override; 63 SpeechType* speech_type) override;
58 64
59 private: 65 private:
60 const size_t num_channels_; 66 const size_t num_channels_;
61 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA); 67 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
62 }; 68 };
63 69
64 } // namespace webrtc 70 } // namespace webrtc
65 71
66 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ 72 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/audio_decoder.cc ('k') | webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698