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

Side by Side Diff: webrtc/modules/audio_coding/acm2/acm_receiver.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. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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/acm2/acm_receiver.h" 11 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
12 12
13 #include <stdlib.h> // malloc 13 #include <stdlib.h> // malloc
14 14
15 #include <algorithm> // sort 15 #include <algorithm> // sort
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/api/audio_codecs/audio_decoder.h"
18 #include "webrtc/base/checks.h" 19 #include "webrtc/base/checks.h"
19 #include "webrtc/base/format_macros.h" 20 #include "webrtc/base/format_macros.h"
20 #include "webrtc/base/logging.h" 21 #include "webrtc/base/logging.h"
21 #include "webrtc/base/safe_conversions.h" 22 #include "webrtc/base/safe_conversions.h"
22 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h" 23 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
23 #include "webrtc/common_types.h" 24 #include "webrtc/common_types.h"
24 #include "webrtc/modules/audio_coding/codecs/audio_decoder.h"
25 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h" 25 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
26 #include "webrtc/modules/audio_coding/acm2/call_statistics.h" 26 #include "webrtc/modules/audio_coding/acm2/call_statistics.h"
27 #include "webrtc/modules/audio_coding/neteq/include/neteq.h" 27 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
28 #include "webrtc/system_wrappers/include/clock.h" 28 #include "webrtc/system_wrappers/include/clock.h"
29 #include "webrtc/system_wrappers/include/trace.h" 29 #include "webrtc/system_wrappers/include/trace.h"
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 namespace acm2 { 33 namespace acm2 {
34 34
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 387
388 void AcmReceiver::GetDecodingCallStatistics( 388 void AcmReceiver::GetDecodingCallStatistics(
389 AudioDecodingCallStats* stats) const { 389 AudioDecodingCallStats* stats) const {
390 rtc::CritScope lock(&crit_sect_); 390 rtc::CritScope lock(&crit_sect_);
391 *stats = call_stats_.GetDecodingStatistics(); 391 *stats = call_stats_.GetDecodingStatistics();
392 } 392 }
393 393
394 } // namespace acm2 394 } // namespace acm2
395 395
396 } // namespace webrtc 396 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_receive_test.cc ('k') | webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698