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

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

Issue 2781343002: Replace use of system_wrappers/include/logging.h by base/logging.h. (Closed)
Patch Set: Rebased. Created 3 years, 8 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" 14 #include "webrtc/base/checks.h"
15 #include "webrtc/base/logging.h"
15 #include "webrtc/base/safe_conversions.h" 16 #include "webrtc/base/safe_conversions.h"
16 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h" 17 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
17 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" 18 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
18 #include "webrtc/modules/audio_coding/acm2/codec_manager.h" 19 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
19 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h" 20 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
20 #include "webrtc/system_wrappers/include/metrics.h" 21 #include "webrtc/system_wrappers/include/metrics.h"
21 #include "webrtc/system_wrappers/include/trace.h" 22 #include "webrtc/system_wrappers/include/trace.h"
22 23
23 namespace webrtc { 24 namespace webrtc {
24 25
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 // Checks the validity of the parameters of the given codec 1362 // Checks the validity of the parameters of the given codec
1362 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { 1363 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
1363 bool valid = acm2::RentACodec::IsCodecValid(codec); 1364 bool valid = acm2::RentACodec::IsCodecValid(codec);
1364 if (!valid) 1365 if (!valid)
1365 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1, 1366 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1,
1366 "Invalid codec setting"); 1367 "Invalid codec setting");
1367 return valid; 1368 return valid;
1368 } 1369 }
1369 1370
1370 } // namespace webrtc 1371 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_resampler.cc ('k') | webrtc/modules/audio_coding/neteq/decision_logic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698