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

Side by Side Diff: webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.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_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 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override; 27 int PacketDuration(const uint8_t* encoded, size_t encoded_len) const override;
28 int SampleRateHz() const override;
28 size_t Channels() const override; 29 size_t Channels() const override;
29 30
30 protected: 31 protected:
31 int DecodeInternal(const uint8_t* encoded, 32 int DecodeInternal(const uint8_t* encoded,
32 size_t encoded_len, 33 size_t encoded_len,
33 int sample_rate_hz, 34 int sample_rate_hz,
34 int16_t* decoded, 35 int16_t* decoded,
35 SpeechType* speech_type) override; 36 SpeechType* speech_type) override;
36 37
37 private: 38 private:
38 G722DecInst* dec_state_; 39 G722DecInst* dec_state_;
39 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722); 40 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722);
40 }; 41 };
41 42
42 class AudioDecoderG722Stereo final : public AudioDecoder { 43 class AudioDecoderG722Stereo final : public AudioDecoder {
43 public: 44 public:
44 AudioDecoderG722Stereo(); 45 AudioDecoderG722Stereo();
45 ~AudioDecoderG722Stereo() override; 46 ~AudioDecoderG722Stereo() override;
46 void Reset() override; 47 void Reset() override;
48 int SampleRateHz() const override;
49 size_t Channels() const override;
47 50
48 protected: 51 protected:
49 int DecodeInternal(const uint8_t* encoded, 52 int DecodeInternal(const uint8_t* encoded,
50 size_t encoded_len, 53 size_t encoded_len,
51 int sample_rate_hz, 54 int sample_rate_hz,
52 int16_t* decoded, 55 int16_t* decoded,
53 SpeechType* speech_type) override; 56 SpeechType* speech_type) override;
54 size_t Channels() const override;
55 57
56 private: 58 private:
57 // Splits the stereo-interleaved payload in |encoded| into separate payloads 59 // Splits the stereo-interleaved payload in |encoded| into separate payloads
58 // for left and right channels. The separated payloads are written to 60 // for left and right channels. The separated payloads are written to
59 // |encoded_deinterleaved|, which must hold at least |encoded_len| samples. 61 // |encoded_deinterleaved|, which must hold at least |encoded_len| samples.
60 // The left channel starts at offset 0, while the right channel starts at 62 // The left channel starts at offset 0, while the right channel starts at
61 // offset encoded_len / 2 into |encoded_deinterleaved|. 63 // offset encoded_len / 2 into |encoded_deinterleaved|.
62 void SplitStereoPacket(const uint8_t* encoded, 64 void SplitStereoPacket(const uint8_t* encoded,
63 size_t encoded_len, 65 size_t encoded_len,
64 uint8_t* encoded_deinterleaved); 66 uint8_t* encoded_deinterleaved);
65 67
66 G722DecInst* dec_state_left_; 68 G722DecInst* dec_state_left_;
67 G722DecInst* dec_state_right_; 69 G722DecInst* dec_state_right_;
68 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo); 70 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderG722Stereo);
69 }; 71 };
70 72
71 } // namespace webrtc 73 } // namespace webrtc
72 74
73 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_ 75 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698