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

Side by Side Diff: webrtc/modules/audio_coding/acm2/codec_manager.cc

Issue 1481493004: audio_coding: remove "main" directory (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 5 years 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_manager.h" 11 #include "webrtc/modules/audio_coding/acm2/codec_manager.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/main/acm2/rent_a_codec.h" 15 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
16 #include "webrtc/system_wrappers/include/trace.h" 16 #include "webrtc/system_wrappers/include/trace.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 namespace acm2 { 19 namespace acm2 {
20 20
21 namespace { 21 namespace {
22 22
23 // Check if the given codec is a valid to be registered as send codec. 23 // Check if the given codec is a valid to be registered as send codec.
24 int IsValidSendCodec(const CodecInst& send_codec) { 24 int IsValidSendCodec(const CodecInst& send_codec) {
25 int dummy_id = 0; 25 int dummy_id = 0;
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 CurrentEncoder()->SetFec(enable_codec_fec) && enable_codec_fec; 304 CurrentEncoder()->SetFec(enable_codec_fec) && enable_codec_fec;
305 return codec_stack_params_.use_codec_fec == enable_codec_fec ? 0 : -1; 305 return codec_stack_params_.use_codec_fec == enable_codec_fec ? 0 : -1;
306 } 306 }
307 307
308 AudioDecoder* CodecManager::GetAudioDecoder(const CodecInst& codec) { 308 AudioDecoder* CodecManager::GetAudioDecoder(const CodecInst& codec) {
309 return IsIsac(codec) ? rent_a_codec_.RentIsacDecoder() : nullptr; 309 return IsIsac(codec) ? rent_a_codec_.RentIsacDecoder() : nullptr;
310 } 310 }
311 311
312 } // namespace acm2 312 } // namespace acm2
313 } // namespace webrtc 313 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/codec_manager.h ('k') | webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698