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

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

Issue 1339253003: Move AudioDecoderIsac* to its own files (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 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 #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/engine_configurations.h" 14 #include "webrtc/engine_configurations.h"
15 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h" 15 #include "webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h"
16 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h" 16 #include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
17 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h" 17 #include "webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h"
18 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h " 18 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h "
19 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_decoder_is acfix.h"
19 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_is acfix.h" 20 #include "webrtc/modules/audio_coding/codecs/isac/fix/interface/audio_encoder_is acfix.h"
21 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_decoder_i sac.h"
20 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_i sac.h" 22 #include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_encoder_i sac.h"
21 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h " 23 #include "webrtc/modules/audio_coding/codecs/opus/interface/audio_encoder_opus.h "
22 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h" 24 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/audio_encoder_pcm16b .h"
23 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" 25 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
24 26
25 namespace webrtc { 27 namespace webrtc {
26 namespace acm2 { 28 namespace acm2 {
27 29
28 namespace { 30 namespace {
29 bool IsIsac(const CodecInst& codec) { 31 bool IsIsac(const CodecInst& codec) {
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 232 }
231 233
232 const AudioEncoder* CodecOwner::SpeechEncoder() const { 234 const AudioEncoder* CodecOwner::SpeechEncoder() const {
233 RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_); 235 RTC_DCHECK(!speech_encoder_ || !external_speech_encoder_);
234 return external_speech_encoder_ ? external_speech_encoder_ 236 return external_speech_encoder_ ? external_speech_encoder_
235 : speech_encoder_.get(); 237 : speech_encoder_.get();
236 } 238 }
237 239
238 } // namespace acm2 240 } // namespace acm2
239 } // namespace webrtc 241 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698