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

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

Issue 2553583002: Delete voice_engine_configurations.h (Closed)
Patch Set: Rebase Created 4 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/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/base/format_macros.h" 14 #include "webrtc/base/format_macros.h"
15 #include "webrtc/modules/audio_coding/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 #include "webrtc/voice_engine_configurations.h" 17 #include "webrtc/typedefs.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 namespace acm2 { 20 namespace acm2 {
21 21
22 namespace { 22 namespace {
23 23
24 // Check if the given codec is a valid to be registered as send codec. 24 // Check if the given codec is a valid to be registered as send codec.
25 int IsValidSendCodec(const CodecInst& send_codec) { 25 int IsValidSendCodec(const CodecInst& send_codec) {
26 int dummy_id = 0; 26 int dummy_id = 0;
27 if ((send_codec.channels != 1) && (send_codec.channels != 2)) { 27 if ((send_codec.channels != 1) && (send_codec.channels != 2)) {
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 if (!stack) { 247 if (!stack) {
248 return false; 248 return false;
249 } 249 }
250 acm->SetEncoder(std::move(stack)); 250 acm->SetEncoder(std::move(stack));
251 recreate_encoder_ = false; 251 recreate_encoder_ = false;
252 return true; 252 return true;
253 } 253 }
254 254
255 } // namespace acm2 255 } // namespace acm2
256 } // namespace webrtc 256 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_receiver.h ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698