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

Side by Side Diff: webrtc/common_audio/lapped_transform.cc

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix compile Created 4 years, 11 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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/common_audio/lapped_transform.h" 11 #include "webrtc/common_audio/lapped_transform.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <cstdlib> 14 #include <cstdlib>
15 #include <cstring> 15 #include <cstring>
16 16
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/common_audio/real_fourier.h" 18 #include "webrtc/common_audio/real_fourier.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 void LappedTransform::BlockThunk::ProcessBlock(const float* const* input, 22 void LappedTransform::BlockThunk::ProcessBlock(const float* const* input,
23 size_t num_frames, 23 size_t num_frames,
24 int num_input_channels, 24 size_t num_input_channels,
25 int num_output_channels, 25 size_t num_output_channels,
26 float* const* output) { 26 float* const* output) {
27 RTC_CHECK_EQ(num_input_channels, parent_->num_in_channels_); 27 RTC_CHECK_EQ(num_input_channels, parent_->num_in_channels_);
28 RTC_CHECK_EQ(num_output_channels, parent_->num_out_channels_); 28 RTC_CHECK_EQ(num_output_channels, parent_->num_out_channels_);
29 RTC_CHECK_EQ(parent_->block_length_, num_frames); 29 RTC_CHECK_EQ(parent_->block_length_, num_frames);
30 30
31 for (int i = 0; i < num_input_channels; ++i) { 31 for (size_t i = 0; i < num_input_channels; ++i) {
32 memcpy(parent_->real_buf_.Row(i), input[i], 32 memcpy(parent_->real_buf_.Row(i), input[i],
33 num_frames * sizeof(*input[0])); 33 num_frames * sizeof(*input[0]));
34 parent_->fft_->Forward(parent_->real_buf_.Row(i), 34 parent_->fft_->Forward(parent_->real_buf_.Row(i),
35 parent_->cplx_pre_.Row(i)); 35 parent_->cplx_pre_.Row(i));
36 } 36 }
37 37
38 size_t block_length = RealFourier::ComplexLength( 38 size_t block_length = RealFourier::ComplexLength(
39 RealFourier::FftOrder(num_frames)); 39 RealFourier::FftOrder(num_frames));
40 RTC_CHECK_EQ(parent_->cplx_length_, block_length); 40 RTC_CHECK_EQ(parent_->cplx_length_, block_length);
41 parent_->block_processor_->ProcessAudioBlock(parent_->cplx_pre_.Array(), 41 parent_->block_processor_->ProcessAudioBlock(parent_->cplx_pre_.Array(),
42 num_input_channels, 42 num_input_channels,
43 parent_->cplx_length_, 43 parent_->cplx_length_,
44 num_output_channels, 44 num_output_channels,
45 parent_->cplx_post_.Array()); 45 parent_->cplx_post_.Array());
46 46
47 for (int i = 0; i < num_output_channels; ++i) { 47 for (size_t i = 0; i < num_output_channels; ++i) {
48 parent_->fft_->Inverse(parent_->cplx_post_.Row(i), 48 parent_->fft_->Inverse(parent_->cplx_post_.Row(i),
49 parent_->real_buf_.Row(i)); 49 parent_->real_buf_.Row(i));
50 memcpy(output[i], parent_->real_buf_.Row(i), 50 memcpy(output[i], parent_->real_buf_.Row(i),
51 num_frames * sizeof(*input[0])); 51 num_frames * sizeof(*input[0]));
52 } 52 }
53 } 53 }
54 54
55 LappedTransform::LappedTransform(int num_in_channels, 55 LappedTransform::LappedTransform(size_t num_in_channels,
56 int num_out_channels, 56 size_t num_out_channels,
57 size_t chunk_length, 57 size_t chunk_length,
58 const float* window, 58 const float* window,
59 size_t block_length, 59 size_t block_length,
60 size_t shift_amount, 60 size_t shift_amount,
61 Callback* callback) 61 Callback* callback)
62 : blocker_callback_(this), 62 : blocker_callback_(this),
63 num_in_channels_(num_in_channels), 63 num_in_channels_(num_in_channels),
64 num_out_channels_(num_out_channels), 64 num_out_channels_(num_out_channels),
65 block_length_(block_length), 65 block_length_(block_length),
66 chunk_length_(chunk_length), 66 chunk_length_(chunk_length),
(...skipping 25 matching lines...) Expand all
92 RTC_CHECK_EQ(0u, block_length_ & (block_length_ - 1)); 92 RTC_CHECK_EQ(0u, block_length_ & (block_length_ - 1));
93 } 93 }
94 94
95 void LappedTransform::ProcessChunk(const float* const* in_chunk, 95 void LappedTransform::ProcessChunk(const float* const* in_chunk,
96 float* const* out_chunk) { 96 float* const* out_chunk) {
97 blocker_.ProcessChunk(in_chunk, chunk_length_, num_in_channels_, 97 blocker_.ProcessChunk(in_chunk, chunk_length_, num_in_channels_,
98 num_out_channels_, out_chunk); 98 num_out_channels_, out_chunk);
99 } 99 }
100 100
101 } // namespace webrtc 101 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/common_audio/lapped_transform.h ('k') | webrtc/common_audio/lapped_transform_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698