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

Unified Diff: webrtc/common_audio/include/audio_util.h

Issue 1227203003: Update audio code to use size_t more correctly, webrtc/common_audio/ portion. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/common_audio/fft4g.c ('k') | webrtc/common_audio/lapped_transform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/common_audio/include/audio_util.h
diff --git a/webrtc/common_audio/include/audio_util.h b/webrtc/common_audio/include/audio_util.h
index 8262649145546180f23b6e82094d324b7f604e7f..fedaaa23638dad36eaaee521641ae63e0aef2d00 100644
--- a/webrtc/common_audio/include/audio_util.h
+++ b/webrtc/common_audio/include/audio_util.h
@@ -69,12 +69,12 @@ void FloatS16ToFloat(const float* src, size_t size, float* dest);
// |deinterleaved| buffers (|num_channel| buffers with |samples_per_channel|
// per buffer).
template <typename T>
-void Deinterleave(const T* interleaved, int samples_per_channel,
+void Deinterleave(const T* interleaved, size_t samples_per_channel,
int num_channels, T* const* deinterleaved) {
for (int i = 0; i < num_channels; ++i) {
T* channel = deinterleaved[i];
int interleaved_idx = i;
- for (int j = 0; j < samples_per_channel; ++j) {
+ for (size_t j = 0; j < samples_per_channel; ++j) {
channel[j] = interleaved[interleaved_idx];
interleaved_idx += num_channels;
}
@@ -85,12 +85,12 @@ void Deinterleave(const T* interleaved, int samples_per_channel,
// |interleaved|. There must be sufficient space allocated in |interleaved|
// (|samples_per_channel| * |num_channels|).
template <typename T>
-void Interleave(const T* const* deinterleaved, int samples_per_channel,
+void Interleave(const T* const* deinterleaved, size_t samples_per_channel,
int num_channels, T* interleaved) {
for (int i = 0; i < num_channels; ++i) {
const T* channel = deinterleaved[i];
int interleaved_idx = i;
- for (int j = 0; j < samples_per_channel; ++j) {
+ for (size_t j = 0; j < samples_per_channel; ++j) {
interleaved[interleaved_idx] = channel[j];
interleaved_idx += num_channels;
}
« no previous file with comments | « webrtc/common_audio/fft4g.c ('k') | webrtc/common_audio/lapped_transform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698