[FFmpeg-cvslog] cook: cosmetics: Better names for joint_decode() function parameters
Diego Biurrun
git at videolan.org
Sat Oct 27 15:09:00 CEST 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Oct 24 01:08:19 2012 +0200| [f23b4a068230fb4ebed2449cd5f303f3b16d333d] | committer: Diego Biurrun
cook: cosmetics: Better names for joint_decode() function parameters
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f23b4a068230fb4ebed2449cd5f303f3b16d333d
---
libavcodec/cook.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 28ee8ed..05efa50 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;
}
More information about the ffmpeg-cvslog
mailing list