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

Side by Side Diff: webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.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_G722_AUDIO_DECODER_G722_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
13 13
14 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h" 15 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
16 16
17 typedef struct WebRtcG722DecInst G722DecInst; 17 typedef struct WebRtcG722DecInst G722DecInst;
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 class AudioDecoderG722 final : public AudioDecoder { 21 class AudioDecoderG722 final : public AudioDecoder {
22 public: 22 public:
23 AudioDecoderG722(); 23 AudioDecoderG722();
24 ~AudioDecoderG722() override; 24 ~AudioDecoderG722() override;
25 bool HasDecodePlc() const override; 25 bool HasDecodePlc() const override;
26 void Reset() override; 26 void Reset() override;
27 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
28 uint32_t timestamp,
29 bool is_primary) override;
27 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 30 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
28 int SampleRateHz() const override; 31 int SampleRateHz() const override;
29 size_t Channels() const override; 32 size_t Channels() const override;
30 33
31 protected: 34 protected:
32 int DecodeInternal(const uint8_t* encoded, 35 int DecodeInternal(const uint8_t* encoded,
33 size_t encoded_len, 36 size_t encoded_len,
34 int sample_rate_hz, 37 int sample_rate_hz,
35 int16_t* decoded, 38 int16_t* decoded,
36 SpeechType* speech_type) override; 39 SpeechType* speech_type) override;
37 40
38 private: 41 private:
39 G722DecInst* dec_state_; 42 G722DecInst* dec_state_;
40 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722); 43 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
41 }; 44 };
42 45
43 class AudioDecoderG722Stereo final : public AudioDecoder { 46 class AudioDecoderG722Stereo final : public AudioDecoder {
44 public: 47 public:
45 AudioDecoderG722Stereo(); 48 AudioDecoderG722Stereo();
46 ~AudioDecoderG722Stereo() override; 49 ~AudioDecoderG722Stereo() override;
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 SampleRateHz() const override; 54 int SampleRateHz() const override;
49 size_t Channels() const override; 55 size_t Channels() const override;
50 56
51 protected: 57 protected:
52 int DecodeInternal(const uint8_t* encoded, 58 int DecodeInternal(const uint8_t* encoded,
53 size_t encoded_len, 59 size_t encoded_len,
54 int sample_rate_hz, 60 int sample_rate_hz,
55 int16_t* decoded, 61 int16_t* decoded,
56 SpeechType* speech_type) override; 62 SpeechType* speech_type) override;
57 63
58 private: 64 private:
59 // Splits the stereo-interleaved payload in |encoded| into separate payloads 65 // Splits the stereo-interleaved payload in |encoded| into separate payloads
60 // for left and right channels. The separated payloads are written to 66 // for left and right channels. The separated payloads are written to
61 // |encoded_deinterleaved|, which must hold at least |encoded_len| samples. 67 // |encoded_deinterleaved|, which must hold at least |encoded_len| samples.
62 // The left channel starts at offset 0, while the right channel starts at 68 // The left channel starts at offset 0, while the right channel starts at
63 // offset encoded_len / 2 into |encoded_deinterleaved|. 69 // offset encoded_len / 2 into |encoded_deinterleaved|.
64 void SplitStereoPacket(const uint8_t* encoded, 70 void SplitStereoPacket(const uint8_t* encoded,
65 size_t encoded_len, 71 size_t encoded_len,
66 uint8_t* encoded_deinterleaved); 72 uint8_t* encoded_deinterleaved);
67 73
68 G722DecInst* dec_state_left_; 74 G722DecInst* dec_state_left_;
69 G722DecInst* dec_state_right_; 75 G722DecInst* dec_state_right_;
70 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo); 76 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
71 }; 77 };
72 78
73 } // namespace webrtc 79 } // namespace webrtc
74 80
75 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ 81 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/g711/g711.gypi ('k') | webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698