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

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

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 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 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h " 11 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_decoder_opus.h "
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 AudioDecoderOpus::AudioDecoderOpus(size_t num_channels) 17 AudioDecoderOpus::AudioDecoderOpus(size_t num_channels)
18 : channels_(num_channels) { 18 : channels_(num_channels) {
19 DCHECK(num_channels == 1 || num_channels == 2); 19 RTC_DCHECK(num_channels == 1 || num_channels == 2);
20 WebRtcOpus_DecoderCreate(&dec_state_, static_cast<int>(channels_)); 20 WebRtcOpus_DecoderCreate(&dec_state_, static_cast<int>(channels_));
21 WebRtcOpus_DecoderInit(dec_state_); 21 WebRtcOpus_DecoderInit(dec_state_);
22 } 22 }
23 23
24 AudioDecoderOpus::~AudioDecoderOpus() { 24 AudioDecoderOpus::~AudioDecoderOpus() {
25 WebRtcOpus_DecoderFree(dec_state_); 25 WebRtcOpus_DecoderFree(dec_state_);
26 } 26 }
27 27
28 int AudioDecoderOpus::DecodeInternal(const uint8_t* encoded, 28 int AudioDecoderOpus::DecodeInternal(const uint8_t* encoded,
29 size_t encoded_len, 29 size_t encoded_len,
30 int sample_rate_hz, 30 int sample_rate_hz,
31 int16_t* decoded, 31 int16_t* decoded,
32 SpeechType* speech_type) { 32 SpeechType* speech_type) {
33 DCHECK_EQ(sample_rate_hz, 48000); 33 RTC_DCHECK_EQ(sample_rate_hz, 48000);
34 int16_t temp_type = 1; // Default is speech. 34 int16_t temp_type = 1; // Default is speech.
35 int ret = 35 int ret =
36 WebRtcOpus_Decode(dec_state_, encoded, encoded_len, decoded, &temp_type); 36 WebRtcOpus_Decode(dec_state_, encoded, encoded_len, decoded, &temp_type);
37 if (ret > 0) 37 if (ret > 0)
38 ret *= static_cast<int>(channels_); // Return total number of samples. 38 ret *= static_cast<int>(channels_); // Return total number of samples.
39 *speech_type = ConvertSpeechType(temp_type); 39 *speech_type = ConvertSpeechType(temp_type);
40 return ret; 40 return ret;
41 } 41 }
42 42
43 int AudioDecoderOpus::DecodeRedundantInternal(const uint8_t* encoded, 43 int AudioDecoderOpus::DecodeRedundantInternal(const uint8_t* encoded,
44 size_t encoded_len, 44 size_t encoded_len,
45 int sample_rate_hz, 45 int sample_rate_hz,
46 int16_t* decoded, 46 int16_t* decoded,
47 SpeechType* speech_type) { 47 SpeechType* speech_type) {
48 if (!PacketHasFec(encoded, encoded_len)) { 48 if (!PacketHasFec(encoded, encoded_len)) {
49 // This packet is a RED packet. 49 // This packet is a RED packet.
50 return DecodeInternal(encoded, encoded_len, sample_rate_hz, decoded, 50 return DecodeInternal(encoded, encoded_len, sample_rate_hz, decoded,
51 speech_type); 51 speech_type);
52 } 52 }
53 53
54 DCHECK_EQ(sample_rate_hz, 48000); 54 RTC_DCHECK_EQ(sample_rate_hz, 48000);
55 int16_t temp_type = 1; // Default is speech. 55 int16_t temp_type = 1; // Default is speech.
56 int ret = WebRtcOpus_DecodeFec(dec_state_, encoded, encoded_len, decoded, 56 int ret = WebRtcOpus_DecodeFec(dec_state_, encoded, encoded_len, decoded,
57 &temp_type); 57 &temp_type);
58 if (ret > 0) 58 if (ret > 0)
59 ret *= static_cast<int>(channels_); // Return total number of samples. 59 ret *= static_cast<int>(channels_); // Return total number of samples.
60 *speech_type = ConvertSpeechType(temp_type); 60 *speech_type = ConvertSpeechType(temp_type);
61 return ret; 61 return ret;
62 } 62 }
63 63
64 void AudioDecoderOpus::Reset() { 64 void AudioDecoderOpus::Reset() {
(...skipping 20 matching lines...) Expand all
85 int fec; 85 int fec;
86 fec = WebRtcOpus_PacketHasFec(encoded, encoded_len); 86 fec = WebRtcOpus_PacketHasFec(encoded, encoded_len);
87 return (fec == 1); 87 return (fec == 1);
88 } 88 }
89 89
90 size_t AudioDecoderOpus::Channels() const { 90 size_t AudioDecoderOpus::Channels() const {
91 return channels_; 91 return channels_;
92 } 92 }
93 93
94 } // namespace webrtc 94 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698