aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-21 22:41:20 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-21 22:41:20 +0000
commit5038ecb1f17099ad9dc1d1e79516d9f6550e1ebd (patch)
treee9eb42f2d97b27cf45c6fdd2e955df5876c4041d /libavcodec
parent2bbd3434bc54f693fe8e7aa90c31e2d9b5771f69 (diff)
downloadffmpeg-5038ecb1f17099ad9dc1d1e79516d9f6550e1ebd.tar.gz
Rename subframe_size to a name that is not specific to some specific use
of ff_acelp_convolve_circ() Originally committed as revision 14894 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/acelp_filters.c10
-rw-r--r--libavcodec/acelp_filters.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/acelp_filters.c b/libavcodec/acelp_filters.c
index 03c4a544f6..a75d2291cd 100644
--- a/libavcodec/acelp_filters.c
+++ b/libavcodec/acelp_filters.c
@@ -85,22 +85,22 @@ void ff_acelp_convolve_circ(
int16_t* fc_out,
const int16_t* fc_in,
const int16_t* filter,
- int subframe_size)
+ int len)
{
int i, k;
- memset(fc_out, 0, subframe_size * sizeof(int16_t));
+ memset(fc_out, 0, len * sizeof(int16_t));
/* Since there are few pulses over an entire subframe (i.e. almost
all fc_in[i] are zero) it is faster to loop over fc_in first. */
- for(i=0; i<subframe_size; i++)
+ for(i=0; i<len; i++)
{
if(fc_in[i])
{
for(k=0; k<i; k++)
- fc_out[k] += (fc_in[i] * filter[subframe_size + k - i]) >> 15;
+ fc_out[k] += (fc_in[i] * filter[len + k - i]) >> 15;
- for(k=i; k<subframe_size; k++)
+ for(k=i; k<len; k++)
fc_out[k] += (fc_in[i] * filter[k - i]) >> 15;
}
}
diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h
index 6436e10d18..324be3b63d 100644
--- a/libavcodec/acelp_filters.h
+++ b/libavcodec/acelp_filters.h
@@ -75,7 +75,7 @@ void ff_acelp_convolve_circ(
int16_t* fc_out,
const int16_t* fc_in,
const int16_t* filter,
- int subframe_size);
+ int len);
/**
* LP synthesis filter.