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

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

Issue 1438663003: modules/audio_coding: Remove some codec include dirs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated needed after rebase 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/audio_encoder_cng.h"
17 #ifdef WEBRTC_CODEC_RED 17 #ifdef WEBRTC_CODEC_RED
18 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h" 18 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
19 #endif 19 #endif
20 20
21 namespace webrtc { 21 namespace webrtc {
22 namespace acm2 { 22 namespace acm2 {
23 23
24 CodecOwner::CodecOwner() : speech_encoder_(nullptr) { 24 CodecOwner::CodecOwner() : speech_encoder_(nullptr) {
25 } 25 }
26 26
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 const AudioEncoder* CodecOwner::Encoder() const { 107 const AudioEncoder* CodecOwner::Encoder() const {
108 if (cng_encoder_) 108 if (cng_encoder_)
109 return cng_encoder_.get(); 109 return cng_encoder_.get();
110 if (red_encoder_) 110 if (red_encoder_)
111 return red_encoder_.get(); 111 return red_encoder_.get();
112 return speech_encoder_; 112 return speech_encoder_;
113 } 113 }
114 114
115 } // namespace acm2 115 } // namespace acm2
116 } // namespace webrtc 116 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698