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

Side by Side Diff: webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

Issue 1438663003: modules/audio_coding: Remove some codec include dirs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase again Created 5 years, 1 month 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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/neteq/audio_decoder_impl.h" 11 #include "webrtc/modules/audio_coding/neteq/audio_decoder_impl.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h" 16 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
17 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_decoder_pcm.h" 17 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
18 #ifdef WEBRTC_CODEC_G722 18 #ifdef WEBRTC_CODEC_G722
19 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_decoder_g722.h" 19 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
20 #endif 20 #endif
21 #ifdef WEBRTC_CODEC_ILBC 21 #ifdef WEBRTC_CODEC_ILBC
22 #include "webrtc/modules/audio_coding/codecs/ilbc/include/audio_decoder_ilbc.h" 22 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
23 #endif 23 #endif
24 #ifdef WEBRTC_CODEC_ISACFX 24 #ifdef WEBRTC_CODEC_ISACFX
25 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h" 25 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isac fix.h"
26 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h" 26 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isac fix.h"
27 #endif 27 #endif
28 #ifdef WEBRTC_CODEC_ISAC 28 #ifdef WEBRTC_CODEC_ISAC
29 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isa c.h" 29 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isa c.h"
30 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isa c.h" 30 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isa c.h"
31 #endif 31 #endif
32 #ifdef WEBRTC_CODEC_OPUS 32 #ifdef WEBRTC_CODEC_OPUS
33 #include "webrtc/modules/audio_coding/codecs/opus/include/audio_decoder_opus.h" 33 #include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h"
34 #endif 34 #endif
35 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_decoder_pcm16b .h" 35 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
36 36
37 namespace webrtc { 37 namespace webrtc {
38 38
39 AudioDecoderCng::AudioDecoderCng() { 39 AudioDecoderCng::AudioDecoderCng() {
40 RTC_CHECK_EQ(0, WebRtcCng_CreateDec(&dec_state_)); 40 RTC_CHECK_EQ(0, WebRtcCng_CreateDec(&dec_state_));
41 WebRtcCng_InitDec(dec_state_); 41 WebRtcCng_InitDec(dec_state_);
42 } 42 }
43 43
44 AudioDecoderCng::~AudioDecoderCng() { 44 AudioDecoderCng::~AudioDecoderCng() {
45 WebRtcCng_FreeDec(dec_state_); 45 WebRtcCng_FreeDec(dec_state_);
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 case NetEqDecoder::kDecoderRED: 232 case NetEqDecoder::kDecoderRED:
233 case NetEqDecoder::kDecoderAVT: 233 case NetEqDecoder::kDecoderAVT:
234 case NetEqDecoder::kDecoderArbitrary: 234 case NetEqDecoder::kDecoderArbitrary:
235 default: { 235 default: {
236 return NULL; 236 return NULL;
237 } 237 }
238 } 238 }
239 } 239 }
240 240
241 } // namespace webrtc 241 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/audio_decoder_impl.h ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698