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

Side by Side Diff: webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h

Issue 2342443005: Moved Opus-specific payload splitting into AudioDecoderOpus. (Closed)
Patch Set: Some small fixes. Created 4 years, 2 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_OPUS_AUDIO_DECODER_OPUS_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_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 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" 16 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 19
20 class AudioDecoderOpus final : public AudioDecoder { 20 class AudioDecoderOpus final : public AudioDecoder {
21 public: 21 public:
22 explicit AudioDecoderOpus(size_t num_channels); 22 explicit AudioDecoderOpus(size_t num_channels);
23 ~AudioDecoderOpus() override; 23 ~AudioDecoderOpus() override;
24 24
25 std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
26 uint32_t timestamp) override;
25 void Reset() override; 27 void Reset() override;
26 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;
27 int PacketDurationRedundant(const uint8_t* encoded, 29 int PacketDurationRedundant(const uint8_t* encoded,
28 size_t encoded_len) const override; 30 size_t encoded_len) const override;
29 bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const override; 31 bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const override;
30 int SampleRateHz() const override; 32 int SampleRateHz() const override;
31 size_t Channels() const override; 33 size_t Channels() const override;
32 34
33 protected: 35 protected:
34 int DecodeInternal(const uint8_t* encoded, 36 int DecodeInternal(const uint8_t* encoded,
35 size_t encoded_len, 37 size_t encoded_len,
36 int sample_rate_hz, 38 int sample_rate_hz,
37 int16_t* decoded, 39 int16_t* decoded,
38 SpeechType* speech_type) override; 40 SpeechType* speech_type) override;
39 int DecodeRedundantInternal(const uint8_t* encoded, 41 int DecodeRedundantInternal(const uint8_t* encoded,
40 size_t encoded_len, 42 size_t encoded_len,
41 int sample_rate_hz, 43 int sample_rate_hz,
42 int16_t* decoded, 44 int16_t* decoded,
43 SpeechType* speech_type) override; 45 SpeechType* speech_type) override;
44 46
45 private: 47 private:
46 OpusDecInst* dec_state_; 48 OpusDecInst* dec_state_;
47 const size_t channels_; 49 const size_t channels_;
48 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus); 50 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderOpus);
49 }; 51 };
50 52
51 } // namespace webrtc 53 } // namespace webrtc
52 54
53 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_ 55 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698