virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cook: cosmetics: Better names for joint_decode() function parameters

Browse Source
This commit is contained in:
Diego Biurrun 2012-10-24 01:08:19 +02:00
parent 20015379a4
commit f23b4a0682
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/cook.c
View File

@ -809,8 +809,8 @@ static void decouple_float(COOKContext *q,
* @param mlt_buffer1 pointer to left channel mlt coefficients * @param mlt_buffer1 pointer to left channel mlt coefficients
* @param mlt_buffer2 pointer to right channel mlt coefficients * @param mlt_buffer2 pointer to right channel mlt coefficients
*/ */
static int joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1, static int joint_decode(COOKContext *q, COOKSubpacket *p,
float *mlt_buffer2) float *mlt_buffer_left, float *mlt_buffer_right)
{ {
int i, j, res; int i, j, res;
int decouple_tab[SUBBAND_SIZE] = { 0 }; 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)); memset(decode_buffer, 0, sizeof(q->decode_buffer_0));
/* Make sure the buffers are zeroed out. */ /* Make sure the buffers are zeroed out. */
memset(mlt_buffer1, 0, 1024 * sizeof(*mlt_buffer1)); memset(mlt_buffer_left, 0, 1024 * sizeof(*mlt_buffer_left));
memset(mlt_buffer2, 0, 1024 * sizeof(*mlt_buffer2)); memset(mlt_buffer_right, 0, 1024 * sizeof(*mlt_buffer_right));
decouple_info(q, p, decouple_tab); decouple_info(q, p, decouple_tab);
if ((res = mono_decode(q, p, decode_buffer)) < 0) if ((res = mono_decode(q, p, decode_buffer)) < 0)
return res; 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. */ /* The two channels are stored interleaved in decode_buffer. */
for (i = 0; i < p->js_subband_start; i++) { for (i = 0; i < p->js_subband_start; i++) {
for (j = 0; j < SUBBAND_SIZE; j++) { for (j = 0; j < SUBBAND_SIZE; j++) {
mlt_buffer1[i * 20 + j] = decode_buffer[i * 40 + j]; mlt_buffer_left[i * 20 + j] = decode_buffer[i * 40 + j];
mlt_buffer2[i * 20 + j] = decode_buffer[i * 40 + 20 + 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 cplscale = q->cplscales[p->js_vlc_bits - 2]; // choose decoupler table
f1 = cplscale[decouple_tab[cpl_tmp] + 1]; f1 = cplscale[decouple_tab[cpl_tmp] + 1];
f2 = cplscale[idx]; 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; idx = (1 << p->js_vlc_bits) - 1;
} }