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

Side by Side Diff: webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h

Issue 2945423003: Don't forget to support G722 stereo decoding (Closed)
Patch Set: Created 3 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
(...skipping 24 matching lines...) Expand all
35 size_t encoded_len, 35 size_t encoded_len,
36 int sample_rate_hz, 36 int sample_rate_hz,
37 int16_t* decoded, 37 int16_t* decoded,
38 SpeechType* speech_type) override; 38 SpeechType* speech_type) override;
39 39
40 private: 40 private:
41 G722DecInst* dec_state_; 41 G722DecInst* dec_state_;
42 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Impl); 42 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Impl);
43 }; 43 };
44 44
45 class AudioDecoderG722Stereo final : public AudioDecoder { 45 class AudioDecoderG722StereoImpl final : public AudioDecoder {
46 public: 46 public:
47 AudioDecoderG722Stereo(); 47 AudioDecoderG722StereoImpl();
48 ~AudioDecoderG722Stereo() override; 48 ~AudioDecoderG722StereoImpl() override;
49 void Reset() override; 49 void Reset() override;
50 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload, 50 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
51 uint32_t timestamp) override; 51 uint32_t timestamp) override;
52 int SampleRateHz() const override; 52 int SampleRateHz() const override;
53 size_t Channels() const override; 53 size_t Channels() const override;
54 54
55 protected: 55 protected:
56 int DecodeInternal(const uint8_t* encoded, 56 int DecodeInternal(const uint8_t* encoded,
57 size_t encoded_len, 57 size_t encoded_len,
58 int sample_rate_hz, 58 int sample_rate_hz,
59 int16_t* decoded, 59 int16_t* decoded,
60 SpeechType* speech_type) override; 60 SpeechType* speech_type) override;
61 61
62 private: 62 private:
63 // Splits the stereo-interleaved payload in |encoded| into separate payloads 63 // Splits the stereo-interleaved payload in |encoded| into separate payloads
64 // for left and right channels. The separated payloads are written to 64 // for left and right channels. The separated payloads are written to
65 // |encoded_deinterleaved|, which must hold at least |encoded_len| samples. 65 // |encoded_deinterleaved|, which must hold at least |encoded_len| samples.
66 // The left channel starts at offset 0, while the right channel starts at 66 // The left channel starts at offset 0, while the right channel starts at
67 // offset encoded_len / 2 into |encoded_deinterleaved|. 67 // offset encoded_len / 2 into |encoded_deinterleaved|.
68 void SplitStereoPacket(const uint8_t* encoded, 68 void SplitStereoPacket(const uint8_t* encoded,
69 size_t encoded_len, 69 size_t encoded_len,
70 uint8_t* encoded_deinterleaved); 70 uint8_t* encoded_deinterleaved);
71 71
72 G722DecInst* dec_state_left_; 72 G722DecInst* dec_state_left_;
73 G722DecInst* dec_state_right_; 73 G722DecInst* dec_state_right_;
74 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo); 74 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722StereoImpl);
75 }; 75 };
76 76
77 } // namespace webrtc 77 } // namespace webrtc
78 78
79 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ 79 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698