Skip to content

F
ffmpeg.wasm-core
Commit 4a291c90 authored by Benjamin Larsson's avatar Benjamin Larsson
Browse files
Options

Factor out COOKSubpacket, in preparation for multichannel support. 

Originally committed as revision 18683 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 10151b13
Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 188 deletions
libavcodec/cook.c
View file @ 4a291c90
...@@ -70,6 +70,36 @@ typedef struct { ...@@ -70,6 +70,36 @@ typedef struct {
int *previous; int *previous;
} cook_gains; } cook_gains;
typedef struct {
int ch_idx;
int size;
int num_channels;
int cookversion;
int samples_per_frame;
int subbands;
int js_subband_start;
int js_vlc_bits;
int samples_per_channel;
int log2_numvector_size;
unsigned int channel_mask;
VLC ccpl; ///< channel coupling
int joint_stereo;
int bits_per_subpacket;
int bits_per_subpdiv;
int total_subbands;
int numvector_size; ///< 1 << log2_numvector_size;
float mono_previous_buffer1[1024];
float mono_previous_buffer2[1024];
/** gain buffers */
cook_gains gains1;
cook_gains gains2;
int gain_1[9];
int gain_2[9];
int gain_3[9];
int gain_4[9];
} COOKSubpacket;
typedef struct cook { typedef struct cook {
/* /*
* The following 5 functions provide the lowlevel arithmetic on * The following 5 functions provide the lowlevel arithmetic on
...@@ -80,6 +110,7 @@ typedef struct cook { ...@@ -80,6 +110,7 @@ typedef struct cook {
float* mlt_p); float* mlt_p);
void (* decouple) (struct cook *q, void (* decouple) (struct cook *q,
COOKSubpacket *p,
int subband, int subband,
float f1, float f2, float f1, float f2,
float *decode_buffer, float *decode_buffer,
...@@ -97,19 +128,10 @@ typedef struct cook { ...@@ -97,19 +128,10 @@ typedef struct cook {
GetBitContext gb; GetBitContext gb;
/* stream data */ /* stream data */
int nb_channels; int nb_channels;
int joint_stereo;
int bit_rate; int bit_rate;
int sample_rate; int sample_rate;
int samples_per_channel;
int samples_per_frame;
int subbands;
int log2_numvector_size;
int numvector_size; //1 << log2_numvector_size;
int js_subband_start;
int total_subbands;
int num_vectors; int num_vectors;
int bits_per_subpacket; int samples_per_channel;
int cookversion;
/* states */ /* states */
AVLFG random_state; AVLFG random_state;
...@@ -117,19 +139,9 @@ typedef struct cook { ...@@ -117,19 +139,9 @@ typedef struct cook {
MDCTContext mdct_ctx; MDCTContext mdct_ctx;
float* mlt_window; float* mlt_window;
/* gain buffers */
cook_gains gains1;
cook_gains gains2;
int gain_1[9];
int gain_2[9];
int gain_3[9];
int gain_4[9];
/* VLC data */ /* VLC data */
int js_vlc_bits;
VLC envelope_quant_index[13]; VLC envelope_quant_index[13];
VLC sqvh[7]; //scalar quantization VLC sqvh[7]; //scalar quantization
VLC ccpl; //channel coupling
/* generatable tables and related variables */ /* generatable tables and related variables */
int gain_size_factor; int gain_size_factor;
...@@ -139,13 +151,13 @@ typedef struct cook { ...@@ -139,13 +151,13 @@ typedef struct cook {
uint8_t* decoded_bytes_buffer; uint8_t* decoded_bytes_buffer;
DECLARE_ALIGNED_16(float,mono_mdct_output[2048]); DECLARE_ALIGNED_16(float,mono_mdct_output[2048]);
float mono_previous_buffer1[1024];
float mono_previous_buffer2[1024];
float decode_buffer_1[1024]; float decode_buffer_1[1024];
float decode_buffer_2[1024]; float decode_buffer_2[1024];
float decode_buffer_0[1060]; /* static allocation for joint decode */ float decode_buffer_0[1060]; /* static allocation for joint decode */
const float *cplscales[5]; const float *cplscales[5];
int num_subpackets;
COOKSubpacket subpacket[MAX_SUBPACKETS];
} COOKContext; } COOKContext;
static float pow2tab[127]; static float pow2tab[127];
...@@ -221,11 +233,13 @@ static av_cold int init_cook_vlc_tables(COOKContext *q) { ...@@ -221,11 +233,13 @@ static av_cold int init_cook_vlc_tables(COOKContext *q) {
cvh_huffcodes[i], 2, 2, 0); cvh_huffcodes[i], 2, 2, 0);
} }
if (q->nb_channels==2 && q->joint_stereo==1){ for(i=0;i<q->num_subpackets;i++){
result |= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1, if (q->subpacket[i].joint_stereo==1){
ccpl_huffbits[q->js_vlc_bits-2], 1, 1, result |= init_vlc (&q->subpacket[i].ccpl, 6, (1<<q->subpacket[i].js_vlc_bits)-1,
ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0); ccpl_huffbits[q->subpacket[i].js_vlc_bits-2], 1, 1,
av_log(q->avctx,AV_LOG_DEBUG,"Joint-stereo VLC used.\n"); ccpl_huffcodes[q->subpacket[i].js_vlc_bits-2], 2, 2, 0);
av_log(q->avctx,AV_LOG_DEBUG,"subpacket %i Joint-stereo VLC used.\n",i);
}
} }
av_log(q->avctx,AV_LOG_DEBUG,"VLC tables initialized.\n"); av_log(q->avctx,AV_LOG_DEBUG,"VLC tables initialized.\n");
...@@ -337,8 +351,8 @@ static av_cold int cook_decode_close(AVCodecContext *avctx) ...@@ -337,8 +351,8 @@ static av_cold int cook_decode_close(AVCodecContext *avctx)
for (i=0 ; i<7 ; i++) { for (i=0 ; i<7 ; i++) {
free_vlc(&q->sqvh[i]); free_vlc(&q->sqvh[i]);
} }
if(q->nb_channels==2 && q->joint_stereo==1 ){ for (i=0 ; i<q->num_subpackets ; i++) {
free_vlc(&q->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");
...@@ -377,15 +391,15 @@ static void decode_gain_info(GetBitContext *gb, int *gaininfo) ...@@ -377,15 +391,15 @@ static void decode_gain_info(GetBitContext *gb, int *gaininfo)
* @param quant_index_table pointer to the array * @param quant_index_table pointer to the array
*/ */
static void decode_envelope(COOKContext *q, int* quant_index_table) { static void decode_envelope(COOKContext *q, COOKSubpacket *p, 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
for (i=1 ; i < q->total_subbands ; i++){ for (i=1 ; i < p->total_subbands ; i++){
vlc_index=i; vlc_index=i;
if (i >= q->js_subband_start * 2) { if (i >= p->js_subband_start * 2) {
vlc_index-=q->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;
...@@ -407,17 +421,17 @@ static void decode_envelope(COOKContext *q, int* quant_index_table) { ...@@ -407,17 +421,17 @@ static void decode_envelope(COOKContext *q, int* quant_index_table) {
* @param category_index pointer to the category_index array * @param category_index pointer to the category_index array
*/ */
static void categorize(COOKContext *q, 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];
int tmp_categorize_array[128*2]; int tmp_categorize_array[128*2];
int tmp_categorize_array1_idx=q->numvector_size; int tmp_categorize_array1_idx=p->numvector_size;
int tmp_categorize_array2_idx=q->numvector_size; int tmp_categorize_array2_idx=p->numvector_size;
bits_left = q->bits_per_subpacket - get_bits_count(&q->gb); bits_left = p->bits_per_subpacket - get_bits_count(&q->gb);
if(bits_left > q->samples_per_channel) { if(bits_left > q->samples_per_channel) {
bits_left = q->samples_per_channel + bits_left = q->samples_per_channel +
...@@ -435,7 +449,7 @@ static void categorize(COOKContext *q, int* quant_index_table, ...@@ -435,7 +449,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
for (i=32 ; i>0 ; i=i/2){ for (i=32 ; i>0 ; i=i/2){
num_bits = 0; num_bits = 0;
index = 0; index = 0;
for (j=q->total_subbands ; j>0 ; j--){ for (j=p->total_subbands ; j>0 ; j--){
exp_idx = av_clip((i - quant_index_table[index] + bias) / 2, 0, 7); exp_idx = av_clip((i - quant_index_table[index] + bias) / 2, 0, 7);
index++; index++;
num_bits+=expbits_tab[exp_idx]; num_bits+=expbits_tab[exp_idx];
...@@ -447,7 +461,7 @@ static void categorize(COOKContext *q, int* quant_index_table, ...@@ -447,7 +461,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
/* Calculate total number of bits. */ /* Calculate total number of bits. */
num_bits=0; num_bits=0;
for (i=0 ; i<q->total_subbands ; i++) { for (i=0 ; i<p->total_subbands ; i++) {
exp_idx = av_clip((bias - quant_index_table[i]) / 2, 0, 7); exp_idx = av_clip((bias - quant_index_table[i]) / 2, 0, 7);
num_bits += expbits_tab[exp_idx]; num_bits += expbits_tab[exp_idx];
exp_index1[i] = exp_idx; exp_index1[i] = exp_idx;
...@@ -455,11 +469,11 @@ static void categorize(COOKContext *q, int* quant_index_table, ...@@ -455,11 +469,11 @@ static void categorize(COOKContext *q, int* quant_index_table,
} }
tmpbias1 = tmpbias2 = num_bits; tmpbias1 = tmpbias2 = num_bits;
for (j = 1 ; j < q->numvector_size ; j++) { for (j = 1 ; j < p->numvector_size ; j++) {
if (tmpbias1 + tmpbias2 > 2*bits_left) { /* ---> */ if (tmpbias1 + tmpbias2 > 2*bits_left) { /* ---> */
int max = -999999; int max = -999999;
index=-1; index=-1;
for (i=0 ; i<q->total_subbands ; i++){ for (i=0 ; i<p->total_subbands ; i++){
if (exp_index1[i] < 7) { if (exp_index1[i] < 7) {
v = (-2*exp_index1[i]) - quant_index_table[i] + bias; v = (-2*exp_index1[i]) - quant_index_table[i] + bias;
if ( v >= max) { if ( v >= max) {
...@@ -476,7 +490,7 @@ static void categorize(COOKContext *q, int* quant_index_table, ...@@ -476,7 +490,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
} else { /* <--- */ } else { /* <--- */
int min = 999999; int min = 999999;
index=-1; index=-1;
for (i=0 ; i<q->total_subbands ; i++){ for (i=0 ; i<p->total_subbands ; i++){
if(exp_index2[i] > 0){ if(exp_index2[i] > 0){
v = (-2*exp_index2[i])-quant_index_table[i]+bias; v = (-2*exp_index2[i])-quant_index_table[i]+bias;
if ( v < min) { if ( v < min) {
...@@ -493,10 +507,10 @@ static void categorize(COOKContext *q, int* quant_index_table, ...@@ -493,10 +507,10 @@ static void categorize(COOKContext *q, int* quant_index_table,
} }
} }
for(i=0 ; i<q->total_subbands ; i++) for(i=0 ; i<p->total_subbands ; i++)
category[i] = exp_index2[i]; category[i] = exp_index2[i];
for(i=0 ; i<q->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++];
} }
...@@ -556,7 +570,7 @@ static void scalar_dequant_float(COOKContext *q, int index, int quant_index, ...@@ -556,7 +570,7 @@ static void scalar_dequant_float(COOKContext *q, int index, int quant_index,
* @param subband_coef_sign signs of coefficients * @param subband_coef_sign signs of coefficients
*/ */
static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index, static int unpack_SQVH(COOKContext *q, COOKSubpacket *p, int category, 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;
...@@ -565,7 +579,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index, ...@@ -565,7 +579,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index,
result = 0; result = 0;
for(i=0 ; i<vpr_tab[category] ; i++){ for(i=0 ; i<vpr_tab[category] ; i++){
vlc = get_vlc2(&q->gb, q->sqvh[category].table, q->sqvh[category].bits, 3); vlc = get_vlc2(&q->gb, q->sqvh[category].table, q->sqvh[category].bits, 3);
if (q->bits_per_subpacket < get_bits_count(&q->gb)){ if (p->bits_per_subpacket < get_bits_count(&q->gb)){
vlc = 0; vlc = 0;
result = 1; result = 1;
} }
...@@ -576,7 +590,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index, ...@@ -576,7 +590,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index,
} }
for(j=0 ; j<vd ; j++){ for(j=0 ; j<vd ; j++){
if (subband_coef_index[i*vd + j]) { if (subband_coef_index[i*vd + j]) {
if(get_bits_count(&q->gb) < q->bits_per_subpacket){ if(get_bits_count(&q->gb) < p->bits_per_subpacket){
subband_coef_sign[i*vd+j] = get_bits1(&q->gb); subband_coef_sign[i*vd+j] = get_bits1(&q->gb);
} else { } else {
result=1; result=1;
...@@ -601,7 +615,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index, ...@@ -601,7 +615,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index,
*/ */
static void decode_vectors(COOKContext* q, 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. */
...@@ -612,12 +626,12 @@ static void decode_vectors(COOKContext* q, int* category, ...@@ -612,12 +626,12 @@ static void decode_vectors(COOKContext* q, int* category,
int band, j; int band, j;
int index=0; int index=0;
for(band=0 ; band<q->total_subbands ; band++){ for(band=0 ; band<p->total_subbands ; band++){
index = category[band]; index = category[band];
if(category[band] < 7){ if(category[band] < 7){
if(unpack_SQVH(q, 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<q->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) {
...@@ -629,7 +643,7 @@ static void decode_vectors(COOKContext* q, int* category, ...@@ -629,7 +643,7 @@ static void decode_vectors(COOKContext* q, int* category,
&mlt_buffer[band * SUBBAND_SIZE]); &mlt_buffer[band * SUBBAND_SIZE]);
} }
if(q->total_subbands*SUBBAND_SIZE >= q->samples_per_channel){ if(p->total_subbands*SUBBAND_SIZE >= q->samples_per_channel){
return; return;
} /* FIXME: should this be removed, or moved into loop above? */ } /* FIXME: should this be removed, or moved into loop above? */
} }
...@@ -642,7 +656,7 @@ static void decode_vectors(COOKContext* q, int* category, ...@@ -642,7 +656,7 @@ static void decode_vectors(COOKContext* q, int* category,
* @param mlt_buffer pointer to mlt coefficients * @param mlt_buffer pointer to mlt coefficients
*/ */
static void mono_decode(COOKContext *q, 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];
...@@ -651,11 +665,11 @@ static void mono_decode(COOKContext *q, float* mlt_buffer) { ...@@ -651,11 +665,11 @@ static void mono_decode(COOKContext *q, float* mlt_buffer) {
memset(&category, 0, 128*sizeof(int)); memset(&category, 0, 128*sizeof(int));
memset(&category_index, 0, 128*sizeof(int)); memset(&category_index, 0, 128*sizeof(int));
decode_envelope(q, quant_index_table); decode_envelope(q, p, quant_index_table);
q->num_vectors = get_bits(&q->gb,q->log2_numvector_size); q->num_vectors = get_bits(&q->gb,p->log2_numvector_size);
categorize(q, quant_index_table, category, category_index); categorize(q, p, quant_index_table, category, category_index);
expand_category(q, category, category_index); expand_category(q, category, category_index);
decode_vectors(q, category, quant_index_table, mlt_buffer); decode_vectors(q, p, category, quant_index_table, mlt_buffer);
} }
...@@ -760,24 +774,24 @@ static void imlt_gain(COOKContext *q, float *inbuffer, ...@@ -760,24 +774,24 @@ static void imlt_gain(COOKContext *q, float *inbuffer,
* *
*/ */
static void decouple_info(COOKContext *q, int* decouple_tab){ static void decouple_info(COOKContext *q, COOKSubpacket *p, int* decouple_tab){
int length, i; int length, i;
if(get_bits1(&q->gb)) { if(get_bits1(&q->gb)) {
if(cplband[q->js_subband_start] > cplband[q->subbands-1]) return; if(cplband[p->js_subband_start] > cplband[p->subbands-1]) return;
length = cplband[q->subbands-1] - cplband[q->js_subband_start] + 1; length = cplband[p->subbands-1] - cplband[p->js_subband_start] + 1;
for (i=0 ; i<length ; i++) { for (i=0 ; i<length ; i++) {
decouple_tab[cplband[q->js_subband_start] + i] = get_vlc2(&q->gb, q->ccpl.table, q->ccpl.bits, 2); decouple_tab[cplband[p->js_subband_start] + i] = get_vlc2(&q->gb, p->ccpl.table, p->ccpl.bits, 2);
} }
return; return;
} }
if(cplband[q->js_subband_start] > cplband[q->subbands-1]) return; if(cplband[p->js_subband_start] > cplband[p->subbands-1]) return;
length = cplband[q->subbands-1] - cplband[q->js_subband_start] + 1; length = cplband[p->subbands-1] - cplband[p->js_subband_start] + 1;
for (i=0 ; i<length ; i++) { for (i=0 ; i<length ; i++) {
decouple_tab[cplband[q->js_subband_start] + i] = get_bits(&q->gb, q->js_vlc_bits); decouple_tab[cplband[p->js_subband_start] + i] = get_bits(&q->gb, p->js_vlc_bits);
} }
return; return;
} }
...@@ -794,6 +808,7 @@ static void decouple_info(COOKContext *q, int* decouple_tab){ ...@@ -794,6 +808,7 @@ static void decouple_info(COOKContext *q, int* decouple_tab){
* @param mlt_buffer2 pointer to right channel mlt coefficients * @param mlt_buffer2 pointer to right channel mlt coefficients
*/ */
static void decouple_float (COOKContext *q, static void decouple_float (COOKContext *q,
COOKSubpacket *p,
int subband, int subband,
float f1, float f2, float f1, float f2,
float *decode_buffer, float *decode_buffer,
...@@ -801,7 +816,7 @@ static void decouple_float (COOKContext *q, ...@@ -801,7 +816,7 @@ static void decouple_float (COOKContext *q,
{ {
int j, tmp_idx; int j, tmp_idx;
for (j=0 ; j<SUBBAND_SIZE ; j++) { for (j=0 ; j<SUBBAND_SIZE ; j++) {
tmp_idx = ((q->js_subband_start + subband)*SUBBAND_SIZE)+j; tmp_idx = ((p->js_subband_start + subband)*SUBBAND_SIZE)+j;
mlt_buffer1[SUBBAND_SIZE*subband + j] = f1 * decode_buffer[tmp_idx]; mlt_buffer1[SUBBAND_SIZE*subband + j] = f1 * decode_buffer[tmp_idx];
mlt_buffer2[SUBBAND_SIZE*subband + j] = f2 * decode_buffer[tmp_idx]; mlt_buffer2[SUBBAND_SIZE*subband + j] = f2 * decode_buffer[tmp_idx];
} }
...@@ -815,7 +830,7 @@ static void decouple_float (COOKContext *q, ...@@ -815,7 +830,7 @@ static void decouple_float (COOKContext *q,
* @param mlt_buffer2 pointer to right channel mlt coefficients * @param mlt_buffer2 pointer to right channel mlt coefficients
*/ */
static void joint_decode(COOKContext *q, 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];
...@@ -830,11 +845,11 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1, ...@@ -830,11 +845,11 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
/* Make sure the buffers are zeroed out. */ /* Make sure the buffers are zeroed out. */
memset(mlt_buffer1,0, 1024*sizeof(float)); memset(mlt_buffer1,0, 1024*sizeof(float));
memset(mlt_buffer2,0, 1024*sizeof(float)); memset(mlt_buffer2,0, 1024*sizeof(float));
decouple_info(q, decouple_tab); decouple_info(q, p, decouple_tab);
mono_decode(q, decode_buffer); mono_decode(q, p, decode_buffer);
/* The two channels are stored interleaved in decode_buffer. */ /* The two channels are stored interleaved in decode_buffer. */
for (i=0 ; i<q->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_buffer1[i*20+j] = decode_buffer[i*40+j];
mlt_buffer2[i*20+j] = decode_buffer[i*40+20+j]; mlt_buffer2[i*20+j] = decode_buffer[i*40+20+j];
...@@ -843,15 +858,15 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1, ...@@ -843,15 +858,15 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
/* When we reach js_subband_start (the higher frequencies) /* When we reach js_subband_start (the higher frequencies)
the coefficients are stored in a coupling scheme. */ the coefficients are stored in a coupling scheme. */
idx = (1 << q->js_vlc_bits) - 1; idx = (1 << p->js_vlc_bits) - 1;
for (i=q->js_subband_start ; i<q->subbands ; i++) { for (i=p->js_subband_start ; i<p->subbands ; i++) {
cpl_tmp = cplband[i]; cpl_tmp = cplband[i];
idx -=decouple_tab[cpl_tmp]; idx -=decouple_tab[cpl_tmp];
cplscale = q->cplscales[q->js_vlc_bits-2]; //choose decoupler table cplscale = q->cplscales[p->js_vlc_bits-2]; //choose decoupler table
f1 = cplscale[decouple_tab[cpl_tmp]]; f1 = cplscale[decouple_tab[cpl_tmp]];
f2 = cplscale[idx-1]; f2 = cplscale[idx-1];
q->decouple (q, i, f1, f2, decode_buffer, mlt_buffer1, mlt_buffer2); q->decouple (q, p, i, f1, f2, decode_buffer, mlt_buffer1, mlt_buffer2);
idx = (1 << q->js_vlc_bits) - 1; idx = (1 << p->js_vlc_bits) - 1;
} }
} }
...@@ -865,15 +880,15 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1, ...@@ -865,15 +880,15 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
*/ */
static inline void static inline void
decode_bytes_and_gain(COOKContext *q, 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;
offset = decode_bytes(inbuffer, q->decoded_bytes_buffer, offset = decode_bytes(inbuffer, q->decoded_bytes_buffer,
q->bits_per_subpacket/8); p->bits_per_subpacket/8);
init_get_bits(&q->gb, q->decoded_bytes_buffer + offset, init_get_bits(&q->gb, q->decoded_bytes_buffer + offset,
q->bits_per_subpacket); p->bits_per_subpacket);
decode_gain_info(&q->gb, gains_ptr->now); decode_gain_info(&q->gb, gains_ptr->now);
/* Swap current and previous gains */ /* Swap current and previous gains */
...@@ -934,40 +949,40 @@ mlt_compensate_output(COOKContext *q, float *decode_buffer, ...@@ -934,40 +949,40 @@ mlt_compensate_output(COOKContext *q, float *decode_buffer,
*/ */
static int decode_subpacket(COOKContext *q, const uint8_t *inbuffer, static void decode_subpacket(COOKContext *q, COOKSubpacket* p, const uint8_t *inbuffer, int16_t *outbuffer) {
int sub_packet_size, int16_t *outbuffer) { 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));
decode_bytes_and_gain(q, p, inbuffer, &p->gains1);
decode_bytes_and_gain(q, inbuffer, &q->gains1); if (p->joint_stereo) {
joint_decode(q, p, q->decode_buffer_1, q->decode_buffer_2);
if (q->joint_stereo) {
joint_decode(q, q->decode_buffer_1, q->decode_buffer_2);
} else { } else {
mono_decode(q, q->decode_buffer_1); mono_decode(q, p, q->decode_buffer_1);
if (q->nb_channels == 2) { if (p->num_channels == 2) {
decode_bytes_and_gain(q, inbuffer + sub_packet_size/2, &q->gains2); decode_bytes_and_gain(q, p, inbuffer + sub_packet_size/2, &p->gains2);
mono_decode(q, q->decode_buffer_2); mono_decode(q, p, q->decode_buffer_2);
} }
} }
mlt_compensate_output(q, q->decode_buffer_1, &q->gains1, mlt_compensate_output(q, q->decode_buffer_1, &p->gains1,
q->mono_previous_buffer1, outbuffer, 0); p->mono_previous_buffer1, outbuffer, p->ch_idx);
if (q->nb_channels == 2) { if (p->num_channels == 2) {
if (q->joint_stereo) { if (p->joint_stereo) {
mlt_compensate_output(q, q->decode_buffer_2, &q->gains1, mlt_compensate_output(q, q->decode_buffer_2, &p->gains1,
q->mono_previous_buffer2, outbuffer, 1); p->mono_previous_buffer2, outbuffer, p->ch_idx + 1);
} else { } else {
mlt_compensate_output(q, q->decode_buffer_2, &q->gains2, mlt_compensate_output(q, q->decode_buffer_2, &p->gains2,
q->mono_previous_buffer2, outbuffer, 1); p->mono_previous_buffer2, outbuffer, p->ch_idx + 1);
} }
} }
return q->samples_per_frame * sizeof(int16_t);
} }
...@@ -983,11 +998,28 @@ static int cook_decode_frame(AVCodecContext *avctx, ...@@ -983,11 +998,28 @@ static int cook_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
COOKContext *q = avctx->priv_data; COOKContext *q = avctx->priv_data;
int i;
int offset = 0;
int chidx = 0;
if (buf_size < avctx->block_align) if (buf_size < avctx->block_align)
return buf_size; return buf_size;
*data_size = decode_subpacket(q, buf, avctx->block_align, data); /* estimate subpacket sizes */
q->subpacket[0].size = avctx->block_align;
/* decode supbackets */
*data_size = 0;
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].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);
decode_subpacket(q, &q->subpacket[i], buf + offset, (int16_t*)data);
offset += q->subpacket[i].size;
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));
}
*data_size = sizeof(int16_t) * q->nb_channels * q->samples_per_channel;
/* Discard the first two frames: no valid audio. */ /* Discard the first two frames: no valid audio. */
if (avctx->frame_number < 2) *data_size = 0; if (avctx->frame_number < 2) *data_size = 0;
...@@ -1041,27 +1073,17 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1041,27 +1073,17 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
{ {
COOKContext *q = avctx->priv_data; COOKContext *q = avctx->priv_data;
const uint8_t *edata_ptr = avctx->extradata; const uint8_t *edata_ptr = avctx->extradata;
const uint8_t *edata_ptr_end = edata_ptr + avctx->extradata_size;
int extradata_size = avctx->extradata_size;
int s = 0;
q->avctx = avctx; q->avctx = avctx;
/* Take care of the codec specific extradata. */ /* Take care of the codec specific extradata. */
if (avctx->extradata_size <= 0) { if (extradata_size <= 0) {
av_log(avctx,AV_LOG_ERROR,"Necessary extradata missing!\n"); av_log(avctx,AV_LOG_ERROR,"Necessary extradata missing!\n");
return -1; return -1;
} else {
/* 8 for mono, 16 for stereo, ? for multichannel
Swap to right endianness so we don't need to care later on. */
av_log(avctx,AV_LOG_DEBUG,"codecdata_length=%d\n",avctx->extradata_size);
if (avctx->extradata_size >= 8){
q->cookversion = bytestream_get_be32(&edata_ptr);
q->samples_per_frame = bytestream_get_be16(&edata_ptr);
q->subbands = bytestream_get_be16(&edata_ptr);
}
if (avctx->extradata_size >= 16){
bytestream_get_be32(&edata_ptr); //Unknown unused
q->js_subband_start = bytestream_get_be16(&edata_ptr);
q->js_vlc_bits = bytestream_get_be16(&edata_ptr);
}
} }
av_log(avctx,AV_LOG_DEBUG,"codecdata_length=%d\n",avctx->extradata_size);
/* Take data from the AVCodecContext (RM container). */ /* Take data from the AVCodecContext (RM container). */
q->sample_rate = avctx->sample_rate; q->sample_rate = avctx->sample_rate;
...@@ -1071,18 +1093,36 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1071,18 +1093,36 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Initialize RNG. */ /* Initialize RNG. */
av_lfg_init(&q->random_state, ff_random_get_seed()); av_lfg_init(&q->random_state, ff_random_get_seed());
while(edata_ptr < edata_ptr_end){
/* 8 for mono, 16 for stereo, ? for multichannel
Swap to right endianness so we don't need to care later on. */
if (extradata_size >= 8){
q->subpacket[s].cookversion = bytestream_get_be32(&edata_ptr);
q->subpacket[s].samples_per_frame = bytestream_get_be16(&edata_ptr);
q->subpacket[s].subbands = bytestream_get_be16(&edata_ptr);
extradata_size -= 8;
}
if (avctx->extradata_size >= 8){
bytestream_get_be32(&edata_ptr); //Unknown unused
q->subpacket[s].js_subband_start = bytestream_get_be16(&edata_ptr);
q->subpacket[s].js_vlc_bits = bytestream_get_be16(&edata_ptr);
extradata_size -= 8;
}
/* Initialize extradata related variables. */ /* Initialize extradata related variables. */
q->samples_per_channel = q->samples_per_frame / q->nb_channels; q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame / q->nb_channels;
q->bits_per_subpacket = avctx->block_align * 8; q->subpacket[s].bits_per_subpacket = avctx->block_align * 8;
/* Initialize default data states. */ /* Initialize default data states. */
q->log2_numvector_size = 5; q->subpacket[s].log2_numvector_size = 5;
q->total_subbands = q->subbands; q->subpacket[s].total_subbands = q->subpacket[s].subbands;
q->subpacket[s].num_channels = 1;
/* Initialize version-dependent variables */ /* Initialize version-dependent variables */
av_log(avctx,AV_LOG_DEBUG,"q->cookversion=%x\n",q->cookversion);
q->joint_stereo = 0; av_log(avctx,AV_LOG_DEBUG,"subpacket[%i].cookversion=%x\n",s,q->subpacket[s].cookversion);
switch (q->cookversion) { q->subpacket[s].joint_stereo = 0;
switch (q->subpacket[s].cookversion) {
case MONO: case MONO:
if (q->nb_channels != 1) { if (q->nb_channels != 1) {
av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n"); av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n");
...@@ -1091,9 +1131,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1091,9 +1131,9 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
av_log(avctx,AV_LOG_DEBUG,"MONO\n"); av_log(avctx,AV_LOG_DEBUG,"MONO\n");
break; break;
case STEREO: case STEREO:
if (q->nb_channels != 1) { if (q->nb_channels != 1)
q->bits_per_subpacket = q->bits_per_subpacket/2; q->subpacket[s].bits_per_subpdiv = 1;
} q->subpacket[s].num_channels = 2;
av_log(avctx,AV_LOG_DEBUG,"STEREO\n"); av_log(avctx,AV_LOG_DEBUG,"STEREO\n");
break; break;
case JOINT_STEREO: case JOINT_STEREO:
...@@ -1103,14 +1143,15 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1103,14 +1143,15 @@ 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->total_subbands = q->subbands + q->js_subband_start; q->subpacket[s].total_subbands = q->subpacket[s].subbands + q->subpacket[s].js_subband_start;
q->joint_stereo = 1; q->subpacket[s].joint_stereo = 1;
q->subpacket[s].num_channels = 2;
} }
if (q->samples_per_channel > 256) { if (q->subpacket[s].samples_per_channel > 256) {
q->log2_numvector_size = 6; q->subpacket[s].log2_numvector_size = 6;
} }
if (q->samples_per_channel > 512) { if (q->subpacket[s].samples_per_channel > 512) {
q->log2_numvector_size = 7; q->subpacket[s].log2_numvector_size = 7;
} }
break; break;
case MC_COOK: case MC_COOK:
...@@ -1123,9 +1164,39 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1123,9 +1164,39 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
break; break;
} }
if(s > 1 && q->subpacket[s].samples_per_channel != q->samples_per_channel) {
av_log(avctx,AV_LOG_ERROR,"different number of samples per channel!\n");
return -1;
} else
q->samples_per_channel = q->subpacket[0].samples_per_channel;
/* Initialize variable relations */ /* Initialize variable relations */
q->numvector_size = (1 << q->log2_numvector_size); q->subpacket[s].numvector_size = (1 << q->subpacket[s].log2_numvector_size);
/* Try to catch some obviously faulty streams, othervise it might be exploitable */
if (q->subpacket[s].total_subbands > 53) {
av_log(avctx,AV_LOG_ERROR,"total_subbands > 53, report sample!\n");
return -1;
}
if ((q->subpacket[s].js_vlc_bits > 6) || (q->subpacket[s].js_vlc_bits < 0)) {
av_log(avctx,AV_LOG_ERROR,"js_vlc_bits = %d, only >= 0 and <= 6 allowed!\n",q->subpacket[s].js_vlc_bits);
return -1;
}
if (q->subpacket[s].subbands > 50) {
av_log(avctx,AV_LOG_ERROR,"subbands > 50, report sample!\n");
return -1;
}
q->subpacket[s].gains1.now = q->subpacket[s].gain_1;
q->subpacket[s].gains1.previous = q->subpacket[s].gain_2;
q->subpacket[s].gains2.now = q->subpacket[s].gain_3;
q->subpacket[s].gains2.previous = q->subpacket[s].gain_4;
q->num_subpackets++;
s++;
}
/* Generate tables */ /* Generate tables */
init_pow2table(); init_pow2table();
init_gain_table(q); init_gain_table(q);
...@@ -1141,25 +1212,13 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1141,25 +1212,13 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
/* Pad the databuffer with: /* Pad the databuffer with:
DECODE_BYTES_PAD1 or DECODE_BYTES_PAD2 for decode_bytes(), DECODE_BYTES_PAD1 or DECODE_BYTES_PAD2 for decode_bytes(),
FF_INPUT_BUFFER_PADDING_SIZE, for the bitstreamreader. */ FF_INPUT_BUFFER_PADDING_SIZE, for the bitstreamreader. */
if (q->nb_channels==2 && q->joint_stereo==0) {
q->decoded_bytes_buffer =
av_mallocz(avctx->block_align/2
+ DECODE_BYTES_PAD2(avctx->block_align/2)
+ FF_INPUT_BUFFER_PADDING_SIZE);
} else {
q->decoded_bytes_buffer = q->decoded_bytes_buffer =
av_mallocz(avctx->block_align av_mallocz(avctx->block_align
+ DECODE_BYTES_PAD1(avctx->block_align) + DECODE_BYTES_PAD1(avctx->block_align)
+ FF_INPUT_BUFFER_PADDING_SIZE); + FF_INPUT_BUFFER_PADDING_SIZE);
}
if (q->decoded_bytes_buffer == NULL) if (q->decoded_bytes_buffer == NULL)
return -1; return -1;
q->gains1.now = q->gain_1;
q->gains1.previous = q->gain_2;
q->gains2.now = q->gain_3;
q->gains2.previous = q->gain_4;
/* Initialize transform. */ /* Initialize transform. */
if ( init_cook_mlt(q) != 0 ) if ( init_cook_mlt(q) != 0 )
return -1; return -1;
...@@ -1174,23 +1233,11 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1174,23 +1233,11 @@ 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->total_subbands > 53) {
av_log(avctx,AV_LOG_ERROR,"total_subbands > 53, report sample!\n");
return -1;
}
if (q->subbands > 50) {
av_log(avctx,AV_LOG_ERROR,"subbands > 50, report sample!\n");
return -1;
}
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(avctx,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel); av_log(avctx,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel);
return -1; return -1;
} }
if ((q->js_vlc_bits > 6) || (q->js_vlc_bits < 0)) {
av_log(avctx,AV_LOG_ERROR,"q->js_vlc_bits = %d, only >= 0 and <= 6 allowed!\n",q->js_vlc_bits);
return -1;
}
avctx->sample_fmt = SAMPLE_FMT_S16; avctx->sample_fmt = SAMPLE_FMT_S16;
avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment