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

Side by Side Diff: webrtc/modules/audio_coding/acm2/audio_coding_module.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) 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/main/include/audio_coding_module.h" 11 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/common_types.h" 14 #include "webrtc/common_types.h"
15 #include "webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h" 15 #include "webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h"
16 #include "webrtc/modules/audio_coding/main/acm2/rent_a_codec.h" 16 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
17 #include "webrtc/system_wrappers/include/clock.h" 17 #include "webrtc/system_wrappers/include/clock.h"
18 #include "webrtc/system_wrappers/include/trace.h" 18 #include "webrtc/system_wrappers/include/trace.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 // Create module 22 // Create module
23 AudioCodingModule* AudioCodingModule::Create(int id) { 23 AudioCodingModule* AudioCodingModule::Create(int id) {
24 Config config; 24 Config config;
25 config.id = id; 25 config.id = id;
26 config.clock = Clock::GetRealTimeClock(); 26 config.clock = Clock::GetRealTimeClock();
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // Checks the validity of the parameters of the given codec 89 // Checks the validity of the parameters of the given codec
90 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { 90 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
91 bool valid = acm2::RentACodec::IsCodecValid(codec); 91 bool valid = acm2::RentACodec::IsCodecValid(codec);
92 if (!valid) 92 if (!valid)
93 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1, 93 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1,
94 "Invalid codec setting"); 94 "Invalid codec setting");
95 return valid; 95 return valid;
96 } 96 }
97 97
98 } // namespace webrtc 98 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698