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

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

Issue 2342443005: Moved Opus-specific payload splitting into AudioDecoderOpus. (Closed)
Patch Set: Priority levels are ints, kHighestPriority is gone. Also small cleanups. 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, 26 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
27 uint32_t timestamp, 27 uint32_t timestamp) override;
28 bool is_primary) override;
29 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 28 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
30 int SampleRateHz() const override; 29 int SampleRateHz() const override;
31 size_t Channels() const override; 30 size_t Channels() const override;
32 31
33 protected: 32 protected:
34 int DecodeInternal(const uint8_t* encoded, 33 int DecodeInternal(const uint8_t* encoded,
35 size_t encoded_len, 34 size_t encoded_len,
36 int sample_rate_hz, 35 int sample_rate_hz,
37 int16_t* decoded, 36 int16_t* decoded,
38 SpeechType* speech_type) override; 37 SpeechType* speech_type) override;
39 38
40 private: 39 private:
41 const size_t num_channels_; 40 const size_t num_channels_;
42 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU); 41 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmU);
43 }; 42 };
44 43
45 class AudioDecoderPcmA final : public AudioDecoder { 44 class AudioDecoderPcmA final : public AudioDecoder {
46 public: 45 public:
47 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) { 46 explicit AudioDecoderPcmA(size_t num_channels) : num_channels_(num_channels) {
48 RTC_DCHECK_GE(num_channels, 1u); 47 RTC_DCHECK_GE(num_channels, 1u);
49 } 48 }
50 void Reset() override; 49 void Reset() override;
51 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload, 50 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
52 uint32_t timestamp, 51 uint32_t timestamp) override;
53 bool is_primary) override;
54 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 52 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
55 int SampleRateHz() const override; 53 int SampleRateHz() const override;
56 size_t Channels() const override; 54 size_t Channels() const override;
57 55
58 protected: 56 protected:
59 int DecodeInternal(const uint8_t* encoded, 57 int DecodeInternal(const uint8_t* encoded,
60 size_t encoded_len, 58 size_t encoded_len,
61 int sample_rate_hz, 59 int sample_rate_hz,
62 int16_t* decoded, 60 int16_t* decoded,
63 SpeechType* speech_type) override; 61 SpeechType* speech_type) override;
64 62
65 private: 63 private:
66 const size_t num_channels_; 64 const size_t num_channels_;
67 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA); 65 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderPcmA);
68 }; 66 };
69 67
70 } // namespace webrtc 68 } // namespace webrtc
71 69
72 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_ 70 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698