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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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/acm2/codec_manager.h" 11 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
12 12
13 #include "webrtc/rtc_base/checks.h" 13 #include "webrtc/base/checks.h"
14 //#include "webrtc/rtc_base/format_macros.h" 14 //#include "webrtc/base/format_macros.h"
15 #include "webrtc/base/logging.h"
15 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 16 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
16 #include "webrtc/rtc_base/logging.h"
17 #include "webrtc/typedefs.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 if ((send_codec.channels != 1) && (send_codec.channels != 2)) { 26 if ((send_codec.channels != 1) && (send_codec.channels != 2)) {
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 if (!stack) { 236 if (!stack) {
237 return false; 237 return false;
238 } 238 }
239 acm->SetEncoder(std::move(stack)); 239 acm->SetEncoder(std::move(stack));
240 recreate_encoder_ = false; 240 recreate_encoder_ = false;
241 return true; 241 return true;
242 } 242 }
243 243
244 } // namespace acm2 244 } // namespace acm2
245 } // namespace webrtc 245 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/codec_manager.h ('k') | webrtc/modules/audio_coding/acm2/rent_a_codec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698