diff options
author | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-31 05:42:20 +0000 |
---|---|---|
committer | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-31 05:42:20 +0000 |
commit | ec6de0f24a4854e25c2ea9466561c93ec90937c0 (patch) | |
tree | 04df109bf6bf94d0abbdf5ff2a83a314c4d35813 /libaf/af_tools.c | |
parent | 630d1fcf9446e32a159502d56beae4acec8d7a3c (diff) | |
download | mpv-ec6de0f24a4854e25c2ea9466561c93ec90937c0.tar.bz2 mpv-ec6de0f24a4854e25c2ea9466561c93ec90937c0.tar.xz |
10l memory leak + bug fixes in ms to sample time conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8675 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af_tools.c')
-rw-r--r-- | libaf/af_tools.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libaf/af_tools.c b/libaf/af_tools.c index d9f8bc9498..11eea2b49e 100644 --- a/libaf/af_tools.c +++ b/libaf/af_tools.c @@ -29,7 +29,7 @@ inline int af_to_dB(int n, float* in, float* out, float k) if(!in || !out) return AF_ERROR; - for(i=0;i<AF_NCH;i++){ + for(i=0;i<n;i++){ if(in[i] == 0.0) out[i]=-200.0; else @@ -38,30 +38,30 @@ inline int af_to_dB(int n, float* in, float* out, float k) return AF_OK; } -/* Convert from ms to sample time*/ -inline int af_from_ms(int n, float* in, float* out, int rate, float mi, float ma) +/* Convert from ms to sample time */ +inline int af_from_ms(int n, float* in, int* out, int rate, float mi, float ma) { int i = 0; // Sanity check if(!in || !out) return AF_ERROR; - for(i=0;i<AF_NCH;i++) - out[i]=clamp(in[i],ma,mi); + for(i=0;i<n;i++) + out[i]=(int)((float)rate * clamp(in[i],mi,ma)/1000.0); return AF_OK; } /* Convert from sample time to ms */ -inline int af_to_ms(int n, float* in, float* out, int rate) +inline int af_to_ms(int n, int* in, float* out, int rate) { int i = 0; // Sanity check - if(!in || !out) + if(!in || !out || !rate) return AF_ERROR; - for(i=0;i<AF_NCH;i++) - out[i]=in[i]; + for(i=0;i<n;i++) + out[i]=1000.0 * (float)in[i]/((float)rate); return AF_OK; } |