virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

cook: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Shitiz Garg 2011-12-31 03:48:53 +05:30 committed by Diego Biurrun
parent 9afc025bff
commit c3513477bb
1 changed files with 365 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
libavcodec/cook.c
View File

@ -165,7 +165,8 @@ static float rootpow2tab[127];
/*************** init functions ***************/ /*************** init functions ***************/
/* table generator */ /* table generator */
static av_cold void init_pow2table(void){ static av_cold void init_pow2table(void)
{
int i; int i;
for (i = -63; i < 64; i++) { for (i = -63; i < 64; i++) {
pow2tab[63 + i] = pow(2, i); pow2tab[63 + i] = pow(2, i);
@ -174,17 +175,18 @@ static av_cold void init_pow2table(void){
} }
/* table generator */ /* table generator */
static av_cold void init_gain_table(COOKContext *q) { static av_cold void init_gain_table(COOKContext *q)
{
int i; int i;
q->gain_size_factor = q->samples_per_channel / 8; q->gain_size_factor = q->samples_per_channel / 8;
for (i=0 ; i<23 ; i++) { for (i = 0; i < 23; i++)
q->gain_table[i] = pow(pow2tab[i + 52], q->gain_table[i] = pow(pow2tab[i + 52],
(1.0 / (double) q->gain_size_factor)); (1.0 / (double) q->gain_size_factor));
} }
}
static av_cold int init_cook_vlc_tables(COOKContext *q) { static av_cold int init_cook_vlc_tables(COOKContext *q)
{
int i, result; int i, result;
result = 0; result = 0;
@ -213,7 +215,8 @@ static av_cold int init_cook_vlc_tables(COOKContext *q) {
return result; return result;
} }
static av_cold int init_cook_mlt(COOKContext *q) { static av_cold int init_cook_mlt(COOKContext *q)
{
int j, ret; int j, ret;
int mlt_size = q->samples_per_channel; int mlt_size = q->samples_per_channel;
@ -242,7 +245,8 @@ static const float *maybe_reformat_buffer32 (COOKContext *q, const float *ptr, i
return ptr; return ptr;
} }
static av_cold void init_cplscales_table (COOKContext *q) { static av_cold void init_cplscales_table(COOKContext *q)
{
int i; int i;
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
q->cplscales[i] = maybe_reformat_buffer32(q, cplscales[i], (1 << (i + 2)) - 1); q->cplscales[i] = maybe_reformat_buffer32(q, cplscales[i], (1 << (i + 2)) - 1);
@ -273,8 +277,8 @@ static av_cold void init_cplscales_table (COOKContext *q) {
* @param out pointer to byte array of outdata * @param out pointer to byte array of outdata
* @param bytes number of bytes * @param bytes number of bytes
*/ */
static inline int decode_bytes(const uint8_t *inbuffer, uint8_t *out, int bytes)
static inline int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes){ {
static const uint32_t tab[4] = { static const uint32_t tab[4] = {
AV_BE2NE32C(0x37c511f2), AV_BE2NE32C(0xf237c511), AV_BE2NE32C(0x37c511f2), AV_BE2NE32C(0xf237c511),
AV_BE2NE32C(0x11f237c5), AV_BE2NE32C(0xc511f237), AV_BE2NE32C(0x11f237c5), AV_BE2NE32C(0xc511f237),
@ -302,7 +306,6 @@ static inline int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes)
/** /**
* Cook uninit * Cook uninit
*/ */
static av_cold int cook_decode_close(AVCodecContext *avctx) static av_cold int cook_decode_close(AVCodecContext *avctx)
{ {
int i; int i;
@ -317,15 +320,12 @@ static av_cold int cook_decode_close(AVCodecContext *avctx)
ff_mdct_end(&q->mdct_ctx); ff_mdct_end(&q->mdct_ctx);
/* Free the VLC tables. */ /* Free the VLC tables. */
for (i=0 ; i<13 ; i++) { for (i = 0; i < 13; i++)
free_vlc(&q->envelope_quant_index[i]); free_vlc(&q->envelope_quant_index[i]);
} for (i = 0; i < 7; i++)
for (i=0 ; i<7 ; i++) {
free_vlc(&q->sqvh[i]); free_vlc(&q->sqvh[i]);
} for (i = 0; i < q->num_subpackets; i++)
for (i=0 ; i<q->num_subpackets ; i++) {
free_vlc(&q->subpacket[i].ccpl); free_vlc(&q->subpacket[i].ccpl);
}
av_log(avctx, AV_LOG_DEBUG, "Memory deallocated.\n"); av_log(avctx, AV_LOG_DEBUG, "Memory deallocated.\n");
@ -338,12 +338,14 @@ static av_cold int cook_decode_close(AVCodecContext *avctx)
* @param gb pointer to the GetBitContext * @param gb pointer to the GetBitContext
* @param gaininfo array[9] of gain indexes * @param gaininfo array[9] of gain indexes
*/ */
static void decode_gain_info(GetBitContext *gb, int *gaininfo) static void decode_gain_info(GetBitContext *gb, int *gaininfo)
{ {
int i, n; int i, n;
while (get_bits1(gb)) {} while (get_bits1(gb)) {
/* NOTHING */
}
n = get_bits_count(gb) - 1; // amount of elements*2 to update n = get_bits_count(gb) - 1; // amount of elements*2 to update
i = 0; i = 0;
@ -351,9 +353,11 @@ static void decode_gain_info(GetBitContext *gb, int *gaininfo)
int index = get_bits(gb, 3); int index = get_bits(gb, 3);
int gain = get_bits1(gb) ? get_bits(gb, 4) - 7 : -1; int gain = get_bits1(gb) ? get_bits(gb, 4) - 7 : -1;
while (i <= index) gaininfo[i++] = gain; while (i <= index)
gaininfo[i++] = gain;
} }
while (i <= 8) gaininfo[i++] = 0; while (i <= 8)
gaininfo[i++] = 0;
} }
/** /**
@ -362,8 +366,9 @@ static void decode_gain_info(GetBitContext *gb, int *gaininfo)
* @param q pointer to the COOKContext * @param q pointer to the COOKContext
* @param quant_index_table pointer to the array * @param quant_index_table pointer to the array
*/ */
static void decode_envelope(COOKContext *q, COOKSubpacket *p,
static void decode_envelope(COOKContext *q, COOKSubpacket *p, int* quant_index_table) { int *quant_index_table)
{
int i, j, vlc_index; int i, j, vlc_index;
quant_index_table[0] = get_bits(&q->gb, 6) - 6; // This is used later in categorize quant_index_table[0] = get_bits(&q->gb, 6) - 6; // This is used later in categorize
@ -374,9 +379,11 @@ static void decode_envelope(COOKContext *q, COOKSubpacket *p, int* quant_index_t
vlc_index -= p->js_subband_start; vlc_index -= p->js_subband_start;
} else { } else {
vlc_index /= 2; vlc_index /= 2;
if(vlc_index < 1) vlc_index = 1; if (vlc_index < 1)
vlc_index = 1;
} }
if (vlc_index>13) vlc_index = 13; //the VLC tables >13 are identical to No. 13 if (vlc_index > 13)
vlc_index = 13; // the VLC tables >13 are identical to No. 13
j = get_vlc2(&q->gb, q->envelope_quant_index[vlc_index - 1].table, j = get_vlc2(&q->gb, q->envelope_quant_index[vlc_index - 1].table,
q->envelope_quant_index[vlc_index - 1].bits, 2); q->envelope_quant_index[vlc_index - 1].bits, 2);
@ -392,9 +399,9 @@ static void decode_envelope(COOKContext *q, COOKSubpacket *p, int* quant_index_t
* @param category pointer to the category array * @param category pointer to the category array
* @param category_index pointer to the category_index array * @param category_index pointer to the category_index array
*/ */
static void categorize(COOKContext *q, COOKSubpacket *p, int *quant_index_table, static void categorize(COOKContext *q, COOKSubpacket *p, int *quant_index_table,
int* category, int* category_index){ int *category, int *category_index)
{
int exp_idx, bias, tmpbias1, tmpbias2, bits_left, num_bits, index, v, i, j; int exp_idx, bias, tmpbias1, tmpbias2, bits_left, num_bits, index, v, i, j;
int exp_index2[102]; int exp_index2[102];
int exp_index1[102]; int exp_index1[102];
@ -426,10 +433,9 @@ static void categorize(COOKContext *q, COOKSubpacket *p, int* quant_index_table,
index++; index++;
num_bits += expbits_tab[exp_idx]; num_bits += expbits_tab[exp_idx];
} }
if(num_bits >= bits_left - 32){ if (num_bits >= bits_left - 32)
bias += i; bias += i;
} }
}
/* Calculate total number of bits. */ /* Calculate total number of bits. */
num_bits = 0; num_bits = 0;
@ -454,7 +460,8 @@ static void categorize(COOKContext *q, COOKSubpacket *p, int* quant_index_table,
} }
} }
} }
if(index==-1)break; if (index == -1)
break;
tmp_categorize_array[tmp_categorize_array1_idx++] = index; tmp_categorize_array[tmp_categorize_array1_idx++] = index;
tmpbias1 -= expbits_tab[exp_index1[index]] - tmpbias1 -= expbits_tab[exp_index1[index]] -
expbits_tab[exp_index1[index] + 1]; expbits_tab[exp_index1[index] + 1];
@ -471,7 +478,8 @@ static void categorize(COOKContext *q, COOKSubpacket *p, int* quant_index_table,
} }
} }
} }
if(index == -1)break; if (index == -1)
break;
tmp_categorize_array[--tmp_categorize_array2_idx] = index; tmp_categorize_array[--tmp_categorize_array2_idx] = index;
tmpbias2 -= expbits_tab[exp_index2[index]] - tmpbias2 -= expbits_tab[exp_index2[index]] -
expbits_tab[exp_index2[index] - 1]; expbits_tab[exp_index2[index] - 1];
@ -484,7 +492,6 @@ static void categorize(COOKContext *q, COOKSubpacket *p, int* quant_index_table,
for (i = 0; i < p->numvector_size - 1; i++) for (i = 0; i < p->numvector_size - 1; i++)
category_index[i] = tmp_categorize_array[tmp_categorize_array2_idx++]; category_index[i] = tmp_categorize_array[tmp_categorize_array2_idx++];
} }
@ -495,14 +502,13 @@ static void categorize(COOKContext *q, COOKSubpacket *p, int* quant_index_table,
* @param category pointer to the category array * @param category pointer to the category array
* @param category_index pointer to the category_index array * @param category_index pointer to the category_index array
*/ */
static inline void expand_category(COOKContext *q, int *category, static inline void expand_category(COOKContext *q, int *category,
int* category_index){ int *category_index)
{
int i; int i;
for(i=0 ; i<q->num_vectors ; i++){ for (i = 0; i < q->num_vectors; i++)
++category[category_index[i]]; ++category[category_index[i]];
} }
}
/** /**
* The real requantization of the mltcoefs * The real requantization of the mltcoefs
@ -514,21 +520,23 @@ static inline void expand_category(COOKContext *q, int* category,
* @param subband_coef_sign signs of coefficients * @param subband_coef_sign signs of coefficients
* @param mlt_p pointer into the mlt buffer * @param mlt_p pointer into the mlt buffer
*/ */
static void scalar_dequant_float(COOKContext *q, int index, int quant_index, static void scalar_dequant_float(COOKContext *q, int index, int quant_index,
int *subband_coef_index, int *subband_coef_sign, int *subband_coef_index, int *subband_coef_sign,
float* mlt_p){ float *mlt_p)
{
int i; int i;
float f1; float f1;
for (i = 0; i < SUBBAND_SIZE; i++) { for (i = 0; i < SUBBAND_SIZE; i++) {
if (subband_coef_index[i]) { if (subband_coef_index[i]) {
f1 = quant_centroid_tab[index][subband_coef_index[i]]; f1 = quant_centroid_tab[index][subband_coef_index[i]];
if (subband_coef_sign[i]) f1 = -f1; if (subband_coef_sign[i])
f1 = -f1;
} else { } else {
/* noise coding if subband_coef_index[i] == 0 */ /* noise coding if subband_coef_index[i] == 0 */
f1 = dither_tab[index]; f1 = dither_tab[index];
if (av_lfg_get(&q->random_state) < 0x80000000) f1 = -f1; if (av_lfg_get(&q->random_state) < 0x80000000)
f1 = -f1;
} }
mlt_p[i] = f1 * rootpow2tab[quant_index + 63]; mlt_p[i] = f1 * rootpow2tab[quant_index + 63];
} }
@ -541,9 +549,9 @@ static void scalar_dequant_float(COOKContext *q, int index, int quant_index,
* @param subband_coef_index array of indexes to quant_centroid_tab * @param subband_coef_index array of indexes to quant_centroid_tab
* @param subband_coef_sign signs of coefficients * @param subband_coef_sign signs of coefficients
*/ */
static int unpack_SQVH(COOKContext *q, COOKSubpacket *p, int category,
static int unpack_SQVH(COOKContext *q, COOKSubpacket *p, int category, int* subband_coef_index, int *subband_coef_index, int *subband_coef_sign)
int* subband_coef_sign) { {
int i, j; int i, j;
int vlc, vd, tmp, result; int vlc, vd, tmp, result;
@ -585,10 +593,9 @@ static int unpack_SQVH(COOKContext *q, COOKSubpacket *p, int category, int* subb
* @param quant_index_table pointer to the array * @param quant_index_table pointer to the array
* @param mlt_buffer pointer to mlt coefficients * @param mlt_buffer pointer to mlt coefficients
*/ */
static void decode_vectors(COOKContext *q, COOKSubpacket *p, int *category, static void decode_vectors(COOKContext *q, COOKSubpacket *p, int *category,
int *quant_index_table, float* mlt_buffer){ int *quant_index_table, float *mlt_buffer)
{
/* A zero in this table means that the subband coefficient is /* A zero in this table means that the subband coefficient is
random noise coded. */ random noise coded. */
int subband_coef_index[SUBBAND_SIZE]; int subband_coef_index[SUBBAND_SIZE];
@ -603,7 +610,8 @@ static void decode_vectors(COOKContext* q, COOKSubpacket* p, int* category,
if (category[band] < 7) { if (category[band] < 7) {
if (unpack_SQVH(q, p, category[band], subband_coef_index, subband_coef_sign)) { if (unpack_SQVH(q, p, category[band], subband_coef_index, subband_coef_sign)) {
index = 7; index = 7;
for(j=0 ; j<p->total_subbands ; j++) category[band+j]=7; for (j = 0; j < p->total_subbands; j++)
category[band + j] = 7;
} }
} }
if (index >= 7) { if (index >= 7) {
@ -615,9 +623,9 @@ static void decode_vectors(COOKContext* q, COOKSubpacket* p, int* category,
&mlt_buffer[band * SUBBAND_SIZE]); &mlt_buffer[band * SUBBAND_SIZE]);
} }
if(p->total_subbands*SUBBAND_SIZE >= q->samples_per_channel){ /* FIXME: should this be removed, or moved into loop above? */
if (p->total_subbands * SUBBAND_SIZE >= q->samples_per_channel)
return; return;
} /* FIXME: should this be removed, or moved into loop above? */
} }
@ -627,9 +635,8 @@ static void decode_vectors(COOKContext* q, COOKSubpacket* p, int* category,
* @param q pointer to the COOKContext * @param q pointer to the COOKContext
* @param mlt_buffer pointer to mlt coefficients * @param mlt_buffer pointer to mlt coefficients
*/ */
static void mono_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer)
static void mono_decode(COOKContext *q, COOKSubpacket *p, float* mlt_buffer) { {
int category_index[128]; int category_index[128];
int quant_index_table[102]; int quant_index_table[102];
int category[128]; int category[128];
@ -653,17 +660,16 @@ static void mono_decode(COOKContext *q, COOKSubpacket *p, float* mlt_buffer) {
* @param gain_index index for the block multiplier * @param gain_index index for the block multiplier
* @param gain_index_next index for the next block multiplier * @param gain_index_next index for the next block multiplier
*/ */
static void interpolate_float(COOKContext *q, float *buffer, static void interpolate_float(COOKContext *q, float *buffer,
int gain_index, int gain_index_next){ int gain_index, int gain_index_next)
{
int i; int i;
float fc1, fc2; float fc1, fc2;
fc1 = pow2tab[gain_index + 63]; fc1 = pow2tab[gain_index + 63];
if (gain_index == gain_index_next) { // static gain if (gain_index == gain_index_next) { // static gain
for(i=0 ; i<q->gain_size_factor ; i++){ for (i = 0; i < q->gain_size_factor; i++)
buffer[i] *= fc1; buffer[i] *= fc1;
}
} else { // smooth gain } else { // smooth gain
fc2 = q->gain_table[11 + (gain_index_next - gain_index)]; fc2 = q->gain_table[11 + (gain_index_next - gain_index)];
for (i = 0; i < q->gain_size_factor; i++) { for (i = 0; i < q->gain_size_factor; i++) {
@ -681,7 +687,6 @@ static void interpolate_float(COOKContext *q, float* buffer,
* @param gains_ptr current and previous gains * @param gains_ptr current and previous gains
* @param previous_buffer pointer to the previous buffer to be used for overlapping * @param previous_buffer pointer to the previous buffer to be used for overlapping
*/ */
static void imlt_window_float(COOKContext *q, float *inbuffer, static void imlt_window_float(COOKContext *q, float *inbuffer,
cook_gains *gains_ptr, float *previous_buffer) cook_gains *gains_ptr, float *previous_buffer)
{ {
@ -694,11 +699,10 @@ static void imlt_window_float (COOKContext *q, float *inbuffer,
*/ */
/* Apply window and overlap */ /* Apply window and overlap */
for(i = 0; i < q->samples_per_channel; i++){ for (i = 0; i < q->samples_per_channel; i++)
inbuffer[i] = inbuffer[i] * fc * q->mlt_window[i] - inbuffer[i] = inbuffer[i] * fc * q->mlt_window[i] -
previous_buffer[i] * q->mlt_window[q->samples_per_channel - 1 - i]; previous_buffer[i] * q->mlt_window[q->samples_per_channel - 1 - i];
} }
}
/** /**
* The modulated lapped transform, this takes transform coefficients * The modulated lapped transform, this takes transform coefficients
@ -711,7 +715,6 @@ static void imlt_window_float (COOKContext *q, float *inbuffer,
* @param gains_ptr current and previous gains * @param gains_ptr current and previous gains
* @param previous_buffer pointer to the previous buffer to be used for overlapping * @param previous_buffer pointer to the previous buffer to be used for overlapping
*/ */
static void imlt_gain(COOKContext *q, float *inbuffer, static void imlt_gain(COOKContext *q, float *inbuffer,
cook_gains *gains_ptr, float *previous_buffer) cook_gains *gains_ptr, float *previous_buffer)
{ {
@ -725,11 +728,10 @@ static void imlt_gain(COOKContext *q, float *inbuffer,
q->imlt_window(q, buffer1, gains_ptr, previous_buffer); q->imlt_window(q, buffer1, gains_ptr, previous_buffer);
/* Apply gain profile */ /* Apply gain profile */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++)
if (gains_ptr->now[i] || gains_ptr->now[i + 1]) if (gains_ptr->now[i] || gains_ptr->now[i + 1])
q->interpolate(q, &buffer1[q->gain_size_factor * i], q->interpolate(q, &buffer1[q->gain_size_factor * i],
gains_ptr->now[i], gains_ptr->now[i + 1]); gains_ptr->now[i], gains_ptr->now[i + 1]);
}
/* Save away the current to be previous block. */ /* Save away the current to be previous block. */
memcpy(previous_buffer, buffer0, memcpy(previous_buffer, buffer0,
@ -755,14 +757,13 @@ static void decouple_info(COOKContext *q, COOKSubpacket *p, int *decouple_tab)
if (start > end) if (start > end)
return; return;
if (vlc) { if (vlc)
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
decouple_tab[start + i] = get_vlc2(&q->gb, p->ccpl.table, p->ccpl.bits, 2); decouple_tab[start + i] = get_vlc2(&q->gb, p->ccpl.table, p->ccpl.bits, 2);
} else { else
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
decouple_tab[start + i] = get_bits(&q->gb, p->js_vlc_bits); decouple_tab[start + i] = get_bits(&q->gb, p->js_vlc_bits);
} }
}
/* /*
* function decouples a pair of signals from a single signal via multiplication. * function decouples a pair of signals from a single signal via multiplication.
@ -797,9 +798,9 @@ 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 void joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1, static void joint_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer1,
float* mlt_buffer2) { float *mlt_buffer2)
{
int i, j; int i, j;
int decouple_tab[SUBBAND_SIZE]; int decouple_tab[SUBBAND_SIZE];
float *decode_buffer = q->decode_buffer_0; float *decode_buffer = q->decode_buffer_0;
@ -846,9 +847,8 @@ static void joint_decode(COOKContext *q, COOKSubpacket *p, float* mlt_buffer1,
* @param inbuffer pointer to raw stream data * @param inbuffer pointer to raw stream data
* @param gains_ptr array of current/prev gain pointers * @param gains_ptr array of current/prev gain pointers
*/ */
static inline void decode_bytes_and_gain(COOKContext *q, COOKSubpacket *p,
static inline void const uint8_t *inbuffer,
decode_bytes_and_gain(COOKContext *q, COOKSubpacket *p, const uint8_t *inbuffer,
cook_gains *gains_ptr) cook_gains *gains_ptr)
{ {
int offset; int offset;
@ -891,9 +891,7 @@ static void saturate_output_float(COOKContext *q, int chan, float *out)
* @param out pointer to the output buffer * @param out pointer to the output buffer
* @param chan 0: left or single channel, 1: right channel * @param chan 0: left or single channel, 1: right channel
*/ */
static inline void mlt_compensate_output(COOKContext *q, float *decode_buffer,
static inline void
mlt_compensate_output(COOKContext *q, float *decode_buffer,
cook_gains *gains_ptr, float *previous_buffer, cook_gains *gains_ptr, float *previous_buffer,
float *out, int chan) float *out, int chan)
{ {
@ -916,9 +914,8 @@ static void decode_subpacket(COOKContext *q, COOKSubpacket *p,
{ {
int sub_packet_size = p->size; int sub_packet_size = p->size;
/* packet dump */ /* packet dump */
// for (i=0 ; i<sub_packet_size ; i++) { // for (i = 0; i < sub_packet_size ; i++)
// av_log(q->avctx, AV_LOG_ERROR, "%02x", inbuffer[i]); // av_log(q->avctx, AV_LOG_ERROR, "%02x", inbuffer[i]);
// }
// av_log(q->avctx, AV_LOG_ERROR, "\n"); // av_log(q->avctx, AV_LOG_ERROR, "\n");
memset(q->decode_buffer_1, 0, sizeof(q->decode_buffer_1)); memset(q->decode_buffer_1, 0, sizeof(q->decode_buffer_1));
decode_bytes_and_gain(q, p, inbuffer, &p->gains1); decode_bytes_and_gain(q, p, inbuffer, &p->gains1);
@ -937,17 +934,14 @@ static void decode_subpacket(COOKContext *q, COOKSubpacket *p,
mlt_compensate_output(q, q->decode_buffer_1, &p->gains1, mlt_compensate_output(q, q->decode_buffer_1, &p->gains1,
p->mono_previous_buffer1, outbuffer, p->ch_idx); p->mono_previous_buffer1, outbuffer, p->ch_idx);
if (p->num_channels == 2) { if (p->num_channels == 2)
if (p->joint_stereo) { if (p->joint_stereo)
mlt_compensate_output(q, q->decode_buffer_2, &p->gains1, mlt_compensate_output(q, q->decode_buffer_2, &p->gains1,
p->mono_previous_buffer2, outbuffer, p->ch_idx + 1); p->mono_previous_buffer2, outbuffer, p->ch_idx + 1);
} else { else
mlt_compensate_output(q, q->decode_buffer_2, &p->gains2, mlt_compensate_output(q, q->decode_buffer_2, &p->gains2,
p->mono_previous_buffer2, outbuffer, p->ch_idx + 1); p->mono_previous_buffer2, outbuffer, p->ch_idx + 1);
} }
}
}
/** /**
@ -955,7 +949,6 @@ static void decode_subpacket(COOKContext *q, COOKSubpacket *p,
* *
* @param avctx pointer to the AVCodecContext * @param avctx pointer to the AVCodecContext
*/ */
static int cook_decode_frame(AVCodecContext *avctx, void *data, static int cook_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt) int *got_frame_ptr, AVPacket *avpkt)
{ {
@ -987,20 +980,27 @@ static int cook_decode_frame(AVCodecContext *avctx, void *data,
q->subpacket[i].size = 2 * buf[avctx->block_align - q->num_subpackets + i]; q->subpacket[i].size = 2 * buf[avctx->block_align - q->num_subpackets + i];
q->subpacket[0].size -= q->subpacket[i].size + 1; q->subpacket[0].size -= q->subpacket[i].size + 1;
if (q->subpacket[0].size < 0) { if (q->subpacket[0].size < 0) {
av_log(avctx,AV_LOG_DEBUG,"frame subpacket size total > avctx->block_align!\n"); av_log(avctx, AV_LOG_DEBUG,
"frame subpacket size total > avctx->block_align!\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} }
/* decode supbackets */ /* decode supbackets */
for (i = 0; i < q->num_subpackets; i++) { for (i = 0; i < q->num_subpackets; i++) {
q->subpacket[i].bits_per_subpacket = (q->subpacket[i].size*8)>>q->subpacket[i].bits_per_subpdiv; q->subpacket[i].bits_per_subpacket = (q->subpacket[i].size * 8) >>
q->subpacket[i].bits_per_subpdiv;
q->subpacket[i].ch_idx = chidx; q->subpacket[i].ch_idx = chidx;
av_log(avctx,AV_LOG_DEBUG,"subpacket[%i] size %i js %i %i block_align %i\n",i,q->subpacket[i].size,q->subpacket[i].joint_stereo,offset,avctx->block_align); av_log(avctx, AV_LOG_DEBUG,
"subpacket[%i] size %i js %i %i block_align %i\n",
i, q->subpacket[i].size, q->subpacket[i].joint_stereo, offset,
avctx->block_align);
decode_subpacket(q, &q->subpacket[i], buf + offset, samples); decode_subpacket(q, &q->subpacket[i], buf + offset, samples);
offset += q->subpacket[i].size; offset += q->subpacket[i].size;
chidx += q->subpacket[i].num_channels; chidx += q->subpacket[i].num_channels;
av_log(avctx,AV_LOG_DEBUG,"subpacket[%i] %i %i\n",i,q->subpacket[i].size * 8,get_bits_count(&q->gb)); av_log(avctx, AV_LOG_DEBUG, "subpacket[%i] %i %i\n",
i, q->subpacket[i].size * 8, get_bits_count(&q->gb));
} }
/* Discard the first two frames: no valid audio. */ /* Discard the first two frames: no valid audio. */
@ -1041,13 +1041,13 @@ static void dump_cook_context(COOKContext *q)
} }
#endif #endif
static av_cold int cook_count_channels(unsigned int mask){ static av_cold int cook_count_channels(unsigned int mask)
{
int i; int i;
int channels = 0; int channels = 0;
for(i = 0;i<32;i++){ for (i = 0; i < 32; i++)
if (mask & (1 << i)) if (mask & (1 << i))
++channels; ++channels;
}
return channels; return channels;
} }
@ -1056,7 +1056,6 @@ static av_cold int cook_count_channels(unsigned int mask){
* *
* @param avctx pointer to the AVCodecContext * @param avctx pointer to the AVCodecContext
*/ */
static av_cold int cook_decode_init(AVCodecContext *avctx) static av_cold int cook_decode_init(AVCodecContext *avctx)
{ {
COOKContext *q = avctx->priv_data; COOKContext *q = avctx->priv_data;
@ -1110,7 +1109,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Initialize version-dependent variables */ /* Initialize version-dependent variables */
av_log(avctx,AV_LOG_DEBUG,"subpacket[%i].cookversion=%x\n",s,q->subpacket[s].cookversion); av_log(avctx, AV_LOG_DEBUG, "subpacket[%i].cookversion=%x\n", s,
q->subpacket[s].cookversion);
q->subpacket[s].joint_stereo = 0; q->subpacket[s].joint_stereo = 0;
switch (q->subpacket[s].cookversion) { switch (q->subpacket[s].cookversion) {
case MONO: case MONO:
@ -1134,7 +1134,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
} }
av_log(avctx, AV_LOG_DEBUG, "JOINT_STEREO\n"); av_log(avctx, AV_LOG_DEBUG, "JOINT_STEREO\n");
if (avctx->extradata_size >= 16) { if (avctx->extradata_size >= 16) {
q->subpacket[s].total_subbands = q->subpacket[s].subbands + q->subpacket[s].js_subband_start; q->subpacket[s].total_subbands = q->subpacket[s].subbands +
q->subpacket[s].js_subband_start;
q->subpacket[s].joint_stereo = 1; q->subpacket[s].joint_stereo = 1;
q->subpacket[s].num_channels = 2; q->subpacket[s].num_channels = 2;
} }
@ -1151,7 +1152,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
channel_mask |= q->subpacket[s].channel_mask = bytestream_get_be32(&edata_ptr); channel_mask |= q->subpacket[s].channel_mask = bytestream_get_be32(&edata_ptr);
if (cook_count_channels(q->subpacket[s].channel_mask) > 1) { if (cook_count_channels(q->subpacket[s].channel_mask) > 1) {
q->subpacket[s].total_subbands = q->subpacket[s].subbands + q->subpacket[s].js_subband_start; q->subpacket[s].total_subbands = q->subpacket[s].subbands +
q->subpacket[s].js_subband_start;
q->subpacket[s].joint_stereo = 1; q->subpacket[s].joint_stereo = 1;
q->subpacket[s].num_channels = 2; q->subpacket[s].num_channels = 2;
q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame >> 1; q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame >> 1;
@ -1187,7 +1189,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 2*q->subpacket[s].joint_stereo)) { if ((q->subpacket[s].js_vlc_bits > 6) ||
(q->subpacket[s].js_vlc_bits < 2 * q->subpacket[s].joint_stereo)) {
av_log(avctx, AV_LOG_ERROR, "js_vlc_bits = %d, only >= %d and <= 6 allowed!\n", av_log(avctx, AV_LOG_ERROR, "js_vlc_bits = %d, only >= %d and <= 6 allowed!\n",
q->subpacket[s].js_vlc_bits, 2 * q->subpacket[s].joint_stereo); q->subpacket[s].js_vlc_bits, 2 * q->subpacket[s].joint_stereo);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -1245,7 +1248,8 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
} }
/* Try to catch some obviously faulty streams, othervise it might be exploitable */ /* Try to catch some obviously faulty streams, othervise it might be exploitable */
if ((q->samples_per_channel == 256) || (q->samples_per_channel == 512) || (q->samples_per_channel == 1024)) { if ((q->samples_per_channel == 256) || (q->samples_per_channel == 512)
|| (q->samples_per_channel == 1024)) {
} else { } else {
av_log_ask_for_sample(avctx, av_log_ask_for_sample(avctx,
"unknown amount of samples_per_channel = %d\n", "unknown amount of samples_per_channel = %d\n",
@ -1268,9 +1272,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
AVCodec ff_cook_decoder = {
AVCodec ff_cook_decoder =
{
.name = "cook", .name = "cook",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.id = CODEC_ID_COOK, .id = CODEC_ID_COOK,