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

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

Issue 2969653002: Update includes for webrtc/{base => rtc_base} rename (1/3) (Closed)
Patch Set: Rebased onto 89c4a7e57d524b13fbe0c823a83a4c10c2e63bd0 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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/include/audio_coding_module.h" 11 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
12 12
13 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h" 13 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
14 #include "webrtc/base/checks.h"
15 #include "webrtc/base/logging.h"
16 #include "webrtc/base/safe_conversions.h"
17 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" 14 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
18 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" 15 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
19 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" 16 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
20 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 17 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
18 #include "webrtc/rtc_base/checks.h"
19 #include "webrtc/rtc_base/logging.h"
20 #include "webrtc/rtc_base/safe_conversions.h"
21 #include "webrtc/system_wrappers/include/metrics.h" 21 #include "webrtc/system_wrappers/include/metrics.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 namespace { 25 namespace {
26 26
27 struct EncoderFactory { 27 struct EncoderFactory {
28 AudioEncoder* external_speech_encoder = nullptr; 28 AudioEncoder* external_speech_encoder = nullptr;
29 acm2::CodecManager codec_manager; 29 acm2::CodecManager codec_manager;
30 acm2::RentACodec rent_a_codec; 30 acm2::RentACodec rent_a_codec;
(...skipping 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 1360
1361 // Checks the validity of the parameters of the given codec 1361 // Checks the validity of the parameters of the given codec
1362 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { 1362 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
1363 bool valid = acm2::RentACodec::IsCodecValid(codec); 1363 bool valid = acm2::RentACodec::IsCodecValid(codec);
1364 if (!valid) 1364 if (!valid)
1365 LOG(LS_ERROR) << "Invalid codec setting"; 1365 LOG(LS_ERROR) << "Invalid codec setting";
1366 return valid; 1366 return valid;
1367 } 1367 }
1368 1368
1369 } // namespace webrtc 1369 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_send_test.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698