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

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

Issue 2787263003: Delete all log messages depending on system_wrappers. (Closed)
Patch Set: 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/acm2/acm_resampler.h" 11 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 #include <string.h> 14 #include <string.h>
15 15
16 #include "webrtc/common_audio/resampler/include/resampler.h" 16 #include "webrtc/common_audio/resampler/include/resampler.h"
17 #include "webrtc/system_wrappers/include/logging.h"
18 17
19 namespace webrtc { 18 namespace webrtc {
20 namespace acm2 { 19 namespace acm2 {
21 20
22 ACMResampler::ACMResampler() { 21 ACMResampler::ACMResampler() {
23 } 22 }
24 23
25 ACMResampler::~ACMResampler() { 24 ACMResampler::~ACMResampler() {
26 } 25 }
27 26
28 int ACMResampler::Resample10Msec(const int16_t* in_audio, 27 int ACMResampler::Resample10Msec(const int16_t* in_audio,
29 int in_freq_hz, 28 int in_freq_hz,
30 int out_freq_hz, 29 int out_freq_hz,
31 size_t num_audio_channels, 30 size_t num_audio_channels,
32 size_t out_capacity_samples, 31 size_t out_capacity_samples,
33 int16_t* out_audio) { 32 int16_t* out_audio) {
34 size_t in_length = in_freq_hz * num_audio_channels / 100; 33 size_t in_length = in_freq_hz * num_audio_channels / 100;
35 if (in_freq_hz == out_freq_hz) { 34 if (in_freq_hz == out_freq_hz) {
36 if (out_capacity_samples < in_length) { 35 if (out_capacity_samples < in_length) {
37 assert(false); 36 assert(false);
38 return -1; 37 return -1;
39 } 38 }
40 memcpy(out_audio, in_audio, in_length * sizeof(int16_t)); 39 memcpy(out_audio, in_audio, in_length * sizeof(int16_t));
41 return static_cast<int>(in_length / num_audio_channels); 40 return static_cast<int>(in_length / num_audio_channels);
42 } 41 }
43 42
44 if (resampler_.InitializeIfNeeded(in_freq_hz, out_freq_hz, 43 if (resampler_.InitializeIfNeeded(in_freq_hz, out_freq_hz,
45 num_audio_channels) != 0) { 44 num_audio_channels) != 0) {
46 LOG(LS_ERROR) << "InitializeIfNeeded(" << in_freq_hz << ", " << out_freq_hz
47 << ", " << num_audio_channels << ") failed.";
48 return -1; 45 return -1;
49 } 46 }
50 47
51 int out_length = 48 int out_length =
52 resampler_.Resample(in_audio, in_length, out_audio, out_capacity_samples); 49 resampler_.Resample(in_audio, in_length, out_audio, out_capacity_samples);
53 if (out_length == -1) { 50 if (out_length == -1) {
54 LOG(LS_ERROR) << "Resample(" << in_audio << ", " << in_length << ", "
55 << out_audio << ", " << out_capacity_samples << ") failed.";
56 return -1; 51 return -1;
57 } 52 }
58 53
59 return static_cast<int>(out_length / num_audio_channels); 54 return static_cast<int>(out_length / num_audio_channels);
60 } 55 }
61 56
62 } // namespace acm2 57 } // namespace acm2
63 } // namespace webrtc 58 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698