summaryrefslogtreecommitdiff
path: root/common_audio/include
diff options
context:
space:
mode:
authorkwiberg@webrtc.org <kwiberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-16 08:36:52 +0000
committerkwiberg@webrtc.org <kwiberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-07-16 08:36:52 +0000
commit9f7856a56b7ad9bc72b61995bcfb5aa444c114bb (patch)
treead5e3dc9db37dfc663877bdc8d67e2202f83464c /common_audio/include
parentb5966bdae72b68e2684a8eb172ee3d99ec7eb7ce (diff)
downloadwebrtc-9f7856a56b7ad9bc72b61995bcfb5aa444c114bb.tar.gz
int16<->float conversions: Use size_t for array length argument, not int
size_t is more appropriate for array lengths, since int might theoretically be too small for a really large array. But more importantly, if the caller's value is naturally of type size_t and the function requires an int, VC++ will trigger warning C4267 (http://msdn.microsoft.com/en-us/library/6kck0s93.aspx) because the implicit cast might be lossy, forcing the caller to do a manual cast. Typing the function with size_t in the first place resolves the problem. R=aluebs@webrtc.org, andrew@webrtc.org, minyue@webrtc.org Review URL: https://webrtc-codereview.appspot.com/21909004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6702 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_audio/include')
-rw-r--r--common_audio/include/audio_util.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/common_audio/include/audio_util.h b/common_audio/include/audio_util.h
index 18fdbe2a..9972a0e0 100644
--- a/common_audio/include/audio_util.h
+++ b/common_audio/include/audio_util.h
@@ -47,14 +47,14 @@ static inline float ScaleToFloat(int16_t v) {
}
// Round |size| elements of |src| to int16 with clamping and write to |dest|.
-void RoundToInt16(const float* src, int size, int16_t* dest);
+void RoundToInt16(const float* src, size_t size, int16_t* dest);
// Scale (from [-1, 1]) and round |size| elements of |src| to full-range int16
// with clamping and write to |dest|.
-void ScaleAndRoundToInt16(const float* src, int size, int16_t* dest);
+void ScaleAndRoundToInt16(const float* src, size_t size, int16_t* dest);
// Scale |size| elements of |src| to float [-1, 1] and write to |dest|.
-void ScaleToFloat(const int16_t* src, int size, float* dest);
+void ScaleToFloat(const int16_t* src, size_t size, float* dest);
// Deinterleave audio from |interleaved| to the channel buffers pointed to
// by |deinterleaved|. There must be sufficient space allocated in the