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

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

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 4 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
(...skipping 11 matching lines...) Expand all
22 ACMResampler::ACMResampler() { 22 ACMResampler::ACMResampler() {
23 } 23 }
24 24
25 ACMResampler::~ACMResampler() { 25 ACMResampler::~ACMResampler() {
26 } 26 }
27 27
28 int ACMResampler::Resample10Msec(const int16_t* in_audio, 28 int ACMResampler::Resample10Msec(const int16_t* in_audio,
29 int in_freq_hz, 29 int in_freq_hz,
30 int out_freq_hz, 30 int out_freq_hz,
31 int num_audio_channels, 31 int num_audio_channels,
32 int out_capacity_samples, 32 size_t out_capacity_samples,
33 int16_t* out_audio) { 33 int16_t* out_audio) {
34 int in_length = in_freq_hz * num_audio_channels / 100; 34 size_t in_length = static_cast<size_t>(in_freq_hz * num_audio_channels / 100);
35 int out_length = out_freq_hz * num_audio_channels / 100; 35 int out_length = out_freq_hz * num_audio_channels / 100;
36 if (in_freq_hz == out_freq_hz) { 36 if (in_freq_hz == out_freq_hz) {
37 if (out_capacity_samples < in_length) { 37 if (out_capacity_samples < in_length) {
38 assert(false); 38 assert(false);
39 return -1; 39 return -1;
40 } 40 }
41 memcpy(out_audio, in_audio, in_length * sizeof(int16_t)); 41 memcpy(out_audio, in_audio, in_length * sizeof(int16_t));
42 return in_length / num_audio_channels; 42 return static_cast<int>(in_length / num_audio_channels);
43 } 43 }
44 44
45 if (resampler_.InitializeIfNeeded(in_freq_hz, out_freq_hz, 45 if (resampler_.InitializeIfNeeded(in_freq_hz, out_freq_hz,
46 num_audio_channels) != 0) { 46 num_audio_channels) != 0) {
47 LOG_FERR3(LS_ERROR, InitializeIfNeeded, in_freq_hz, out_freq_hz, 47 LOG_FERR3(LS_ERROR, InitializeIfNeeded, in_freq_hz, out_freq_hz,
48 num_audio_channels); 48 num_audio_channels);
49 return -1; 49 return -1;
50 } 50 }
51 51
52 out_length = 52 out_length =
53 resampler_.Resample(in_audio, in_length, out_audio, out_capacity_samples); 53 resampler_.Resample(in_audio, in_length, out_audio, out_capacity_samples);
54 if (out_length == -1) { 54 if (out_length == -1) {
55 LOG_FERR4(LS_ERROR, 55 LOG_FERR4(LS_ERROR,
56 Resample, 56 Resample,
57 in_audio, 57 in_audio,
58 in_length, 58 in_length,
59 out_audio, 59 out_audio,
60 out_capacity_samples); 60 out_capacity_samples);
61 return -1; 61 return -1;
62 } 62 }
63 63
64 return out_length / num_audio_channels; 64 return out_length / num_audio_channels;
65 } 65 }
66 66
67 } // namespace acm2 67 } // namespace acm2
68 } // namespace webrtc 68 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_resampler.h ('k') | webrtc/modules/audio_coding/main/acm2/acm_send_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698