Chromium Code Reviews

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

Issue 2668523004: Move AudioDecoder and related stuff to the api/ directory (Closed)
Patch Set: more review fixes Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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/base/checks.h" 14 #include "webrtc/base/checks.h"
14 #include "webrtc/base/safe_conversions.h" 15 #include "webrtc/base/safe_conversions.h"
15 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" 16 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
16 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" 17 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
17 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" 18 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
18 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 19 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
19 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
20 #include "webrtc/system_wrappers/include/metrics.h" 20 #include "webrtc/system_wrappers/include/metrics.h"
21 #include "webrtc/system_wrappers/include/trace.h" 21 #include "webrtc/system_wrappers/include/trace.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;
(...skipping 1346 matching lines...)
1376 // Checks the validity of the parameters of the given codec 1376 // Checks the validity of the parameters of the given codec
1377 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { 1377 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
1378 bool valid = acm2::RentACodec::IsCodecValid(codec); 1378 bool valid = acm2::RentACodec::IsCodecValid(codec);
1379 if (!valid) 1379 if (!valid)
1380 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1, 1380 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1,
1381 "Invalid codec setting"); 1381 "Invalid codec setting");
1382 return valid; 1382 return valid;
1383 } 1383 }
1384 1384
1385 } // namespace webrtc 1385 } // namespace webrtc
OLDNEW

Powered by Google App Engine