Use forced key frames when encoding with libxvid.
[ffmpeg.git] / libavcodec / cook.c
index 6039cfc..b7e2ef1 100644 (file)
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file cook.c
+ * @file
  * Cook compatible decoder. Bastardization of the G.722.1 standard.
  * This decoder handles RealNetworks, RealAudio G2 data.
  * Cook is identified by the codec name cook in RM files.
 #include <stddef.h>
 #include <stdio.h>
 
+#include "libavutil/lfg.h"
+#include "libavutil/random_seed.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
-#include "random.h"
+#include "fft.h"
 
 #include "cookdata.h"
 
@@ -61,6 +63,7 @@
 #define MC_COOK         0x2000000   //multichannel Cook, not supported
 
 #define SUBBAND_SIZE    20
+#define MAX_SUBPACKETS   5
 //#define COOKDEBUG
 
 typedef struct {
@@ -69,61 +72,98 @@ typedef struct {
 } cook_gains;
 
 typedef struct {
-    GetBitContext       gb;
-    /* stream data */
-    int                 nb_channels;
-    int                 joint_stereo;
-    int                 bit_rate;
-    int                 sample_rate;
-    int                 samples_per_channel;
+    int                 ch_idx;
+    int                 size;
+    int                 num_channels;
+    int                 cookversion;
     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                 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                 cookversion;
-    /* states */
-    AVRandomState       random_state;
-
-    /* transform data */
-    MDCTContext         mdct_ctx;
-    DECLARE_ALIGNED_16(FFTSample, mdct_tmp[1024]);  /* temporary storage for imlt */
-    float*              mlt_window;
+    int                 bits_per_subpdiv;
+    int                 total_subbands;
+    int                 numvector_size;       ///< 1 << log2_numvector_size;
 
-    /* gain buffers */
+    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 {
+    /*
+     * The following 5 functions provide the lowlevel arithmetic on
+     * the internal audio buffers.
+     */
+    void (* scalar_dequant)(struct cook *q, int index, int quant_index,
+                            int* subband_coef_index, int* subband_coef_sign,
+                            float* mlt_p);
+
+    void (* decouple) (struct cook *q,
+                       COOKSubpacket *p,
+                       int subband,
+                       float f1, float f2,
+                       float *decode_buffer,
+                       float *mlt_buffer1, float *mlt_buffer2);
+
+    void (* imlt_window) (struct cook *q, float *buffer1,
+                          cook_gains *gains_ptr, float *previous_buffer);
+
+    void (* interpolate) (struct cook *q, float* buffer,
+                          int gain_index, int gain_index_next);
+
+    void (* saturate_output) (struct cook *q, int chan, int16_t *out);
+
+    AVCodecContext*     avctx;
+    GetBitContext       gb;
+    /* stream data */
+    int                 nb_channels;
+    int                 bit_rate;
+    int                 sample_rate;
+    int                 num_vectors;
+    int                 samples_per_channel;
+    /* states */
+    AVLFG               random_state;
+
+    /* transform data */
+    FFTContext          mdct_ctx;
+    float*              mlt_window;
 
     /* VLC data */
-    int                 js_vlc_bits;
     VLC                 envelope_quant_index[13];
     VLC                 sqvh[7];          //scalar quantization
-    VLC                 ccpl;             //channel coupling
 
     /* generatable tables and related variables */
     int                 gain_size_factor;
     float               gain_table[23];
-    float               pow2tab[127];
-    float               rootpow2tab[127];
 
     /* data buffers */
 
     uint8_t*            decoded_bytes_buffer;
-    DECLARE_ALIGNED_16(float,mono_mdct_output[2048]);
-    float               mono_previous_buffer1[1024];
-    float               mono_previous_buffer2[1024];
+    DECLARE_ALIGNED(16, float,mono_mdct_output)[2048];
     float               decode_buffer_1[1024];
     float               decode_buffer_2[1024];
     float               decode_buffer_0[1060]; /* static allocation for joint decode */
+
+    const float         *cplscales[5];
+    int                 num_subpackets;
+    COOKSubpacket       subpacket[MAX_SUBPACKETS];
 } COOKContext;
 
+static float     pow2tab[127];
+static float rootpow2tab[127];
+
 /* debug functions */
 
 #ifdef COOKDEBUG
@@ -159,37 +199,26 @@ static void dump_short_table(short* table, int size, int delimiter) {
 /*************** init functions ***************/
 
 /* table generator */
-static void init_pow2table(COOKContext *q){
+static av_cold void init_pow2table(void){
     int i;
-    q->pow2tab[63] = 1.0;
-    for (i=1 ; i<64 ; i++){
-        q->pow2tab[63+i]=(float)((uint64_t)1<<i);
-        q->pow2tab[63-i]=1.0/(float)((uint64_t)1<<i);
+    for (i=-63 ; i<64 ; i++){
+            pow2tab[63+i]=     pow(2, i);
+        rootpow2tab[63+i]=sqrt(pow(2, i));
     }
 }
 
 /* table generator */
-static void init_rootpow2table(COOKContext *q){
-    int i;
-    q->rootpow2tab[63] = 1.0;
-    for (i=1 ; i<64 ; i++){
-        q->rootpow2tab[63+i]=sqrt((float)((uint64_t)1<<i));
-        q->rootpow2tab[63-i]=sqrt(1.0/(float)((uint64_t)1<<i));
-    }
-}
-
-/* table generator */
-static void init_gain_table(COOKContext *q) {
+static av_cold void init_gain_table(COOKContext *q) {
     int i;
     q->gain_size_factor = q->samples_per_channel/8;
     for (i=0 ; i<23 ; i++) {
-        q->gain_table[i] = pow((double)q->pow2tab[i+52] ,
+        q->gain_table[i] = pow(pow2tab[i+52] ,
                                (1.0/(double)q->gain_size_factor));
     }
 }
 
 
-static int init_cook_vlc_tables(COOKContext *q) {
+static av_cold int init_cook_vlc_tables(COOKContext *q) {
     int i, result;
 
     result = 0;
@@ -198,56 +227,72 @@ static int init_cook_vlc_tables(COOKContext *q) {
             envelope_quant_index_huffbits[i], 1, 1,
             envelope_quant_index_huffcodes[i], 2, 2, 0);
     }
-    av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n");
+    av_log(q->avctx,AV_LOG_DEBUG,"sqvh VLC init\n");
     for (i=0 ; i<7 ; i++) {
         result |= init_vlc (&q->sqvh[i], vhvlcsize_tab[i], vhsize_tab[i],
             cvh_huffbits[i], 1, 1,
             cvh_huffcodes[i], 2, 2, 0);
     }
 
-    if (q->nb_channels==2 && q->joint_stereo==1){
-        result |= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1,
-            ccpl_huffbits[q->js_vlc_bits-2], 1, 1,
-            ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0);
-        av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n");
+    for(i=0;i<q->num_subpackets;i++){
+        if (q->subpacket[i].joint_stereo==1){
+            result |= init_vlc (&q->subpacket[i].ccpl, 6, (1<<q->subpacket[i].js_vlc_bits)-1,
+                ccpl_huffbits[q->subpacket[i].js_vlc_bits-2], 1, 1,
+                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(NULL,AV_LOG_DEBUG,"VLC tables initialized.\n");
+    av_log(q->avctx,AV_LOG_DEBUG,"VLC tables initialized.\n");
     return result;
 }
 
-static int init_cook_mlt(COOKContext *q) {
+static av_cold int init_cook_mlt(COOKContext *q) {
     int j;
-    float alpha;
     int mlt_size = q->samples_per_channel;
 
     if ((q->mlt_window = av_malloc(sizeof(float)*mlt_size)) == 0)
       return -1;
 
     /* Initialize the MLT window: simple sine window. */
-    alpha = M_PI / (2.0 * (float)mlt_size);
+    ff_sine_window_init(q->mlt_window, mlt_size);
     for(j=0 ; j<mlt_size ; j++)
-        q->mlt_window[j] = sin((j + 0.5) * alpha) * sqrt(2.0 / q->samples_per_channel);
+        q->mlt_window[j] *= sqrt(2.0 / q->samples_per_channel);
 
     /* Initialize the MDCT. */
-    if (ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size)+1, 1)) {
+    if (ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size)+1, 1, 1.0)) {
       av_free(q->mlt_window);
       return -1;
     }
-    av_log(NULL,AV_LOG_DEBUG,"MDCT initialized, order = %d.\n",
+    av_log(q->avctx,AV_LOG_DEBUG,"MDCT initialized, order = %d.\n",
            av_log2(mlt_size)+1);
 
     return 0;
 }
 
+static const float *maybe_reformat_buffer32 (COOKContext *q, const float *ptr, int n)
+{
+    if (1)
+        return ptr;
+}
+
+static av_cold void init_cplscales_table (COOKContext *q) {
+    int i;
+    for (i=0;i<5;i++)
+        q->cplscales[i] = maybe_reformat_buffer32 (q, cplscales[i], (1<<(i+2))-1);
+}
+
 /*************** init functions end ***********/
 
+#define DECODE_BYTES_PAD1(bytes) (3 - ((bytes)+3) % 4)
+#define DECODE_BYTES_PAD2(bytes) ((bytes) % 4 + DECODE_BYTES_PAD1(2 * (bytes)))
+
 /**
  * Cook indata decoding, every 32 bits are XORed with 0x37c511f2.
  * Why? No idea, some checksum/error detection method maybe.
  *
  * Out buffer size: extra bytes are needed to cope with
- * padding/missalignment.
+ * padding/misalignment.
  * Subpackets passed to the decoder can contain two, consecutive
  * half-subpackets, of identical but arbitrary size.
  *          1234 1234 1234 1234  extraA extraB
@@ -262,23 +307,21 @@ static int init_cook_mlt(COOKContext *q) {
  * @param out       pointer to byte array of outdata
  * @param bytes     number of bytes
  */
-#define DECODE_BYTES_PAD1(bytes) (3 - ((bytes)+3) % 4)
-#define DECODE_BYTES_PAD2(bytes) ((bytes) % 4 + DECODE_BYTES_PAD1(2 * (bytes)))
 
-static inline int decode_bytes(uint8_t* inbuffer, uint8_t* out, int bytes){
+static inline int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes){
     int i, off;
     uint32_t c;
-    uint32_t* buf;
+    const uint32_t* buf;
     uint32_t* obuf = (uint32_t*) out;
     /* FIXME: 64 bit platforms would be able to do 64 bits at a time.
      * I'm too lazy though, should be something like
      * for(i=0 ; i<bitamount/64 ; i++)
-     *     (int64_t)out[i] = 0x37c511f237c511f2^be2me_64(int64_t)in[i]);
+     *     (int64_t)out[i] = 0x37c511f237c511f2^av_be2ne64(int64_t)in[i]);
      * Buffer alignment needs to be checked. */
 
-    off = (int)((long)inbuffer & 3);
-    buf = (uint32_t*) (inbuffer - off);
-    c = be2me_32((0x37c511f2 >> (off*8)) | (0x37c511f2 << (32-(off*8))));
+    off = (intptr_t)inbuffer & 3;
+    buf = (const uint32_t*) (inbuffer - off);
+    c = av_be2ne32((0x37c511f2 >> (off*8)) | (0x37c511f2 << (32-(off*8))));
     bytes += 3 + off;
     for (i = 0; i < bytes/4; i++)
         obuf[i] = c ^ buf[i];
@@ -290,7 +333,7 @@ static inline int decode_bytes(uint8_t* inbuffer, uint8_t* out, int bytes){
  * Cook uninit
  */
 
-static int cook_decode_close(AVCodecContext *avctx)
+static av_cold int cook_decode_close(AVCodecContext *avctx)
 {
     int i;
     COOKContext *q = avctx->priv_data;
@@ -310,11 +353,11 @@ static int cook_decode_close(AVCodecContext *avctx)
     for (i=0 ; i<7 ; i++) {
         free_vlc(&q->sqvh[i]);
     }
-    if(q->nb_channels==2 && q->joint_stereo==1 ){
-        free_vlc(&q->ccpl);
+    for (i=0 ; i<q->num_subpackets ; i++) {
+        free_vlc(&q->subpacket[i].ccpl);
     }
 
-    av_log(NULL,AV_LOG_DEBUG,"Memory deallocated.\n");
+    av_log(avctx,AV_LOG_DEBUG,"Memory deallocated.\n");
 
     return 0;
 }
@@ -322,8 +365,8 @@ static int cook_decode_close(AVCodecContext *avctx)
 /**
  * Fill the gain array for the timedomain quantization.
  *
- * @param q                 pointer to the COOKContext
- * @param gaininfo[9]       array of gain indices
+ * @param gb          pointer to the GetBitContext
+ * @param gaininfo[9] array of gain indexes
  */
 
 static void decode_gain_info(GetBitContext *gb, int *gaininfo)
@@ -350,15 +393,15 @@ static void decode_gain_info(GetBitContext *gb, int *gaininfo)
  * @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;
 
     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;
-        if (i >= q->js_subband_start * 2) {
-            vlc_index-=q->js_subband_start;
+        if (i >= p->js_subband_start * 2) {
+            vlc_index-=p->js_subband_start;
         } else {
             vlc_index/=2;
             if(vlc_index < 1) vlc_index = 1;
@@ -380,22 +423,22 @@ static void decode_envelope(COOKContext *q, int* quant_index_table) {
  * @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 exp_idx, bias, tmpbias1, tmpbias2, bits_left, num_bits, index, v, i, j;
     int exp_index2[102];
     int exp_index1[102];
 
     int tmp_categorize_array[128*2];
-    int tmp_categorize_array1_idx=q->numvector_size;
-    int tmp_categorize_array2_idx=q->numvector_size;
+    int tmp_categorize_array1_idx=p->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) {
         bits_left = q->samples_per_channel +
                     ((bits_left - q->samples_per_channel)*5)/8;
-        //av_log(NULL, AV_LOG_ERROR, "bits_left = %d\n",bits_left);
+        //av_log(q->avctx, AV_LOG_ERROR, "bits_left = %d\n",bits_left);
     }
 
     memset(&exp_index1,0,102*sizeof(int));
@@ -408,7 +451,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
     for (i=32 ; i>0 ; i=i/2){
         num_bits = 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);
             index++;
             num_bits+=expbits_tab[exp_idx];
@@ -420,7 +463,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
 
     /* Calculate total number of bits. */
     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);
         num_bits += expbits_tab[exp_idx];
         exp_index1[i] = exp_idx;
@@ -428,11 +471,11 @@ static void categorize(COOKContext *q, int* quant_index_table,
     }
     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) {  /* ---> */
             int max = -999999;
             index=-1;
-            for (i=0 ; i<q->total_subbands ; i++){
+            for (i=0 ; i<p->total_subbands ; i++){
                 if (exp_index1[i] < 7) {
                     v = (-2*exp_index1[i]) - quant_index_table[i] + bias;
                     if ( v >= max) {
@@ -449,7 +492,7 @@ static void categorize(COOKContext *q, int* quant_index_table,
         } else {  /* <--- */
             int min = 999999;
             index=-1;
-            for (i=0 ; i<q->total_subbands ; i++){
+            for (i=0 ; i<p->total_subbands ; i++){
                 if(exp_index2[i] > 0){
                     v = (-2*exp_index2[i])-quant_index_table[i]+bias;
                     if ( v < min) {
@@ -466,10 +509,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];
 
-    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++];
 
 }
@@ -502,7 +545,7 @@ static inline void expand_category(COOKContext *q, int* category,
  * @param mlt_p                 pointer into the mlt buffer
  */
 
-static void scalar_dequant(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,
                            float* mlt_p){
     int i;
@@ -515,9 +558,9 @@ static void scalar_dequant(COOKContext *q, int index, int quant_index,
         } else {
             /* noise coding if subband_coef_index[i] == 0 */
             f1 = dither_tab[index];
-            if (av_random(&q->random_state) < 0x80000000) f1 = -f1;
+            if (av_lfg_get(&q->random_state) < 0x80000000) f1 = -f1;
         }
-        mlt_p[i] = f1 * q->rootpow2tab[quant_index+63];
+        mlt_p[i] = f1 * rootpow2tab[quant_index+63];
     }
 }
 /**
@@ -529,7 +572,7 @@ static void scalar_dequant(COOKContext *q, int index, int quant_index,
  * @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 i,j;
     int vlc, vd ,tmp, result;
@@ -538,7 +581,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index,
     result = 0;
     for(i=0 ; i<vpr_tab[category] ; i++){
         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;
             result = 1;
         }
@@ -549,7 +592,7 @@ static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index,
         }
         for(j=0 ; j<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);
                 } else {
                     result=1;
@@ -574,7 +617,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){
     /* A zero in this table means that the subband coefficient is
        random noise coded. */
@@ -585,24 +628,24 @@ static void decode_vectors(COOKContext* q, int* category,
     int band, j;
     int index=0;
 
-    for(band=0 ; band<q->total_subbands ; band++){
+    for(band=0 ; band<p->total_subbands ; band++){
         index = category[band];
         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;
-                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) {
             memset(subband_coef_index, 0, sizeof(subband_coef_index));
             memset(subband_coef_sign, 0, sizeof(subband_coef_sign));
         }
-        scalar_dequant(q, index, quant_index_table[band],
-                       subband_coef_index, subband_coef_sign,
-                       &mlt_buffer[band * SUBBAND_SIZE]);
+        q->scalar_dequant(q, index, quant_index_table[band],
+                          subband_coef_index, subband_coef_sign,
+                          &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;
     } /* FIXME: should this be removed, or moved into loop above? */
 }
@@ -615,7 +658,7 @@ static void decode_vectors(COOKContext* q, int* category,
  * @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 quant_index_table[102];
@@ -624,11 +667,11 @@ static void mono_decode(COOKContext *q, float* mlt_buffer) {
     memset(&category, 0, 128*sizeof(int));
     memset(&category_index, 0, 128*sizeof(int));
 
-    decode_envelope(q, quant_index_table);
-    q->num_vectors = get_bits(&q->gb,q->log2_numvector_size);
-    categorize(q, quant_index_table, category, category_index);
+    decode_envelope(q, p, quant_index_table);
+    q->num_vectors = get_bits(&q->gb,p->log2_numvector_size);
+    categorize(q, p, quant_index_table, 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);
 }
 
 
@@ -641,11 +684,11 @@ static void mono_decode(COOKContext *q, float* mlt_buffer) {
  * @param gain_index_next   index for the next block multiplier
  */
 
-static void interpolate(COOKContext *q, float* buffer,
+static void interpolate_float(COOKContext *q, float* buffer,
                         int gain_index, int gain_index_next){
     int i;
     float fc1, fc2;
-    fc1 = q->pow2tab[gain_index+63];
+    fc1 = pow2tab[gain_index+63];
 
     if(gain_index == gain_index_next){              //static gain
         for(i=0 ; i<q->gain_size_factor ; i++){
@@ -671,10 +714,10 @@ static void interpolate(COOKContext *q, float* buffer,
  * @param previous_buffer   pointer to the previous buffer to be used for overlapping
  */
 
-static void imlt_window_float (COOKContext *q, float *buffer1,
+static void imlt_window_float (COOKContext *q, float *inbuffer,
                                cook_gains *gains_ptr, float *previous_buffer)
 {
-    const float fc = q->pow2tab[gains_ptr->previous[0] + 63];
+    const float fc = pow2tab[gains_ptr->previous[0] + 63];
     int i;
     /* The weird thing here, is that the two halves of the time domain
      * buffer are swapped. Also, the newest data, that we save away for
@@ -684,7 +727,7 @@ static void imlt_window_float (COOKContext *q, float *buffer1,
 
     /* Apply window and overlap */
     for(i = 0; i < q->samples_per_channel; i++){
-        buffer1[i] = buffer1[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];
     }
 }
@@ -709,16 +752,15 @@ static void imlt_gain(COOKContext *q, float *inbuffer,
     int i;
 
     /* Inverse modified discrete cosine transform */
-    q->mdct_ctx.fft.imdct_calc(&q->mdct_ctx, q->mono_mdct_output,
-                               inbuffer, q->mdct_tmp);
+    ff_imdct_calc(&q->mdct_ctx, q->mono_mdct_output, inbuffer);
 
-    imlt_window_float (q, buffer1, gains_ptr, previous_buffer);
+    q->imlt_window (q, buffer1, gains_ptr, previous_buffer);
 
     /* Apply gain profile */
     for (i = 0; i < 8; i++) {
         if (gains_ptr->now[i] || gains_ptr->now[i + 1])
-            interpolate(q, &buffer1[q->gain_size_factor * i],
-                        gains_ptr->now[i], gains_ptr->now[i + 1]);
+            q->interpolate(q, &buffer1[q->gain_size_factor * i],
+                           gains_ptr->now[i], gains_ptr->now[i + 1]);
     }
 
     /* Save away the current to be previous block. */
@@ -734,24 +776,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;
 
     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++) {
-            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;
     }
 
-    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++) {
-       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;
 }
@@ -768,6 +810,7 @@ static void decouple_info(COOKContext *q, int* decouple_tab){
  * @param mlt_buffer2       pointer to right channel mlt coefficients
  */
 static void decouple_float (COOKContext *q,
+                            COOKSubpacket *p,
                             int subband,
                             float f1, float f2,
                             float *decode_buffer,
@@ -775,7 +818,7 @@ static void decouple_float (COOKContext *q,
 {
     int j, tmp_idx;
     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_buffer2[SUBBAND_SIZE*subband + j] = f2 * decode_buffer[tmp_idx];
     }
@@ -789,14 +832,14 @@ static void decouple_float (COOKContext *q,
  * @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) {
     int i,j;
     int decouple_tab[SUBBAND_SIZE];
     float *decode_buffer = q->decode_buffer_0;
-    int idx, cpl_tmp,tmp_idx;
+    int idx, cpl_tmp;
     float f1,f2;
-    float* cplscale;
+    const float* cplscale;
 
     memset(decouple_tab, 0, sizeof(decouple_tab));
     memset(decode_buffer, 0, sizeof(decode_buffer));
@@ -804,11 +847,11 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
     /* Make sure the buffers are zeroed out. */
     memset(mlt_buffer1,0, 1024*sizeof(float));
     memset(mlt_buffer2,0, 1024*sizeof(float));
-    decouple_info(q, decouple_tab);
-    mono_decode(q, decode_buffer);
+    decouple_info(q, p, decouple_tab);
+    mono_decode(q, p, 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++) {
             mlt_buffer1[i*20+j] = decode_buffer[i*40+j];
             mlt_buffer2[i*20+j] = decode_buffer[i*40+20+j];
@@ -817,15 +860,15 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
 
     /* When we reach js_subband_start (the higher frequencies)
        the coefficients are stored in a coupling scheme. */
-    idx = (1 << q->js_vlc_bits) - 1;
-    for (i=q->js_subband_start ; i<q->subbands ; i++) {
+    idx = (1 << p->js_vlc_bits) - 1;
+    for (i=p->js_subband_start ; i<p->subbands ; i++) {
         cpl_tmp = cplband[i];
         idx -=decouple_tab[cpl_tmp];
-        cplscale = (float*)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]];
         f2 = cplscale[idx-1];
-        decouple_float (q, i, f1, f2, decode_buffer, mlt_buffer1, mlt_buffer2);
-        idx = (1 << q->js_vlc_bits) - 1;
+        q->decouple (q, p, i, f1, f2, decode_buffer, mlt_buffer1, mlt_buffer2);
+        idx = (1 << p->js_vlc_bits) - 1;
     }
 }
 
@@ -835,19 +878,19 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
  *
  * @param q                 pointer to the COOKContext
  * @param inbuffer          pointer to raw stream data
- * @param gain_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, uint8_t *inbuffer,
+decode_bytes_and_gain(COOKContext *q, COOKSubpacket *p, const uint8_t *inbuffer,
                       cook_gains *gains_ptr)
 {
     int offset;
 
     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,
-                  q->bits_per_subpacket);
+                  p->bits_per_subpacket);
     decode_gain_info(&q->gb, gains_ptr->now);
 
     /* Swap current and previous gains */
@@ -865,12 +908,12 @@ static void
 saturate_output_float (COOKContext *q, int chan, int16_t *out)
 {
     int j;
-    float_t *output = q->mono_mdct_output + q->samples_per_channel;
+    float *output = q->mono_mdct_output + q->samples_per_channel;
     /* Clip and convert floats to 16 bits.
      */
     for (j = 0; j < q->samples_per_channel; j++) {
         out[chan + q->nb_channels * j] =
-          av_clip(lrintf(output[j]), -32768, 32767);
+          av_clip_int16(lrintf(output[j]));
     }
 }
 
@@ -881,7 +924,7 @@ saturate_output_float (COOKContext *q, int chan, int16_t *out)
  *
  * @param q                 pointer to the COOKContext
  * @param decode_buffer     pointer to the mlt coefficients
- * @param gain_ptr          array of current/prev gain pointers
+ * @param gains_ptr         array of current/prev gain pointers
  * @param previous_buffer   pointer to the previous buffer to be used for overlapping
  * @param out               pointer to the output buffer
  * @param chan              0: left or single channel, 1: right channel
@@ -889,11 +932,11 @@ saturate_output_float (COOKContext *q, int chan, int16_t *out)
 
 static inline void
 mlt_compensate_output(COOKContext *q, float *decode_buffer,
-                      cook_gains *gains, float *previous_buffer,
+                      cook_gains *gains_ptr, float *previous_buffer,
                       int16_t *out, int chan)
 {
-    imlt_gain(q, decode_buffer, gains, previous_buffer);
-    saturate_output_float (q, chan, out);
+    imlt_gain(q, decode_buffer, gains_ptr, previous_buffer);
+    q->saturate_output (q, chan, out);
 }
 
 
@@ -903,45 +946,42 @@ mlt_compensate_output(COOKContext *q, float *decode_buffer,
  *
  * @param q                 pointer to the COOKContext
  * @param inbuffer          pointer to the inbuffer
- * @param sub_packet_size   subpacket size
  * @param outbuffer         pointer to the outbuffer
  */
-
-
-static int decode_subpacket(COOKContext *q, uint8_t *inbuffer,
-                            int sub_packet_size, int16_t *outbuffer) {
+static void decode_subpacket(COOKContext *q, COOKSubpacket* p, const uint8_t *inbuffer, int16_t *outbuffer) {
+    int sub_packet_size = p->size;
     /* packet dump */
 //    for (i=0 ; i<sub_packet_size ; i++) {
-//        av_log(NULL, AV_LOG_ERROR, "%02x", inbuffer[i]);
+//        av_log(q->avctx, AV_LOG_ERROR, "%02x", inbuffer[i]);
 //    }
-//    av_log(NULL, 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 (q->joint_stereo) {
-        joint_decode(q, q->decode_buffer_1, q->decode_buffer_2);
+    if (p->joint_stereo) {
+        joint_decode(q, p, q->decode_buffer_1, q->decode_buffer_2);
     } else {
-        mono_decode(q, q->decode_buffer_1);
+        mono_decode(q, p, q->decode_buffer_1);
 
-        if (q->nb_channels == 2) {
-            decode_bytes_and_gain(q, inbuffer + sub_packet_size/2, &q->gains2);
-            mono_decode(q, q->decode_buffer_2);
+        if (p->num_channels == 2) {
+            decode_bytes_and_gain(q, p, inbuffer + sub_packet_size/2, &p->gains2);
+            mono_decode(q, p, q->decode_buffer_2);
         }
     }
 
-    mlt_compensate_output(q, q->decode_buffer_1, &q->gains1,
-                          q->mono_previous_buffer1, outbuffer, 0);
+    mlt_compensate_output(q, q->decode_buffer_1, &p->gains1,
+                          p->mono_previous_buffer1, outbuffer, p->ch_idx);
+
+    if (p->num_channels == 2) {
+        if (p->joint_stereo) {
+            mlt_compensate_output(q, q->decode_buffer_2, &p->gains1,
+                                  p->mono_previous_buffer2, outbuffer, p->ch_idx + 1);
+         } else {
+            mlt_compensate_output(q, q->decode_buffer_2, &p->gains2,
+                                  p->mono_previous_buffer2, outbuffer, p->ch_idx + 1);
+         }
+     }
 
-    if (q->nb_channels == 2) {
-        if (q->joint_stereo) {
-            mlt_compensate_output(q, q->decode_buffer_2, &q->gains1,
-                                  q->mono_previous_buffer2, outbuffer, 1);
-        } else {
-            mlt_compensate_output(q, q->decode_buffer_2, &q->gains2,
-                                  q->mono_previous_buffer2, outbuffer, 1);
-        }
-    }
-    return q->samples_per_frame * sizeof(int16_t);
 }
 
 
@@ -953,13 +993,41 @@ static int decode_subpacket(COOKContext *q, uint8_t *inbuffer,
 
 static int cook_decode_frame(AVCodecContext *avctx,
             void *data, int *data_size,
-            uint8_t *buf, int buf_size) {
+            AVPacket *avpkt) {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     COOKContext *q = avctx->priv_data;
+    int i;
+    int offset = 0;
+    int chidx = 0;
 
     if (buf_size < avctx->block_align)
         return buf_size;
 
-    *data_size = decode_subpacket(q, buf, avctx->block_align, data);
+    /* estimate subpacket sizes */
+    q->subpacket[0].size = avctx->block_align;
+
+    for(i=1;i<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;
+        if (q->subpacket[0].size < 0) {
+            av_log(avctx,AV_LOG_DEBUG,"frame subpacket size total > avctx->block_align!\n");
+            return -1;
+        }
+    }
+
+    /* 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. */
     if (avctx->frame_number < 2) *data_size = 0;
@@ -971,58 +1039,60 @@ static int cook_decode_frame(AVCodecContext *avctx,
 static void dump_cook_context(COOKContext *q)
 {
     //int i=0;
-#define PRINT(a,b) av_log(NULL,AV_LOG_ERROR," %s = %d\n", a, b);
-    av_log(NULL,AV_LOG_ERROR,"COOKextradata\n");
-    av_log(NULL,AV_LOG_ERROR,"cookversion=%x\n",q->cookversion);
-    if (q->cookversion > STEREO) {
-        PRINT("js_subband_start",q->js_subband_start);
-        PRINT("js_vlc_bits",q->js_vlc_bits);
+#define PRINT(a,b) av_log(q->avctx,AV_LOG_ERROR," %s = %d\n", a, b);
+    av_log(q->avctx,AV_LOG_ERROR,"COOKextradata\n");
+    av_log(q->avctx,AV_LOG_ERROR,"cookversion=%x\n",q->subpacket[0].cookversion);
+    if (q->subpacket[0].cookversion > STEREO) {
+        PRINT("js_subband_start",q->subpacket[0].js_subband_start);
+        PRINT("js_vlc_bits",q->subpacket[0].js_vlc_bits);
     }
-    av_log(NULL,AV_LOG_ERROR,"COOKContext\n");
+    av_log(q->avctx,AV_LOG_ERROR,"COOKContext\n");
     PRINT("nb_channels",q->nb_channels);
     PRINT("bit_rate",q->bit_rate);
     PRINT("sample_rate",q->sample_rate);
-    PRINT("samples_per_channel",q->samples_per_channel);
-    PRINT("samples_per_frame",q->samples_per_frame);
-    PRINT("subbands",q->subbands);
+    PRINT("samples_per_channel",q->subpacket[0].samples_per_channel);
+    PRINT("samples_per_frame",q->subpacket[0].samples_per_frame);
+    PRINT("subbands",q->subpacket[0].subbands);
     PRINT("random_state",q->random_state);
-    PRINT("js_subband_start",q->js_subband_start);
-    PRINT("log2_numvector_size",q->log2_numvector_size);
-    PRINT("numvector_size",q->numvector_size);
-    PRINT("total_subbands",q->total_subbands);
+    PRINT("js_subband_start",q->subpacket[0].js_subband_start);
+    PRINT("log2_numvector_size",q->subpacket[0].log2_numvector_size);
+    PRINT("numvector_size",q->subpacket[0].numvector_size);
+    PRINT("total_subbands",q->subpacket[0].total_subbands);
 }
 #endif
 
+static av_cold int cook_count_channels(unsigned int mask){
+    int i;
+    int channels = 0;
+    for(i = 0;i<32;i++){
+        if(mask & (1<<i))
+            ++channels;
+    }
+    return channels;
+}
+
 /**
  * Cook initialization
  *
  * @param avctx     pointer to the AVCodecContext
  */
 
-static int cook_decode_init(AVCodecContext *avctx)
+static av_cold int cook_decode_init(AVCodecContext *avctx)
 {
     COOKContext *q = avctx->priv_data;
-    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;
+    unsigned int channel_mask = 0;
+    q->avctx = avctx;
 
     /* 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");
         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). */
     q->sample_rate = avctx->sample_rate;
@@ -1030,67 +1100,138 @@ static int cook_decode_init(AVCodecContext *avctx)
     q->bit_rate = avctx->bit_rate;
 
     /* Initialize RNG. */
-    av_init_random(1, &q->random_state);
-
-    /* Initialize extradata related variables. */
-    q->samples_per_channel = q->samples_per_frame / q->nb_channels;
-    q->bits_per_subpacket = avctx->block_align * 8;
-
-    /* Initialize default data states. */
-    q->log2_numvector_size = 5;
-    q->total_subbands = q->subbands;
-
-    /* Initialize version-dependent variables */
-    av_log(NULL,AV_LOG_DEBUG,"q->cookversion=%x\n",q->cookversion);
-    q->joint_stereo = 0;
-    switch (q->cookversion) {
-        case MONO:
-            if (q->nb_channels != 1) {
-                av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n");
-                return -1;
-            }
-            av_log(avctx,AV_LOG_DEBUG,"MONO\n");
-            break;
-        case STEREO:
-            if (q->nb_channels != 1) {
-                q->bits_per_subpacket = q->bits_per_subpacket/2;
-            }
-            av_log(avctx,AV_LOG_DEBUG,"STEREO\n");
-            break;
-        case JOINT_STEREO:
-            if (q->nb_channels != 2) {
-                av_log(avctx,AV_LOG_ERROR,"Container channels != 2, report sample!\n");
+    av_lfg_init(&q->random_state, 0);
+
+    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. */
+        q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame / q->nb_channels;
+        q->subpacket[s].bits_per_subpacket = avctx->block_align * 8;
+
+        /* Initialize default data states. */
+        q->subpacket[s].log2_numvector_size = 5;
+        q->subpacket[s].total_subbands = q->subpacket[s].subbands;
+        q->subpacket[s].num_channels = 1;
+
+        /* Initialize version-dependent variables */
+
+        av_log(avctx,AV_LOG_DEBUG,"subpacket[%i].cookversion=%x\n",s,q->subpacket[s].cookversion);
+        q->subpacket[s].joint_stereo = 0;
+        switch (q->subpacket[s].cookversion) {
+            case MONO:
+                if (q->nb_channels != 1) {
+                    av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n");
+                    return -1;
+                }
+                av_log(avctx,AV_LOG_DEBUG,"MONO\n");
+                break;
+            case STEREO:
+                if (q->nb_channels != 1) {
+                    q->subpacket[s].bits_per_subpdiv = 1;
+                    q->subpacket[s].num_channels = 2;
+                }
+                av_log(avctx,AV_LOG_DEBUG,"STEREO\n");
+                break;
+            case JOINT_STEREO:
+                if (q->nb_channels != 2) {
+                    av_log(avctx,AV_LOG_ERROR,"Container channels != 2, report sample!\n");
+                    return -1;
+                }
+                av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n");
+                if (avctx->extradata_size >= 16){
+                    q->subpacket[s].total_subbands = q->subpacket[s].subbands + q->subpacket[s].js_subband_start;
+                    q->subpacket[s].joint_stereo = 1;
+                    q->subpacket[s].num_channels = 2;
+                }
+                if (q->subpacket[s].samples_per_channel > 256) {
+                    q->subpacket[s].log2_numvector_size  = 6;
+                }
+                if (q->subpacket[s].samples_per_channel > 512) {
+                    q->subpacket[s].log2_numvector_size  = 7;
+                }
+                break;
+            case MC_COOK:
+                av_log(avctx,AV_LOG_DEBUG,"MULTI_CHANNEL\n");
+                if(extradata_size >= 4)
+                    channel_mask |= q->subpacket[s].channel_mask = bytestream_get_be32(&edata_ptr);
+
+                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].joint_stereo = 1;
+                    q->subpacket[s].num_channels = 2;
+                    q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame >> 1;
+
+                    if (q->subpacket[s].samples_per_channel > 256) {
+                        q->subpacket[s].log2_numvector_size  = 6;
+                    }
+                    if (q->subpacket[s].samples_per_channel > 512) {
+                        q->subpacket[s].log2_numvector_size  = 7;
+                    }
+                }else
+                    q->subpacket[s].samples_per_channel = q->subpacket[s].samples_per_frame;
+
+                break;
+            default:
+                av_log(avctx,AV_LOG_ERROR,"Unknown Cook version, report sample!\n");
                 return -1;
-            }
-            av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n");
-            if (avctx->extradata_size >= 16){
-                q->total_subbands = q->subbands + q->js_subband_start;
-                q->joint_stereo = 1;
-            }
-            if (q->samples_per_channel > 256) {
-                q->log2_numvector_size  = 6;
-            }
-            if (q->samples_per_channel > 512) {
-                q->log2_numvector_size  = 7;
-            }
-            break;
-        case MC_COOK:
-            av_log(avctx,AV_LOG_ERROR,"MC_COOK not supported!\n");
+                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;
-            break;
-        default:
-            av_log(avctx,AV_LOG_ERROR,"Unknown Cook version, report sample!\n");
+        } else
+            q->samples_per_channel = q->subpacket[0].samples_per_channel;
+
+
+        /* Initialize variable relations */
+        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;
-            break;
-    }
+        }
 
-    /* Initialize variable relations */
-    q->numvector_size = (1 << q->log2_numvector_size);
+        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++;
+        if (s > MAX_SUBPACKETS) {
+            av_log(avctx,AV_LOG_ERROR,"Too many subpackets > 5, report file!\n");
+            return -1;
+        }
+    }
     /* Generate tables */
-    init_rootpow2table(q);
-    init_pow2table(q);
+    init_pow2table();
     init_gain_table(q);
+    init_cplscales_table(q);
 
     if (init_cook_vlc_tables(q) != 0)
         return -1;
@@ -1102,47 +1243,38 @@ static int cook_decode_init(AVCodecContext *avctx)
     /* Pad the databuffer with:
        DECODE_BYTES_PAD1 or DECODE_BYTES_PAD2 for decode_bytes(),
        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 =
           av_mallocz(avctx->block_align
                      + DECODE_BYTES_PAD1(avctx->block_align)
                      + FF_INPUT_BUFFER_PADDING_SIZE);
-    }
     if (q->decoded_bytes_buffer == NULL)
         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. */
     if ( init_cook_mlt(q) != 0 )
         return -1;
 
-    /* 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;
+    /* Initialize COOK signal arithmetic handling */
+    if (1) {
+        q->scalar_dequant  = scalar_dequant_float;
+        q->decouple        = decouple_float;
+        q->imlt_window     = imlt_window_float;
+        q->interpolate     = interpolate_float;
+        q->saturate_output = saturate_output_float;
     }
+
+    /* 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)) {
     } else {
         av_log(avctx,AV_LOG_ERROR,"unknown amount of samples_per_channel = %d, report sample!\n",q->samples_per_channel);
         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;
+    if (channel_mask)
+        avctx->channel_layout = channel_mask;
+    else
+        avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
 
 #ifdef COOKDEBUG
     dump_cook_context(q);
@@ -1154,10 +1286,11 @@ static int cook_decode_init(AVCodecContext *avctx)
 AVCodec cook_decoder =
 {
     .name = "cook",
-    .type = CODEC_TYPE_AUDIO,
+    .type = AVMEDIA_TYPE_AUDIO,
     .id = CODEC_ID_COOK,
     .priv_data_size = sizeof(COOKContext),
     .init = cook_decode_init,
     .close = cook_decode_close,
     .decode = cook_decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("COOK"),
 };