summaryrefslogtreecommitdiff
path: root/libavcodec/cook.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-10-24 01:08:19 +0200
committerDiego Biurrun <diego@biurrun.de>2012-10-26 18:28:38 +0200
commitf23b4a068230fb4ebed2449cd5f303f3b16d333d (patch)
tree3eacfdc3ecf8b172cf4ff72b6b9f0ddc344f82d2 /libavcodec/cook.c
parent20015379a46a3b261f57b0daf0c7237b62c1fd82 (diff)
cook: cosmetics: Better names for joint_decode() function parameters
Diffstat (limited to 'libavcodec/cook.c')
-rw-r--r--libavcodec/cook.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 28ee8ed149..05efa50f1d 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -809,8 +809,8 @@ static void decouple_float(COOKContext *q,
* @param mlt_buffer1 pointer to left channel mlt coefficients
* @param mlt_buffer2 pointer to right channel mlt coefficients
*/
-static int joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1,
- float *mlt_buffer2)
+static int joint_decode(COOKContext *q, COOKSubpacket *p,
+ float *mlt_buffer_left, float *mlt_buffer_right)
{
int i, j, res;
int decouple_tab[SUBBAND_SIZE] = { 0 };
@@ -822,8 +822,8 @@ static int joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1,
memset(decode_buffer, 0, sizeof(q->decode_buffer_0));
/* Make sure the buffers are zeroed out. */
- memset(mlt_buffer1, 0, 1024 * sizeof(*mlt_buffer1));
- memset(mlt_buffer2, 0, 1024 * sizeof(*mlt_buffer2));
+ memset(mlt_buffer_left, 0, 1024 * sizeof(*mlt_buffer_left));
+ memset(mlt_buffer_right, 0, 1024 * sizeof(*mlt_buffer_right));
decouple_info(q, p, decouple_tab);
if ((res = mono_decode(q, p, decode_buffer)) < 0)
return res;
@@ -831,8 +831,8 @@ static int joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1,
/* The two channels are stored interleaved in decode_buffer. */
for (i = 0; i < p->js_subband_start; i++) {
for (j = 0; j < SUBBAND_SIZE; j++) {
- mlt_buffer1[i * 20 + j] = decode_buffer[i * 40 + j];
- mlt_buffer2[i * 20 + j] = decode_buffer[i * 40 + 20 + j];
+ mlt_buffer_left[i * 20 + j] = decode_buffer[i * 40 + j];
+ mlt_buffer_right[i * 20 + j] = decode_buffer[i * 40 + 20 + j];
}
}
@@ -845,7 +845,8 @@ static int joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1,
cplscale = q->cplscales[p->js_vlc_bits - 2]; // choose decoupler table
f1 = cplscale[decouple_tab[cpl_tmp] + 1];
f2 = cplscale[idx];
- q->decouple(q, p, i, f1, f2, decode_buffer, mlt_buffer1, mlt_buffer2);
+ q->decouple(q, p, i, f1, f2, decode_buffer,
+ mlt_buffer_left, mlt_buffer_right);
idx = (1 << p->js_vlc_bits) - 1;
}