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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/codec_owner.cc

Issue 1417173004: audio_coding: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Restored incorrectly renamed header guards and fixed an old error 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) 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/main/acm2/codec_owner.h" 11 #include "webrtc/modules/audio_coding/main/acm2/codec_owner.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/logging.h" 14 #include "webrtc/base/logging.h"
15 #include "webrtc/engine_configurations.h" 15 #include "webrtc/engine_configurations.h"
16 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h" 16 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
17 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h" 17 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
18 #ifdef WEBRTC_CODEC_G722 18 #ifdef WEBRTC_CODEC_G722
19 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h" 19 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"
20 #endif 20 #endif
21 #ifdef WEBRTC_CODEC_ILBC 21 #ifdef WEBRTC_CODEC_ILBC
22 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h " 22 #include "webrtc/modules/audio_coding/codecs/ilbc/include/audio_encoder_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/interface/audio_decoder_is acfix.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/interface/audio_encoder_is acfix.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/interface/audio_decoder_i sac.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/interface/audio_encoder_i sac.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/interface/audio_encoder_opus.h " 33 #include "webrtc/modules/audio_coding/codecs/opus/include/audio_encoder_opus.h"
34 #endif 34 #endif
35 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h" 35 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h"
36 #ifdef WEBRTC_CODEC_RED 36 #ifdef WEBRTC_CODEC_RED
37 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" 37 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
38 #endif 38 #endif
39 39
40 namespace webrtc { 40 namespace webrtc {
41 namespace acm2 { 41 namespace acm2 {
42 42
43 CodecOwner::CodecOwner() : external_speech_encoder_(nullptr) { 43 CodecOwner::CodecOwner() : external_speech_encoder_(nullptr) {
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 } 204 }
205 205
206 const AudioEncoder* CodecOwner::SpeechEncoder() const { 206 const AudioEncoder* CodecOwner::SpeechEncoder() const {
207 RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_); 207 RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_);
208 return external_speech_encoder_ ? external_speech_encoder_ 208 return external_speech_encoder_ ? external_speech_encoder_
209 : speech_encoder_.get(); 209 : speech_encoder_.get();
210 } 210 }
211 211
212 } // namespace acm2 212 } // namespace acm2
213 } // namespace webrtc 213 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/codec_owner.h ('k') | webrtc/modules/audio_coding/main/acm2/nack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698