* Copyright (c) 2003 Sascha Sommer
* Copyright (c) 2005 Benjamin Larsson
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
*/
/**
- * @file cook.c
- * Cook compatible decoder.
+ * @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.
*
* available.
*/
-#include <math.h>
-#include <stddef.h>
-#include <stdio.h>
-
+#include "libavutil/channel_layout.h"
+#include "libavutil/lfg.h"
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
#include "dsputil.h"
+#include "bytestream.h"
+#include "fft.h"
+#include "internal.h"
+#include "sinewin.h"
#include "cookdata.h"
/* the different Cook versions */
-#define MONO_COOK1 0x1000001
-#define MONO_COOK2 0x1000002
+#define MONO 0x1000001
+#define STEREO 0x1000002
#define JOINT_STEREO 0x1000003
-#define MC_COOK 0x2000000 //multichannel Cook, not supported
+#define MC_COOK 0x2000000 // multichannel Cook, not supported
#define SUBBAND_SIZE 20
-//#define COOKDEBUG
+#define MAX_SUBPACKETS 5
typedef struct {
- int size;
- int qidx_table1[8];
- int qidx_table2[8];
-} COOKgain;
-
-typedef struct __attribute__((__packed__)){
- /* codec data start */
- uint32_t cookversion; //in network order, bigendian
- uint16_t samples_per_frame; //amount of samples per frame per channel, bigendian
- uint16_t subbands; //amount of bands used in the frequency domain, bigendian
- /* Mono extradata ends here. */
- uint32_t unused;
- uint16_t js_subband_start; //bigendian
- uint16_t js_vlc_bits; //bigendian
- /* Stereo extradata ends here. */
-} COOKextradata;
-
+ int *now;
+ int *previous;
+} 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 samples_per_frame;
+ int ch_idx;
+ int size;
+ int num_channels;
+ int cookversion;
int subbands;
- int log2_numvector_size;
- int numvector_size; //1 << log2_numvector_size;
int js_subband_start;
+ int js_vlc_bits;
+ int samples_per_channel;
+ int log2_numvector_size;
+ unsigned int channel_mask;
+ VLC 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];
+
+ 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, float *out);
+
+ AVCodecContext* avctx;
+ DSPContext dsp;
+ AVFrame frame;
+ GetBitContext gb;
+ /* stream data */
int num_vectors;
- int bits_per_subpacket;
+ int samples_per_channel;
/* states */
- int random_state;
+ AVLFG random_state;
+ int discarded_packets;
/* transform data */
- FFTContext fft_ctx;
- FFTSample mlt_tmp[1024] __attribute__((aligned(16))); /* temporary storage for imlt */
+ FFTContext mdct_ctx;
float* mlt_window;
- float* mlt_precos;
- float* mlt_presin;
- float* mlt_postcos;
- int fft_size;
- int fft_order;
- int mlt_size; //modulated lapped transform size
-
- /* gain buffers */
- COOKgain* gain_now_ptr;
- COOKgain* gain_previous_ptr;
- COOKgain gain_current;
- COOKgain gain_now;
- COOKgain gain_previous;
- COOKgain gain_channel1[2];
- COOKgain gain_channel2[2];
/* VLC data */
- int js_vlc_bits;
VLC envelope_quant_index[13];
- VLC sqvh[7]; //scalar quantization
- VLC ccpl; //channel coupling
+ VLC sqvh[7]; // scalar quantization
/* 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;
- float mono_mdct_output[2048] __attribute__((aligned(16)));
- float* previous_buffer_ptr[2];
- float mono_previous_buffer1[1024];
- float mono_previous_buffer2[1024];
- float* decode_buf_ptr[4];
- float* decode_buf_ptr2[2];
+ DECLARE_ALIGNED(32, float, mono_mdct_output)[2048];
float decode_buffer_1[1024];
float decode_buffer_2[1024];
- float decode_buffer_3[1024];
- float decode_buffer_4[1024];
-} COOKContext;
-
-/* debug functions */
-
-#ifdef COOKDEBUG
-static void dump_float_table(float* table, int size, int delimiter) {
- int i=0;
- av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i);
- for (i=0 ; i<size ; i++) {
- av_log(NULL, AV_LOG_ERROR, "%5.1f, ", table[i]);
- if ((i+1)%delimiter == 0) av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i+1);
- }
-}
-
-static void dump_int_table(int* table, int size, int delimiter) {
- int i=0;
- av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i);
- for (i=0 ; i<size ; i++) {
- av_log(NULL, AV_LOG_ERROR, "%d, ", table[i]);
- if ((i+1)%delimiter == 0) av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i+1);
- }
-}
+ float decode_buffer_0[1060]; /* static allocation for joint decode */
-static void dump_short_table(short* table, int size, int delimiter) {
- int i=0;
- av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i);
- for (i=0 ; i<size ; i++) {
- av_log(NULL, AV_LOG_ERROR, "%d, ", table[i]);
- if ((i+1)%delimiter == 0) av_log(NULL,AV_LOG_ERROR,"\n[%d]: ",i+1);
- }
-}
+ const float *cplscales[5];
+ int num_subpackets;
+ COOKSubpacket subpacket[MAX_SUBPACKETS];
+} COOKContext;
-#endif
+static float pow2tab[127];
+static float rootpow2tab[127];
/*************** init functions ***************/
/* table generator */
-static void init_pow2table(COOKContext *q){
- 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);
- }
-}
-
-/* table generator */
-static void init_rootpow2table(COOKContext *q){
+static av_cold void init_pow2table(void)
+{
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));
+ for (i = -63; i < 64; i++) {
+ pow2tab[63 + i] = pow(2, i);
+ rootpow2tab[63 + i] = sqrt(pow(2, 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] ,
- (1.0/(double)q->gain_size_factor));
- }
+ q->gain_size_factor = q->samples_per_channel / 8;
+ for (i = 0; i < 23; i++)
+ 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;
- for (i=0 ; i<13 ; i++) {
- result &= init_vlc (&q->envelope_quant_index[i], 9, 24,
- envelope_quant_index_huffbits[i], 1, 1,
- envelope_quant_index_huffcodes[i], 2, 2, 0);
+ for (i = 0; i < 13; i++) {
+ result |= init_vlc(&q->envelope_quant_index[i], 9, 24,
+ 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");
- 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);
+ 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].channel_coupling, 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) {
- int j;
- float alpha;
+static av_cold int init_cook_mlt(COOKContext *q)
+{
+ int j, ret;
+ int mlt_size = q->samples_per_channel;
- /* Allocate the buffers, could be replaced with a static [512]
- array if needed. */
- q->mlt_size = q->samples_per_channel;
- q->mlt_window = av_malloc(sizeof(float)*q->mlt_size);
- q->mlt_precos = av_malloc(sizeof(float)*q->mlt_size/2);
- q->mlt_presin = av_malloc(sizeof(float)*q->mlt_size/2);
- q->mlt_postcos = av_malloc(sizeof(float)*q->mlt_size/2);
+ if ((q->mlt_window = av_malloc(mlt_size * sizeof(*q->mlt_window))) == 0)
+ return AVERROR(ENOMEM);
/* Initialize the MLT window: simple sine window. */
- alpha = M_PI / (2.0 * (float)q->mlt_size);
- for(j=0 ; j<q->mlt_size ; j++) {
- q->mlt_window[j] = sin((j + 512.0/(float)q->mlt_size) * alpha);
+ ff_sine_window_init(q->mlt_window, mlt_size);
+ for (j = 0; j < mlt_size; j++)
+ q->mlt_window[j] *= sqrt(2.0 / q->samples_per_channel);
+
+ /* Initialize the MDCT. */
+ if ((ret = ff_mdct_init(&q->mdct_ctx, av_log2(mlt_size) + 1, 1, 1.0 / 32768.0))) {
+ av_free(q->mlt_window);
+ return ret;
}
+ av_log(q->avctx, AV_LOG_DEBUG, "MDCT initialized, order = %d.\n",
+ av_log2(mlt_size) + 1);
- /* pre/post twiddle factors */
- for (j=0 ; j<q->mlt_size/2 ; j++){
- q->mlt_precos[j] = cos( ((j+0.25)*M_PI)/q->mlt_size);
- q->mlt_presin[j] = sin( ((j+0.25)*M_PI)/q->mlt_size);
- q->mlt_postcos[j] = (float)sqrt(2.0/(float)q->mlt_size)*cos( ((float)j*M_PI) /q->mlt_size); //sqrt(2/MLT_size) = scalefactor
- }
-
- /* Initialize the FFT. */
- ff_fft_init(&q->fft_ctx, av_log2(q->mlt_size)-1, 0);
- av_log(NULL,AV_LOG_DEBUG,"FFT initialized, order = %d.\n",
- av_log2(q->samples_per_channel)-1);
+ return 0;
+}
- return (int)(q->mlt_window && q->mlt_precos && q->mlt_presin && q->mlt_postcos);
+static av_cold void init_cplscales_table(COOKContext *q)
+{
+ int i;
+ for (i = 0; i < 5; i++)
+ q->cplscales[i] = cplscales[i];
}
/*************** 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
* @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)
+{
+ static const uint32_t tab[4] = {
+ AV_BE2NE32C(0x37c511f2u), AV_BE2NE32C(0xf237c511u),
+ AV_BE2NE32C(0x11f237c5u), AV_BE2NE32C(0xc511f237u),
+ };
int i, off;
uint32_t c;
- uint32_t* buf;
- uint32_t* obuf = (uint32_t*) out;
+ 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]);
+ * for (i = 0; i < bitamount / 64; i++)
+ * (int64_t) out[i] = 0x37c511f237c511f2 ^ av_be2ne64(int64_t) in[i]);
* Buffer alignment needs to be checked. */
- off = (uint32_t)inbuffer % 4;
- 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 = tab[off];
bytes += 3 + off;
- for (i = 0; i < bytes/4; i++)
+ for (i = 0; i < bytes / 4; i++)
obuf[i] = c ^ buf[i];
return off;
}
-/**
- * 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;
- av_log(avctx,AV_LOG_DEBUG, "Deallocating memory.\n");
+ av_log(avctx, AV_LOG_DEBUG, "Deallocating memory.\n");
/* Free allocated memory buffers. */
av_free(q->mlt_window);
- av_free(q->mlt_precos);
- av_free(q->mlt_presin);
- av_free(q->mlt_postcos);
av_free(q->decoded_bytes_buffer);
/* Free the transform. */
- ff_fft_end(&q->fft_ctx);
+ ff_mdct_end(&q->mdct_ctx);
/* Free the VLC tables. */
- for (i=0 ; i<13 ; i++) {
- free_vlc(&q->envelope_quant_index[i]);
- }
- 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 < 13; i++)
+ ff_free_vlc(&q->envelope_quant_index[i]);
+ for (i = 0; i < 7; i++)
+ ff_free_vlc(&q->sqvh[i]);
+ for (i = 0; i < q->num_subpackets; i++)
+ ff_free_vlc(&q->subpacket[i].channel_coupling);
- av_log(NULL,AV_LOG_DEBUG,"Memory deallocated.\n");
+ av_log(avctx, AV_LOG_DEBUG, "Memory deallocated.\n");
return 0;
}
/**
- * Fill the COOKgain structure for the timedomain quantization.
+ * Fill the gain array for the timedomain quantization.
*
- * @param q pointer to the COOKContext
- * @param gaininfo pointer to the COOKgain
+ * @param gb pointer to the GetBitContext
+ * @param gaininfo array[9] of gain indexes
*/
+static void decode_gain_info(GetBitContext *gb, int *gaininfo)
+{
+ int i, n;
-static void decode_gain_info(GetBitContext *gb, COOKgain* gaininfo) {
- int i;
-
- while (get_bits1(gb)) {}
+ while (get_bits1(gb)) {
+ /* NOTHING */
+ }
- gaininfo->size = get_bits_count(gb) - 1; //amount of elements*2 to update
+ n = get_bits_count(gb) - 1; // amount of elements*2 to update
- if (get_bits_count(gb) - 1 <= 0) return;
+ i = 0;
+ while (n--) {
+ int index = get_bits(gb, 3);
+ int gain = get_bits1(gb) ? get_bits(gb, 4) - 7 : -1;
- for (i=0 ; i<gaininfo->size ; i++){
- gaininfo->qidx_table1[i] = get_bits(gb,3);
- if (get_bits1(gb)) {
- gaininfo->qidx_table2[i] = get_bits(gb,4) - 7; //convert to signed
- } else {
- gaininfo->qidx_table2[i] = -1;
- }
+ while (i <= index)
+ gaininfo[i++] = gain;
}
+ while (i <= 8)
+ gaininfo[i++] = 0;
}
/**
* @param q pointer to the COOKContext
* @param quant_index_table pointer to the array
*/
+static int decode_envelope(COOKContext *q, COOKSubpacket *p,
+ int *quant_index_table)
+{
+ int i, j, vlc_index;
-static void decode_envelope(COOKContext *q, int* quant_index_table) {
- int i,j, vlc_index;
- int bitbias;
-
- bitbias = get_bits_count(&q->gb);
- 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++){
- vlc_index=i;
- if (i >= q->js_subband_start * 2) {
- vlc_index-=q->js_subband_start;
+ for (i = 1; i < p->total_subbands; i++) {
+ vlc_index = i;
+ if (i >= p->js_subband_start * 2) {
+ vlc_index -= p->js_subband_start;
} else {
- vlc_index/=2;
- if(vlc_index < 1) vlc_index = 1;
+ vlc_index /= 2;
+ if (vlc_index < 1)
+ vlc_index = 1;
+ }
+ 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,
+ q->envelope_quant_index[vlc_index - 1].bits, 2);
+ quant_index_table[i] = quant_index_table[i - 1] + j - 12; // differential encoding
+ if (quant_index_table[i] > 63 || quant_index_table[i] < -63) {
+ av_log(q->avctx, AV_LOG_ERROR,
+ "Invalid quantizer %d at position %d, outside [-63, 63] range\n",
+ quant_index_table[i], i);
+ return AVERROR_INVALIDDATA;
}
- 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,
- q->envelope_quant_index[vlc_index-1].bits,2);
- quant_index_table[i] = quant_index_table[i-1] + j - 12; //differential encoding
}
-}
-
-/**
- * Create the quant value table.
- *
- * @param q pointer to the COOKContext
- * @param quant_value_table pointer to the array
- */
-static void inline dequant_envelope(COOKContext *q, int* quant_index_table,
- float* quant_value_table){
-
- int i;
- for(i=0 ; i < q->total_subbands ; i++){
- quant_value_table[i] = q->rootpow2tab[quant_index_table[i]+63];
- }
+ return 0;
}
/**
* @param category pointer to the category array
* @param category_index pointer to the category_index array
*/
+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] = { 0 };
+ int exp_index1[102] = { 0 };
-static void categorize(COOKContext *q, int* quant_index_table,
- int* category, int* category_index){
- int exp_idx, bias, tmpbias, bits_left, num_bits, index, v, i, j;
- int exp_index2[102];
- int exp_index1[102];
-
- int tmp_categorize_array1[128];
- int tmp_categorize_array1_idx=0;
- int tmp_categorize_array2[128];
- int tmp_categorize_array2_idx=0;
- int category_index_size=0;
+ int tmp_categorize_array[128 * 2] = { 0 };
+ 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) {
+ 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);
- }
+ ((bits_left - q->samples_per_channel) * 5) / 8;
- memset(&exp_index1,0,102*sizeof(int));
- memset(&exp_index2,0,102*sizeof(int));
- memset(&tmp_categorize_array1,0,128*sizeof(int));
- memset(&tmp_categorize_array2,0,128*sizeof(int));
-
- bias=-32;
+ bias = -32;
/* Estimate bias. */
- for (i=32 ; i>0 ; i=i/2){
+ for (i = 32; i > 0; i = i / 2) {
num_bits = 0;
- index = 0;
- for (j=q->total_subbands ; j>0 ; j--){
- exp_idx = (i - quant_index_table[index] + bias) / 2;
- if (exp_idx<0){
- exp_idx=0;
- } else if(exp_idx >7) {
- exp_idx=7;
- }
+ index = 0;
+ 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];
- }
- if(num_bits >= bits_left - 32){
- bias+=i;
+ num_bits += expbits_tab[exp_idx];
}
+ if (num_bits >= bits_left - 32)
+ bias += i;
}
/* Calculate total number of bits. */
- num_bits=0;
- for (i=0 ; i<q->total_subbands ; i++) {
- exp_idx = (bias - quant_index_table[i]) / 2;
- if (exp_idx<0) {
- exp_idx=0;
- } else if(exp_idx >7) {
- exp_idx=7;
- }
+ num_bits = 0;
+ 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;
exp_index2[i] = exp_idx;
}
- tmpbias = bias = num_bits;
+ tmpbias1 = tmpbias2 = num_bits;
- for (j = 1 ; j < q->numvector_size ; j++) {
- if (tmpbias + bias > 2*bits_left) { /* ---> */
+ 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++){
+ index = -1;
+ for (i = 0; i < p->total_subbands; i++) {
if (exp_index1[i] < 7) {
- v = (-2*exp_index1[i]) - quant_index_table[i] - 32;
- if ( v >= max) {
- max = v;
+ v = (-2 * exp_index1[i]) - quant_index_table[i] + bias;
+ if (v >= max) {
+ max = v;
index = i;
}
}
}
- if(index==-1)break;
- tmp_categorize_array1[tmp_categorize_array1_idx++] = index;
- tmpbias -= expbits_tab[exp_index1[index]] -
- expbits_tab[exp_index1[index]+1];
+ if (index == -1)
+ break;
+ tmp_categorize_array[tmp_categorize_array1_idx++] = index;
+ tmpbias1 -= expbits_tab[exp_index1[index]] -
+ expbits_tab[exp_index1[index] + 1];
++exp_index1[index];
} else { /* <--- */
int min = 999999;
- index=-1;
- for (i=0 ; i<q->total_subbands ; i++){
- if(exp_index2[i] > 0){
- v = (-2*exp_index2[i])-quant_index_table[i];
- if ( v < min) {
- min = v;
+ index = -1;
+ 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) {
+ min = v;
index = i;
}
}
}
- if(index == -1)break;
- tmp_categorize_array2[tmp_categorize_array2_idx++] = index;
- tmpbias -= expbits_tab[exp_index2[index]] -
- expbits_tab[exp_index2[index]-1];
+ if (index == -1)
+ break;
+ tmp_categorize_array[--tmp_categorize_array2_idx] = index;
+ tmpbias2 -= expbits_tab[exp_index2[index]] -
+ expbits_tab[exp_index2[index] - 1];
--exp_index2[index];
}
}
- for(i=0 ; i<q->total_subbands ; i++)
+ for (i = 0; i < p->total_subbands; i++)
category[i] = exp_index2[i];
- /* Concatenate the two arrays. */
- for(i=tmp_categorize_array2_idx-1 ; i >= 0; i--)
- category_index[category_index_size++] = tmp_categorize_array2[i];
-
- for(i=0;i<tmp_categorize_array1_idx;i++)
- category_index[category_index_size++ ] = tmp_categorize_array1[i];
-
- /* FIXME: mc_sich_ra8_20.rm triggers this, not sure with what we
- should fill the remaining bytes. */
- for(i=category_index_size;i<q->numvector_size;i++)
- category_index[i]=0;
-
+ for (i = 0; i < p->numvector_size - 1; i++)
+ category_index[i] = tmp_categorize_array[tmp_categorize_array2_idx++];
}
* @param category pointer to the category array
* @param category_index pointer to the category_index array
*/
-
-static void inline expand_category(COOKContext *q, int* category,
- int* category_index){
+static inline void expand_category(COOKContext *q, int *category,
+ int *category_index)
+{
int i;
- for(i=0 ; i<q->num_vectors ; i++){
- ++category[category_index[i]];
+ for (i = 0; i < q->num_vectors; i++)
+ {
+ int idx = category_index[i];
+ if (++category[idx] >= FF_ARRAY_ELEMS(dither_tab))
+ --category[idx];
}
}
*
* @param q pointer to the COOKContext
* @param index index
- * @param band current subband
- * @param quant_value_table pointer to the array
+ * @param quant_index quantisation index
* @param subband_coef_index array of indexes to quant_centroid_tab
- * @param subband_coef_noise use random noise instead of predetermined value
- * @param mlt_buffer pointer to the mlt buffer
+ * @param subband_coef_sign signs of coefficients
+ * @param mlt_p pointer into the mlt buffer
*/
-
-
-static void scalar_dequant(COOKContext *q, int index, int band,
- float* quant_value_table, int* subband_coef_index,
- int* subband_coef_noise, float* mlt_buffer){
+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;
float f1;
- for(i=0 ; i<SUBBAND_SIZE ; i++) {
+ for (i = 0; i < SUBBAND_SIZE; i++) {
if (subband_coef_index[i]) {
- if (subband_coef_noise[i]) {
- f1 = -quant_centroid_tab[index][subband_coef_index[i]];
- } else {
- 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;
} else {
- /* noise coding if subband_coef_noise[i] == 0 */
- q->random_state = q->random_state * 214013 + 2531011; //typical RNG numbers
- f1 = randsign[(q->random_state/0x1000000)&1] * dither_tab[index]; //>>31
+ /* noise coding if subband_coef_index[i] == 0 */
+ f1 = dither_tab[index];
+ if (av_lfg_get(&q->random_state) < 0x80000000)
+ f1 = -f1;
}
- mlt_buffer[band*20+ i] = f1 * quant_value_table[band];
+ mlt_p[i] = f1 * rootpow2tab[quant_index + 63];
}
}
/**
- * Unpack the subband_coef_index and subband_coef_noise vectors.
+ * Unpack the subband_coef_index and subband_coef_sign vectors.
*
* @param q pointer to the COOKContext
* @param category pointer to the category array
* @param subband_coef_index array of indexes to quant_centroid_tab
- * @param subband_coef_noise use random noise instead of predetermined value
+ * @param subband_coef_sign signs of coefficients
*/
-
-static int unpack_SQVH(COOKContext *q, int category, int* subband_coef_index,
- int* subband_coef_noise) {
- int i,j;
- int vlc, vd ,tmp, result;
- int ub;
- int cb;
+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;
vd = vd_tab[category];
result = 0;
- for(i=0 ; i<vpr_tab[category] ; i++){
- ub = get_bits_count(&q->gb);
+ for (i = 0; i < vpr_tab[category]; i++) {
vlc = get_vlc2(&q->gb, q->sqvh[category].table, q->sqvh[category].bits, 3);
- cb = get_bits_count(&q->gb);
- if (q->bits_per_subpacket < get_bits_count(&q->gb)){
+ if (p->bits_per_subpacket < get_bits_count(&q->gb)) {
vlc = 0;
result = 1;
}
- for(j=vd-1 ; j>=0 ; j--){
- tmp = (vlc * invradix_tab[category])/0x100000;
- subband_coef_index[vd*i+j] = vlc - tmp * (kmax_tab[category]+1);
+ for (j = vd - 1; j >= 0; j--) {
+ tmp = (vlc * invradix_tab[category]) / 0x100000;
+ subband_coef_index[vd * i + j] = vlc - tmp * (kmax_tab[category] + 1);
vlc = tmp;
}
- for(j=0 ; j<vd ; j++){
- if (subband_coef_index[i*vd + j]) {
- if(get_bits_count(&q->gb) < q->bits_per_subpacket){
- subband_coef_noise[i*vd+j] = get_bits1(&q->gb);
+ for (j = 0; j < vd; j++) {
+ if (subband_coef_index[i * vd + j]) {
+ if (get_bits_count(&q->gb) < p->bits_per_subpacket) {
+ subband_coef_sign[i * vd + j] = get_bits1(&q->gb);
} else {
- result=1;
- subband_coef_noise[i*vd+j]=0;
+ result = 1;
+ subband_coef_sign[i * vd + j] = 0;
}
} else {
- subband_coef_noise[i*vd+j]=0;
+ subband_coef_sign[i * vd + j] = 0;
}
}
}
*
* @param q pointer to the COOKContext
* @param category pointer to the category array
- * @param quant_value_table pointer to the array
+ * @param quant_index_table pointer to the array
* @param mlt_buffer pointer to mlt coefficients
*/
-
-
-static void decode_vectors(COOKContext* q, int* category,
- float* quant_value_table, float* mlt_buffer){
+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. */
- int subband_coef_noise[SUBBAND_SIZE];
+ int subband_coef_index[SUBBAND_SIZE];
/* A zero in this table means that the subband coefficient is a
positive multiplicator. */
- int subband_coef_index[SUBBAND_SIZE];
+ int subband_coef_sign[SUBBAND_SIZE];
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];
- if(category[band] < 7){
- if(unpack_SQVH(q, category[band], subband_coef_index, subband_coef_noise)){
- index=7;
- for(j=0 ; j<q->total_subbands ; j++) category[band+j]=7;
+ if (category[band] < 7) {
+ if (unpack_SQVH(q, p, category[band], subband_coef_index, subband_coef_sign)) {
+ index = 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_noise, 0, sizeof(subband_coef_noise));
+ memset(subband_coef_sign, 0, sizeof(subband_coef_sign));
}
- scalar_dequant(q, index, band, quant_value_table, subband_coef_index,
- subband_coef_noise, mlt_buffer);
+ 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){
+ /* FIXME: should this be removed, or moved into loop above? */
+ if (p->total_subbands * SUBBAND_SIZE >= q->samples_per_channel)
return;
- }
}
-/**
- * function for decoding mono data
- *
- * @param q pointer to the COOKContext
- * @param mlt_buffer1 pointer to left channel mlt coefficients
- * @param mlt_buffer2 pointer to right channel mlt coefficients
- */
-
-static void mono_decode(COOKContext *q, float* mlt_buffer) {
-
- int category_index[128];
- float quant_value_table[102];
+static int mono_decode(COOKContext *q, COOKSubpacket *p, float *mlt_buffer)
+{
+ int category_index[128] = { 0 };
+ int category[128] = { 0 };
int quant_index_table[102];
- int category[128];
+ int res;
- memset(&category, 0, 128*sizeof(int));
- memset(&quant_value_table, 0, 102*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);
- dequant_envelope(q, quant_index_table, quant_value_table);
- categorize(q, quant_index_table, category, category_index);
+ if ((res = decode_envelope(q, p, quant_index_table)) < 0)
+ return res;
+ 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_value_table, mlt_buffer);
-}
+ decode_vectors(q, p, category, quant_index_table, mlt_buffer);
-
-/**
- * The modulated lapped transform, this takes transform coefficients
- * and transforms them into timedomain samples. This is done through
- * an FFT-based algorithm with pre- and postrotation steps.
- * A window and reorder step is also included.
- *
- * @param q pointer to the COOKContext
- * @param inbuffer pointer to the mltcoefficients
- * @param outbuffer pointer to the timedomain buffer
- * @param mlt_tmp pointer to temporary storage space
- */
-
-static void cook_imlt(COOKContext *q, float* inbuffer, float* outbuffer,
- float* mlt_tmp){
- int i;
-
- /* prerotation */
- for(i=0 ; i<q->mlt_size ; i+=2){
- outbuffer[i] = (q->mlt_presin[i/2] * inbuffer[q->mlt_size-1-i]) +
- (q->mlt_precos[i/2] * inbuffer[i]);
- outbuffer[i+1] = (q->mlt_precos[i/2] * inbuffer[q->mlt_size-1-i]) -
- (q->mlt_presin[i/2] * inbuffer[i]);
- }
-
- /* FFT */
- ff_fft_permute(&q->fft_ctx, (FFTComplex *) outbuffer);
- ff_fft_calc (&q->fft_ctx, (FFTComplex *) outbuffer);
-
- /* postrotation */
- for(i=0 ; i<q->mlt_size ; i+=2){
- mlt_tmp[i] = (q->mlt_postcos[(q->mlt_size-1-i)/2] * outbuffer[i+1]) +
- (q->mlt_postcos[i/2] * outbuffer[i]);
- mlt_tmp[q->mlt_size-1-i] = (q->mlt_postcos[(q->mlt_size-1-i)/2] * outbuffer[i]) -
- (q->mlt_postcos[i/2] * outbuffer[i+1]);
- }
-
- /* window and reorder */
- for(i=0 ; i<q->mlt_size/2 ; i++){
- outbuffer[i] = mlt_tmp[q->mlt_size/2-1-i] * q->mlt_window[i];
- outbuffer[q->mlt_size-1-i]= mlt_tmp[q->mlt_size/2-1-i] *
- q->mlt_window[q->mlt_size-1-i];
- outbuffer[q->mlt_size+i]= mlt_tmp[q->mlt_size/2+i] *
- q->mlt_window[q->mlt_size-1-i];
- outbuffer[2*q->mlt_size-1-i]= -(mlt_tmp[q->mlt_size/2+i] *
- q->mlt_window[i]);
- }
+ return 0;
}
* @param gain_index index for the block multiplier
* @param gain_index_next index for the next block multiplier
*/
-
-static void interpolate(COOKContext *q, float* buffer,
- int gain_index, int gain_index_next){
+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];
-
- if(gain_index == gain_index_next){ //static gain
- for(i=0 ; i<q->gain_size_factor ; i++){
- buffer[i]*=fc1;
- }
- return;
- } else { //smooth gain
- fc2 = q->gain_table[11 + (gain_index_next-gain_index)];
- for(i=0 ; i<q->gain_size_factor ; i++){
- buffer[i]*=fc1;
- fc1*=fc2;
+ fc1 = pow2tab[gain_index + 63];
+
+ if (gain_index == gain_index_next) { // static gain
+ for (i = 0; i < q->gain_size_factor; i++)
+ buffer[i] *= fc1;
+ } else { // smooth gain
+ fc2 = q->gain_table[11 + (gain_index_next - gain_index)];
+ for (i = 0; i < q->gain_size_factor; i++) {
+ buffer[i] *= fc1;
+ fc1 *= fc2;
}
- return;
}
}
/**
- * timedomain requantization of the timedomain samples
+ * Apply transform window, overlap buffers.
*
* @param q pointer to the COOKContext
- * @param buffer pointer to the timedomain buffer
- * @param gain_now current gain structure
- * @param gain_previous previous gain structure
+ * @param inbuffer pointer to the mltcoefficients
+ * @param gains_ptr current and previous gains
+ * @param previous_buffer pointer to the previous buffer to be used for overlapping
*/
-
-static void gain_window(COOKContext *q, float* buffer, COOKgain* gain_now,
- COOKgain* gain_previous){
- int i, index;
- int gain_index[9];
- int tmp_gain_index;
-
- gain_index[8]=0;
- index = gain_previous->size;
- for (i=7 ; i>=0 ; i--) {
- if(index && gain_previous->qidx_table1[index-1]==i) {
- gain_index[i] = gain_previous->qidx_table2[index-1];
- index--;
- } else {
- gain_index[i]=gain_index[i+1];
- }
- }
- /* This is applied to the to be previous data buffer. */
- for(i=0;i<8;i++){
- interpolate(q, &buffer[q->samples_per_channel+q->gain_size_factor*i],
- gain_index[i], gain_index[i+1]);
- }
-
- tmp_gain_index = gain_index[0];
- index = gain_now->size;
- for (i=7 ; i>=0 ; i--) {
- if(index && gain_now->qidx_table1[index-1]==i) {
- gain_index[i]= gain_now->qidx_table2[index-1];
- index--;
- } else {
- gain_index[i]=gain_index[i+1];
- }
- }
-
- /* This is applied to the to be current block. */
- for(i=0;i<8;i++){
- interpolate(q, &buffer[i*q->gain_size_factor],
- tmp_gain_index+gain_index[i],
- tmp_gain_index+gain_index[i+1]);
- }
+static void imlt_window_float(COOKContext *q, float *inbuffer,
+ cook_gains *gains_ptr, float *previous_buffer)
+{
+ 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
+ * next frame, has the wrong sign. Hence the subtraction below.
+ * Almost sounds like a complex conjugate/reverse data/FFT effect.
+ */
+
+ /* Apply window and overlap */
+ for (i = 0; i < q->samples_per_channel; i++)
+ inbuffer[i] = inbuffer[i] * fc * q->mlt_window[i] -
+ previous_buffer[i] * q->mlt_window[q->samples_per_channel - 1 - i];
}
-
/**
- * mlt overlapping and buffer management
+ * The modulated lapped transform, this takes transform coefficients
+ * and transforms them into timedomain samples.
+ * Apply transform window, overlap buffers, apply gain profile
+ * and buffer management.
*
* @param q pointer to the COOKContext
- * @param buffer pointer to the timedomain buffer
- * @param gain_now current gain structure
- * @param gain_previous previous gain structure
+ * @param inbuffer pointer to the mltcoefficients
+ * @param gains_ptr current and previous gains
* @param previous_buffer pointer to the previous buffer to be used for overlapping
- *
*/
-
-static void gain_compensate(COOKContext *q, float* buffer, COOKgain* gain_now,
- COOKgain* gain_previous, float* previous_buffer) {
+static void imlt_gain(COOKContext *q, float *inbuffer,
+ cook_gains *gains_ptr, float *previous_buffer)
+{
+ float *buffer0 = q->mono_mdct_output;
+ float *buffer1 = q->mono_mdct_output + q->samples_per_channel;
int i;
- if((gain_now->size || gain_previous->size)) {
- gain_window(q, buffer, gain_now, gain_previous);
- }
- /* Overlap with the previous block. */
- for(i=0 ; i<q->samples_per_channel ; i++) buffer[i]+=previous_buffer[i];
+ /* Inverse modified discrete cosine transform */
+ q->mdct_ctx.imdct_calc(&q->mdct_ctx, q->mono_mdct_output, inbuffer);
+
+ 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])
+ 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. */
- memcpy(previous_buffer, buffer+q->samples_per_channel,
- sizeof(float)*q->samples_per_channel);
+ memcpy(previous_buffer, buffer0,
+ q->samples_per_channel * sizeof(*previous_buffer));
}
*
* @param q pointer to the COOKContext
* @param decouple_tab decoupling array
- *
*/
+static void decouple_info(COOKContext *q, COOKSubpacket *p, int *decouple_tab)
+{
+ int i;
+ int vlc = get_bits1(&q->gb);
+ int start = cplband[p->js_subband_start];
+ int end = cplband[p->subbands - 1];
+ int length = end - start + 1;
-static void decouple_info(COOKContext *q, int* decouple_tab){
- int length, i;
-
- if(get_bits1(&q->gb)) {
- if(cplband[q->js_subband_start] > cplband[q->subbands-1]) return;
-
- length = cplband[q->subbands-1] - cplband[q->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);
- }
+ if (start > end)
return;
- }
- if(cplband[q->js_subband_start] > cplband[q->subbands-1]) return;
+ if (vlc)
+ for (i = 0; i < length; i++)
+ decouple_tab[start + i] = get_vlc2(&q->gb,
+ p->channel_coupling.table,
+ p->channel_coupling.bits, 2);
+ else
+ for (i = 0; i < length; i++)
+ decouple_tab[start + i] = get_bits(&q->gb, p->js_vlc_bits);
+}
- length = cplband[q->subbands-1] - cplband[q->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);
+/*
+ * function decouples a pair of signals from a single signal via multiplication.
+ *
+ * @param q pointer to the COOKContext
+ * @param subband index of the current subband
+ * @param f1 multiplier for channel 1 extraction
+ * @param f2 multiplier for channel 2 extraction
+ * @param decode_buffer input buffer
+ * @param mlt_buffer1 pointer to left channel mlt coefficients
+ * @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,
+ float *mlt_buffer1, float *mlt_buffer2)
+{
+ int j, tmp_idx;
+ for (j = 0; j < 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];
}
- return;
}
-
/**
* function for decoding joint stereo data
*
* @param mlt_buffer1 pointer to left channel mlt coefficients
* @param mlt_buffer2 pointer to right channel mlt coefficients
*/
+static int joint_decode(COOKContext *q, COOKSubpacket *p,
+ float *mlt_buffer_left, float *mlt_buffer_right)
+{
+ int i, j, res;
+ int decouple_tab[SUBBAND_SIZE] = { 0 };
+ float *decode_buffer = q->decode_buffer_0;
+ int idx, cpl_tmp;
+ float f1, f2;
+ const float *cplscale;
-static void joint_decode(COOKContext *q, float* mlt_buffer1,
- float* mlt_buffer2) {
- int i,j;
- int decouple_tab[SUBBAND_SIZE];
- float decode_buffer[1060];
- int idx, cpl_tmp,tmp_idx;
- float f1,f2;
- float* cplscale;
-
- memset(decouple_tab, 0, sizeof(decouple_tab));
- memset(decode_buffer, 0, sizeof(decode_buffer));
+ memset(decode_buffer, 0, sizeof(q->decode_buffer_0));
/* 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);
+ memset(mlt_buffer_left, 0, 1024 * sizeof(*mlt_buffer_left));
+ memset(mlt_buffer_right, 0, 1024 * sizeof(*mlt_buffer_right));
+ decouple_info(q, p, decouple_tab);
+ if ((res = mono_decode(q, p, decode_buffer)) < 0)
+ return res;
/* The two channels are stored interleaved in decode_buffer. */
- for (i=0 ; i<q->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];
+ for (i = 0; i < p->js_subband_start; i++) {
+ for (j = 0; j < SUBBAND_SIZE; j++) {
+ mlt_buffer_left[i * 20 + j] = decode_buffer[i * 40 + j];
+ mlt_buffer_right[i * 20 + j] = decode_buffer[i * 40 + 20 + j];
}
}
/* 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
- f1 = cplscale[decouple_tab[cpl_tmp]];
- f2 = cplscale[idx-1];
- for (j=0 ; j<SUBBAND_SIZE ; j++) {
- tmp_idx = ((q->js_subband_start + i)*20)+j;
- mlt_buffer1[20*i + j] = f1 * decode_buffer[tmp_idx];
- mlt_buffer2[20*i + j] = f2 * decode_buffer[tmp_idx];
- }
- idx = (1 << q->js_vlc_bits) - 1;
+ idx -= decouple_tab[cpl_tmp];
+ cplscale = q->cplscales[p->js_vlc_bits - 2]; // choose decoupler table
+ f1 = cplscale[decouple_tab[cpl_tmp] + 1];
+ f2 = cplscale[idx];
+ q->decouple(q, p, i, f1, f2, decode_buffer,
+ mlt_buffer_left, mlt_buffer_right);
+ idx = (1 << p->js_vlc_bits) - 1;
}
+
+ return 0;
}
/**
*
* @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, COOKgain *gain_ptr)
+static inline void 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);
- decode_gain_info(&q->gb, gain_ptr);
+ p->bits_per_subpacket);
+ decode_gain_info(&q->gb, gains_ptr->now);
+
+ /* Swap current and previous gains */
+ FFSWAP(int *, gains_ptr->now, gains_ptr->previous);
+}
+
+/**
+ * Saturate the output signal and interleave.
+ *
+ * @param q pointer to the COOKContext
+ * @param out pointer to the output vector
+ */
+static void saturate_output_float(COOKContext *q, float *out)
+{
+ q->dsp.vector_clipf(out, q->mono_mdct_output + q->samples_per_channel,
+ -1.0f, 1.0f, FFALIGN(q->samples_per_channel, 8));
+}
+
+
+/**
+ * Final part of subpacket decoding:
+ * Apply modulated lapped transform, gain compensation,
+ * clip and convert to integer.
+ *
+ * @param q pointer to the COOKContext
+ * @param decode_buffer pointer to the mlt coefficients
+ * @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
+ */
+static inline void mlt_compensate_output(COOKContext *q, float *decode_buffer,
+ cook_gains *gains_ptr, float *previous_buffer,
+ float *out)
+{
+ imlt_gain(q, decode_buffer, gains_ptr, previous_buffer);
+ if (out)
+ q->saturate_output(q, out);
}
*
* @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, COOKSubpacket *p,
+ const uint8_t *inbuffer, float **outbuffer)
+{
+ int sub_packet_size = p->size;
+ int res;
+ memset(q->decode_buffer_1, 0, sizeof(q->decode_buffer_1));
+ decode_bytes_and_gain(q, p, inbuffer, &p->gains1);
-static int decode_subpacket(COOKContext *q, uint8_t *inbuffer,
- int sub_packet_size, int16_t *outbuffer) {
- int i,j;
- int value;
- float* tmp_ptr;
-
- /* packet dump */
-// for (i=0 ; i<sub_packet_size ; i++) {
-// av_log(NULL, AV_LOG_ERROR, "%02x", inbuffer[i]);
-// }
-// av_log(NULL, AV_LOG_ERROR, "\n");
-
- if(q->nb_channels==2 && q->joint_stereo==1){
- decode_bytes_and_gain(q, inbuffer, &q->gain_current);
-
- joint_decode(q, q->decode_buf_ptr[0], q->decode_buf_ptr[2]);
-
- /* Swap buffer pointers. */
- tmp_ptr = q->decode_buf_ptr[1];
- q->decode_buf_ptr[1] = q->decode_buf_ptr[0];
- q->decode_buf_ptr[0] = tmp_ptr;
- tmp_ptr = q->decode_buf_ptr[3];
- q->decode_buf_ptr[3] = q->decode_buf_ptr[2];
- q->decode_buf_ptr[2] = tmp_ptr;
-
- /* FIXME: Rethink the gainbuffer handling, maybe a rename?
- now/previous swap */
- q->gain_now_ptr = &q->gain_now;
- q->gain_previous_ptr = &q->gain_previous;
- for (i=0 ; i<q->nb_channels ; i++){
-
- cook_imlt(q, q->decode_buf_ptr[i*2], q->mono_mdct_output, q->mlt_tmp);
- gain_compensate(q, q->mono_mdct_output, q->gain_now_ptr,
- q->gain_previous_ptr, q->previous_buffer_ptr[0]);
-
- /* Swap out the previous buffer. */
- tmp_ptr = q->previous_buffer_ptr[0];
- q->previous_buffer_ptr[0] = q->previous_buffer_ptr[1];
- q->previous_buffer_ptr[1] = tmp_ptr;
-
- /* Clip and convert the floats to 16 bits. */
- for (j=0 ; j<q->samples_per_frame ; j++){
- value = lrintf(q->mono_mdct_output[j]);
- if(value < -32768) value = -32768;
- else if(value > 32767) value = 32767;
- outbuffer[2*j+i] = value;
- }
- }
-
- memcpy(&q->gain_now, &q->gain_previous, sizeof(COOKgain));
- memcpy(&q->gain_previous, &q->gain_current, sizeof(COOKgain));
-
- } else if (q->nb_channels==2 && q->joint_stereo==0) {
- /* channel 0 */
- decode_bytes_and_gain(q, inbuffer, &q->gain_current);
-
- mono_decode(q, q->decode_buf_ptr2[0]);
-
- tmp_ptr = q->decode_buf_ptr2[0];
- q->decode_buf_ptr2[0] = q->decode_buf_ptr2[1];
- q->decode_buf_ptr2[1] = tmp_ptr;
-
- memcpy(&q->gain_channel1[0], &q->gain_current ,sizeof(COOKgain));
- q->gain_now_ptr = &q->gain_channel1[0];
- q->gain_previous_ptr = &q->gain_channel1[1];
-
- cook_imlt(q, q->decode_buf_ptr2[0], q->mono_mdct_output,q->mlt_tmp);
- gain_compensate(q, q->mono_mdct_output, q->gain_now_ptr,
- q->gain_previous_ptr, q->mono_previous_buffer1);
-
- memcpy(&q->gain_channel1[1], &q->gain_channel1[0],sizeof(COOKgain));
-
-
- for (j=0 ; j<q->samples_per_frame ; j++){
- value = lrintf(q->mono_mdct_output[j]);
- if(value < -32768) value = -32768;
- else if(value > 32767) value = 32767;
- outbuffer[2*j] = value;
- }
-
- /* channel 1 */
- //av_log(NULL,AV_LOG_ERROR,"bits = %d\n",get_bits_count(&q->gb));
- decode_bytes_and_gain(q, inbuffer + sub_packet_size/2,
- &q->gain_channel2[0]);
+ if (p->joint_stereo) {
+ if ((res = joint_decode(q, p, q->decode_buffer_1, q->decode_buffer_2)) < 0)
+ return res;
+ } else {
+ if ((res = mono_decode(q, p, q->decode_buffer_1)) < 0)
+ return res;
- q->gain_now_ptr = &q->gain_channel2[0];
- q->gain_previous_ptr = &q->gain_channel2[1];
+ if (p->num_channels == 2) {
+ decode_bytes_and_gain(q, p, inbuffer + sub_packet_size / 2, &p->gains2);
+ if ((res = mono_decode(q, p, q->decode_buffer_2)) < 0)
+ return res;
+ }
+ }
- mono_decode(q, q->decode_buf_ptr[0]);
+ mlt_compensate_output(q, q->decode_buffer_1, &p->gains1,
+ p->mono_previous_buffer1,
+ outbuffer ? outbuffer[p->ch_idx] : NULL);
- tmp_ptr = q->decode_buf_ptr[0];
- q->decode_buf_ptr[0] = q->decode_buf_ptr[1];
- q->decode_buf_ptr[1] = tmp_ptr;
+ if (p->num_channels == 2)
+ if (p->joint_stereo)
+ mlt_compensate_output(q, q->decode_buffer_2, &p->gains1,
+ p->mono_previous_buffer2,
+ outbuffer ? outbuffer[p->ch_idx + 1] : NULL);
+ else
+ mlt_compensate_output(q, q->decode_buffer_2, &p->gains2,
+ p->mono_previous_buffer2,
+ outbuffer ? outbuffer[p->ch_idx + 1] : NULL);
- cook_imlt(q, q->decode_buf_ptr[0], q->mono_mdct_output,q->mlt_tmp);
- gain_compensate(q, q->mono_mdct_output, q->gain_now_ptr,
- q->gain_previous_ptr, q->mono_previous_buffer2);
+ return 0;
+}
- /* Swap out the previous buffer. */
- tmp_ptr = q->previous_buffer_ptr[0];
- q->previous_buffer_ptr[0] = q->previous_buffer_ptr[1];
- q->previous_buffer_ptr[1] = tmp_ptr;
- memcpy(&q->gain_channel2[1], &q->gain_channel2[0] ,sizeof(COOKgain));
+static int cook_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ COOKContext *q = avctx->priv_data;
+ float **samples = NULL;
+ int i, ret;
+ int offset = 0;
+ int chidx = 0;
- for (j=0 ; j<q->samples_per_frame ; j++){
- value = lrintf(q->mono_mdct_output[j]);
- if(value < -32768) value = -32768;
- else if(value > 32767) value = 32767;
- outbuffer[2*j+1] = value;
- }
+ if (buf_size < avctx->block_align)
+ return buf_size;
- } else {
- decode_bytes_and_gain(q, inbuffer, &q->gain_current);
-
- mono_decode(q, q->decode_buf_ptr[0]);
-
- /* Swap buffer pointers. */
- tmp_ptr = q->decode_buf_ptr[1];
- q->decode_buf_ptr[1] = q->decode_buf_ptr[0];
- q->decode_buf_ptr[0] = tmp_ptr;
-
- /* FIXME: Rethink the gainbuffer handling, maybe a rename?
- now/previous swap */
- q->gain_now_ptr = &q->gain_now;
- q->gain_previous_ptr = &q->gain_previous;
-
- cook_imlt(q, q->decode_buf_ptr[0], q->mono_mdct_output,q->mlt_tmp);
- gain_compensate(q, q->mono_mdct_output, q->gain_now_ptr,
- q->gain_previous_ptr, q->mono_previous_buffer1);
-
- /* Clip and convert the floats to 16 bits */
- for (j=0 ; j<q->samples_per_frame ; j++){
- value = lrintf(q->mono_mdct_output[j]);
- if(value < -32768) value = -32768;
- else if(value > 32767) value = 32767;
- outbuffer[j] = value;
+ /* get output buffer */
+ if (q->discarded_packets >= 2) {
+ q->frame.nb_samples = q->samples_per_channel;
+ if ((ret = ff_get_buffer(avctx, &q->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
}
- memcpy(&q->gain_now, &q->gain_previous, sizeof(COOKgain));
- memcpy(&q->gain_previous, &q->gain_current, sizeof(COOKgain));
+ samples = (float **)q->frame.extended_data;
}
- return q->samples_per_frame * sizeof(int16_t);
-}
+ /* estimate subpacket sizes */
+ q->subpacket[0].size = avctx->block_align;
-/**
- * Cook frame decoding
- *
- * @param avctx pointer to the AVCodecContext
- */
+ 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 AVERROR_INVALIDDATA;
+ }
+ }
-static int cook_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- uint8_t *buf, int buf_size) {
- COOKContext *q = avctx->priv_data;
+ /* decode supbackets */
+ 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);
+
+ if ((ret = decode_subpacket(q, &q->subpacket[i], buf + offset, samples)) < 0)
+ return ret;
+ 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));
+ }
- if (buf_size < avctx->block_align)
- return buf_size;
+ /* Discard the first two frames: no valid audio. */
+ if (q->discarded_packets < 2) {
+ q->discarded_packets++;
+ *got_frame_ptr = 0;
+ return avctx->block_align;
+ }
- *data_size = decode_subpacket(q, buf, avctx->block_align, data);
+ *got_frame_ptr = 1;
+ *(AVFrame *) data = q->frame;
return avctx->block_align;
}
-#ifdef COOKDEBUG
-static void dump_cook_context(COOKContext *q, COOKextradata *e)
+#ifdef DEBUG
+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",e->cookversion);
- if (e->cookversion > MONO_COOK2) {
- PRINT("js_subband_start",e->js_subband_start);
- PRINT("js_vlc_bits",e->js_vlc_bits);
+#define PRINT(a, b) av_dlog(q->avctx, " %s = %d\n", a, b);
+ av_dlog(q->avctx, "COOKextradata\n");
+ av_dlog(q->avctx, "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");
- 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("random_state",q->random_state);
- PRINT("mlt_size",q->mlt_size);
- 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);
+ av_dlog(q->avctx, "COOKContext\n");
+ PRINT("nb_channels", q->avctx->channels);
+ PRINT("bit_rate", q->avctx->bit_rate);
+ PRINT("sample_rate", q->avctx->sample_rate);
+ PRINT("samples_per_channel", q->subpacket[0].samples_per_channel);
+ PRINT("subbands", q->subpacket[0].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
*
* @param avctx pointer to the AVCodecContext
*/
-
-static int cook_decode_init(AVCodecContext *avctx)
+static av_cold int cook_decode_init(AVCodecContext *avctx)
{
- COOKextradata *e = (COOKextradata *)avctx->extradata;
COOKContext *q = avctx->priv_data;
+ 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;
+ int samples_per_frame;
+ int ret;
+ q->avctx = avctx;
/* Take care of the codec specific extradata. */
- if (avctx->extradata_size <= 0) {
- av_log(avctx,AV_LOG_ERROR,"Necessary extradata missing!\n");
- return -1;
- } else {
+ if (extradata_size <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Necessary extradata missing!\n");
+ return AVERROR_INVALIDDATA;
+ }
+ av_log(avctx, AV_LOG_DEBUG, "codecdata_length=%d\n", avctx->extradata_size);
+
+ /* Take data from the AVCodecContext (RM container). */
+ if (!avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* Initialize RNG. */
+ av_lfg_init(&q->random_state, 0);
+
+ ff_dsputil_init(&q->dsp, avctx);
+
+ 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. */
- av_log(avctx,AV_LOG_DEBUG,"codecdata_length=%d\n",avctx->extradata_size);
- if (avctx->extradata_size >= 8){
- e->cookversion = be2me_32(e->cookversion);
- e->samples_per_frame = be2me_16(e->samples_per_frame);
- e->subbands = be2me_16(e->subbands);
+ if (extradata_size >= 8) {
+ q->subpacket[s].cookversion = bytestream_get_be32(&edata_ptr);
+ samples_per_frame = bytestream_get_be16(&edata_ptr);
+ q->subpacket[s].subbands = bytestream_get_be16(&edata_ptr);
+ extradata_size -= 8;
}
- if (avctx->extradata_size >= 16){
- e->js_subband_start = be2me_16(e->js_subband_start);
- e->js_vlc_bits = be2me_16(e->js_vlc_bits);
+ if (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;
}
- }
- /* Take data from the AVCodecContext (RM container). */
- q->sample_rate = avctx->sample_rate;
- q->nb_channels = avctx->channels;
- q->bit_rate = avctx->bit_rate;
-
- /* Initialize state. */
- q->random_state = 1;
-
- /* Initialize extradata related variables. */
- q->samples_per_channel = e->samples_per_frame / q->nb_channels;
- q->samples_per_frame = e->samples_per_frame;
- q->subbands = e->subbands;
- q->bits_per_subpacket = avctx->block_align * 8;
-
- /* Initialize default data states. */
- q->js_subband_start = 0;
- q->log2_numvector_size = 5;
- q->total_subbands = q->subbands;
-
- /* Initialize version-dependent variables */
- av_log(NULL,AV_LOG_DEBUG,"e->cookversion=%x\n",e->cookversion);
- switch (e->cookversion) {
- case MONO_COOK1:
- if (q->nb_channels != 1) {
- av_log(avctx,AV_LOG_ERROR,"Container channels != 1, report sample!\n");
- return -1;
+ /* Initialize extradata related variables. */
+ q->subpacket[s].samples_per_channel = samples_per_frame / avctx->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 (avctx->channels != 1) {
+ av_log_ask_for_sample(avctx, "Container channels != 1.\n");
+ return AVERROR_PATCHWELCOME;
}
- av_log(avctx,AV_LOG_DEBUG,"MONO_COOK1\n");
+ av_log(avctx, AV_LOG_DEBUG, "MONO\n");
break;
- case MONO_COOK2:
- if (q->nb_channels != 1) {
- q->joint_stereo = 0;
- q->bits_per_subpacket = q->bits_per_subpacket/2;
+ case STEREO:
+ if (avctx->channels != 1) {
+ q->subpacket[s].bits_per_subpdiv = 1;
+ q->subpacket[s].num_channels = 2;
}
- av_log(avctx,AV_LOG_DEBUG,"MONO_COOK2\n");
+ 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;
+ if (avctx->channels != 2) {
+ av_log_ask_for_sample(avctx, "Container channels != 2.\n");
+ return AVERROR_PATCHWELCOME;
}
- av_log(avctx,AV_LOG_DEBUG,"JOINT_STEREO\n");
- if (avctx->extradata_size >= 16){
- q->total_subbands = q->subbands + e->js_subband_start;
- q->js_subband_start = e->js_subband_start;
- q->joint_stereo = 1;
- q->js_vlc_bits = e->js_vlc_bits;
+ 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->samples_per_channel > 256) {
- q->log2_numvector_size = 6;
+ if (q->subpacket[s].samples_per_channel > 256) {
+ q->subpacket[s].log2_numvector_size = 6;
}
- if (q->samples_per_channel > 512) {
- q->log2_numvector_size = 7;
+ if (q->subpacket[s].samples_per_channel > 512) {
+ q->subpacket[s].log2_numvector_size = 7;
}
break;
case MC_COOK:
- av_log(avctx,AV_LOG_ERROR,"MC_COOK not supported!\n");
- return -1;
+ 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 (av_get_channel_layout_nb_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 = 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 = samples_per_frame;
+
break;
default:
- av_log(avctx,AV_LOG_ERROR,"Unknown Cook version, report sample!\n");
- return -1;
- break;
- }
+ av_log_ask_for_sample(avctx, "Unknown Cook version.\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ 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 AVERROR_INVALIDDATA;
+ } else
+ q->samples_per_channel = q->subpacket[0].samples_per_channel;
- /* Initialize variable relations */
- q->mlt_size = q->samples_per_channel;
- q->numvector_size = (1 << q->log2_numvector_size);
+ /* 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_ask_for_sample(avctx, "total_subbands > 53\n");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ 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",
+ q->subpacket[s].js_vlc_bits, 2 * q->subpacket[s].joint_stereo);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (q->subpacket[s].subbands > 50) {
+ av_log_ask_for_sample(avctx, "subbands > 50\n");
+ return AVERROR_PATCHWELCOME;
+ }
+ 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_ask_for_sample(avctx, "Too many subpackets > 5\n");
+ return AVERROR_PATCHWELCOME;
+ }
+ }
/* 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;
+ if ((ret = init_cook_vlc_tables(q)))
+ return ret;
- if(avctx->block_align >= UINT_MAX/2)
- return -1;
+ if (avctx->block_align >= UINT_MAX / 2)
+ return AVERROR(EINVAL);
/* 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);
- }
+ 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->decode_buf_ptr[0] = q->decode_buffer_1;
- q->decode_buf_ptr[1] = q->decode_buffer_2;
- q->decode_buf_ptr[2] = q->decode_buffer_3;
- q->decode_buf_ptr[3] = q->decode_buffer_4;
-
- q->decode_buf_ptr2[0] = q->decode_buffer_3;
- q->decode_buf_ptr2[1] = q->decode_buffer_4;
-
- q->previous_buffer_ptr[0] = q->mono_previous_buffer1;
- q->previous_buffer_ptr[1] = q->mono_previous_buffer2;
+ return AVERROR(ENOMEM);
/* Initialize transform. */
- if ( init_cook_mlt(q) == 0 )
- return -1;
+ if ((ret = init_cook_mlt(q)))
+ return ret;
+
+ /* 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->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)) {
- } 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->samples_per_channel != 256 && q->samples_per_channel != 512 &&
+ q->samples_per_channel != 1024) {
+ av_log_ask_for_sample(avctx,
+ "unknown amount of samples_per_channel = %d\n",
+ q->samples_per_channel);
+ return AVERROR_PATCHWELCOME;
}
-#ifdef COOKDEBUG
- dump_cook_context(q,e);
+ avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
+ if (channel_mask)
+ avctx->channel_layout = channel_mask;
+ else
+ avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
+
+ avcodec_get_frame_defaults(&q->frame);
+ avctx->coded_frame = &q->frame;
+
+#ifdef DEBUG
+ dump_cook_context(q);
#endif
return 0;
}
-
-AVCodec cook_decoder =
-{
- .name = "cook",
- .type = CODEC_TYPE_AUDIO,
- .id = CODEC_ID_COOK,
+AVCodec ff_cook_decoder = {
+ .name = "cook",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_COOK,
.priv_data_size = sizeof(COOKContext),
- .init = cook_decode_init,
- .close = cook_decode_close,
- .decode = cook_decode_frame,
+ .init = cook_decode_init,
+ .close = cook_decode_close,
+ .decode = cook_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"),
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
+ AV_SAMPLE_FMT_NONE },
};
projects / ffmpeg / blobdiff