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

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

Issue 2784873002: Delete unneeded includes of deprecated system_wrappers include files. (Closed)
Patch Set: Delete unneeded includes of system_wrappers/include/critical_section_wrapper.h 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 /* 11 /*
12 * This file generates databases with information about all supported audio 12 * This file generates databases with information about all supported audio
13 * codecs. 13 * codecs.
14 */ 14 */
15 15
16 // TODO(tlegrand): Change constant input pointers in all functions to constant 16 // TODO(tlegrand): Change constant input pointers in all functions to constant
17 // references, where appropriate. 17 // references, where appropriate.
18 #include "webrtc/modules/audio_coding/acm2/acm_codec_database.h" 18 #include "webrtc/modules/audio_coding/acm2/acm_codec_database.h"
19 19
20 #include <assert.h> 20 #include <assert.h>
21 21
22 #include "webrtc/base/checks.h" 22 #include "webrtc/base/checks.h"
23 #include "webrtc/system_wrappers/include/trace.h"
24 23
25 #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX)) 24 #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX))
26 #error iSAC and iSACFX codecs cannot be enabled at the same time 25 #error iSAC and iSACFX codecs cannot be enabled at the same time
27 #endif 26 #endif
28 27
29 namespace webrtc { 28 namespace webrtc {
30 29
31 namespace acm2 { 30 namespace acm2 {
32 31
33 namespace { 32 namespace {
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 } 340 }
342 // Gets codec id number from database for the receiver. 341 // Gets codec id number from database for the receiver.
343 int ACMCodecDB::ReceiverCodecNumber(const CodecInst& codec_inst) { 342 int ACMCodecDB::ReceiverCodecNumber(const CodecInst& codec_inst) {
344 // Look for a matching codec in the database. 343 // Look for a matching codec in the database.
345 return CodecId(codec_inst); 344 return CodecId(codec_inst);
346 } 345 }
347 346
348 } // namespace acm2 347 } // namespace acm2
349 348
350 } // namespace webrtc 349 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/common_video/incoming_video_stream.cc ('k') | webrtc/modules/audio_coding/acm2/acm_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698