X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftwinvq.c;h=940def45f579298fd56d609898ed28f8dcd3acf8;hb=31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3;hp=1aa66661d6a180909d5ab7c83cce6a230e860696;hpb=72415b2adb2c25f95ceede49001bb97ed9247dbb;p=ffmpeg diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 1aa66661d6a..940def45f57 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -2,247 +2,61 @@ * TwinVQ decoder * Copyright (c) 2009 Vitor Sessak * - * 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 */ -#include "avcodec.h" -#include "get_bits.h" -#include "dsputil.h" -#include "fft.h" -#include "lsp.h" - #include #include -#include "twinvq_data.h" - -enum FrameType { - FT_SHORT = 0, ///< Short frame (divided in n sub-blocks) - FT_MEDIUM, ///< Medium frame (divided in mmtab; - int size_s = mtab->size / mtab->fmode[FT_SHORT].sub; + const TwinVQModeTab *mtab = tctx->mtab; + int size_s = mtab->size / mtab->fmode[TWINVQ_FT_SHORT].sub; - for (i = 0; i < size_s/2; i++) { + for (i = 0; i < size_s / 2; i++) { float cos_i = tctx->cos_tabs[0][i]; - lpc[i] = eval_lpc_spectrum(cos_vals, cos_i, mtab->n_lsp); - lpc[size_s-i-1] = eval_lpc_spectrum(cos_vals, -cos_i, mtab->n_lsp); + lpc[i] = eval_lpc_spectrum(cos_vals, cos_i, mtab->n_lsp); + lpc[size_s - i - 1] = eval_lpc_spectrum(cos_vals, -cos_i, mtab->n_lsp); } } static void interpolate(float *out, float v1, float v2, int size) { int i; - float step = (v1 - v2)/(size + 1); + float step = (v1 - v2) / (size + 1); for (i = 0; i < size; i++) { - v2 += step; + v2 += step; out[i] = v2; } } static inline float get_cos(int idx, int part, const float *cos_tab, int size) { - return part ? -cos_tab[size - idx - 1] : - cos_tab[ idx ]; + return part ? -cos_tab[size - idx - 1] + : cos_tab[idx]; } /** - * Evaluates the LPC amplitude spectrum envelope from the line spectrum pairs. + * Evaluate the LPC amplitude spectrum envelope from the line spectrum pairs. * Probably for speed reasons, the coefficients are evaluated as * siiiibiiiisiiiibiiiisiiiibiiiisiiiibiiiis ... * where s is an evaluated value, i is a value interpolated from the others @@ -293,19 +107,19 @@ static inline float get_cos(int idx, int part, const float *cos_tab, int size) * unexplained condition. * * @param step the size of a block "siiiibiiii" - * @param in the cosinus of the LSP data - * @param part is 0 for 0...PI (positive cossinus values) and 1 for PI...2PI - (negative cossinus values) + * @param in the cosine of the LSP data + * @param part is 0 for 0...PI (positive cosine values) and 1 for PI...2PI + * (negative cosine values) * @param size the size of the whole output */ -static inline void eval_lpcenv_or_interp(TwinContext *tctx, - enum FrameType ftype, +static inline void eval_lpcenv_or_interp(TwinVQContext *tctx, + enum TwinVQFrameType ftype, float *out, const float *in, int size, int step, int part) { int i; - const ModeTab *mtab = tctx->mtab; - const float *cos_tab = tctx->cos_tabs[ftype]; + const TwinVQModeTab *mtab = tctx->mtab; + const float *cos_tab = tctx->cos_tabs[ftype]; // Fill the 's' for (i = 0; i < size; i += step) @@ -315,33 +129,39 @@ static inline void eval_lpcenv_or_interp(TwinContext *tctx, mtab->n_lsp); // Fill the 'iiiibiiii' - for (i = step; i <= size - 2*step; i += step) { - if (out[i + step] + out[i - step] > 1.95*out[i] || - out[i + step] >= out[i - step]) { - interpolate(out + i - step + 1, out[i], out[i-step], step - 1); + for (i = step; i <= size - 2 * step; i += step) { + if (out[i + step] + out[i - step] > 1.95 * out[i] || + out[i + step] >= out[i - step]) { + interpolate(out + i - step + 1, out[i], out[i - step], step - 1); } else { - out[i - step/2] = + out[i - step / 2] = eval_lpc_spectrum(in, - get_cos(i-step/2, part, cos_tab, size), + get_cos(i - step / 2, part, cos_tab, size), mtab->n_lsp); - interpolate(out + i - step + 1, out[i-step/2], out[i-step ], step/2 - 1); - interpolate(out + i - step/2 + 1, out[i ], out[i-step/2], step/2 - 1); + interpolate(out + i - step + 1, out[i - step / 2], + out[i - step], step / 2 - 1); + interpolate(out + i - step / 2 + 1, out[i], + out[i - step / 2], step / 2 - 1); } } - interpolate(out + size - 2*step + 1, out[size-step], out[size - 2*step], step - 1); + interpolate(out + size - 2 * step + 1, out[size - step], + out[size - 2 * step], step - 1); } -static void eval_lpcenv_2parts(TwinContext *tctx, enum FrameType ftype, +static void eval_lpcenv_2parts(TwinVQContext *tctx, enum TwinVQFrameType ftype, const float *buf, float *lpc, int size, int step) { - eval_lpcenv_or_interp(tctx, ftype, lpc , buf, size/2, step, 0); - eval_lpcenv_or_interp(tctx, ftype, lpc + size/2, buf, size/2, 2*step, 1); + eval_lpcenv_or_interp(tctx, ftype, lpc, buf, size / 2, step, 0); + eval_lpcenv_or_interp(tctx, ftype, lpc + size / 2, buf, size / 2, + 2 * step, 1); - interpolate(lpc+size/2-step+1, lpc[size/2], lpc[size/2-step], step); + interpolate(lpc + size / 2 - step + 1, lpc[size / 2], + lpc[size / 2 - step], step); - memset_float(lpc + size - 2*step + 1, lpc[size - 2*step], 2*step - 1); + twinvq_memset_float(lpc + size - 2 * step + 1, lpc[size - 2 * step], + 2 * step - 1); } /** @@ -349,8 +169,8 @@ static void eval_lpcenv_2parts(TwinContext *tctx, enum FrameType ftype, * bitstream, sum the corresponding vectors and write the result to *out * after permutation. */ -static void dequant(TwinContext *tctx, GetBitContext *gb, float *out, - enum FrameType ftype, +static void dequant(TwinVQContext *tctx, const uint8_t *cb_bits, float *out, + enum TwinVQFrameType ftype, const int16_t *cb0, const int16_t *cb1, int cb_len) { int pos = 0; @@ -365,156 +185,58 @@ static void dequant(TwinContext *tctx, GetBitContext *gb, float *out, int bitstream_second_part = (i >= tctx->bits_main_spec_change[ftype]); int bits = tctx->bits_main_spec[0][ftype][bitstream_second_part]; + tmp0 = *cb_bits++; if (bits == 7) { - if (get_bits1(gb)) + if (tmp0 & 0x40) sign0 = -1; - bits = 6; + tmp0 &= 0x3F; } - tmp0 = get_bits(gb, bits); bits = tctx->bits_main_spec[1][ftype][bitstream_second_part]; - + tmp1 = *cb_bits++; if (bits == 7) { - if (get_bits1(gb)) + if (tmp1 & 0x40) sign1 = -1; - - bits = 6; + tmp1 &= 0x3F; } - tmp1 = get_bits(gb, bits); - tab0 = cb0 + tmp0*cb_len; - tab1 = cb1 + tmp1*cb_len; + tab0 = cb0 + tmp0 * cb_len; + tab1 = cb1 + tmp1 * cb_len; for (j = 0; j < length; j++) - out[tctx->permut[ftype][pos+j]] = sign0*tab0[j] + sign1*tab1[j]; + out[tctx->permut[ftype][pos + j]] = sign0 * tab0[j] + + sign1 * tab1[j]; pos += length; } - -} - -static inline float mulawinv(float y, float clip, float mu) -{ - y = av_clipf(y/clip, -1, 1); - return clip * FFSIGN(y) * (exp(log(1+mu) * fabs(y)) - 1) / mu; -} - -/** - * Evaluate a*b/400 rounded to the nearest integer. When, for example, - * a*b == 200 and the nearest integer is ill-defined, use a table to emulate - * the following broken float-based implementation used by the binary decoder: - * - * \code - * static int very_broken_op(int a, int b) - * { - * static float test; // Ugh, force gcc to do the division first... - * - * test = a/400.; - * return b * test + 0.5; - * } - * \endcode - * - * @note if this function is replaced by just ROUNDED_DIV(a*b,400.), the stddev - * between the original file (before encoding with Yamaha encoder) and the - * decoded output increases, which leads one to believe that the encoder expects - * exactly this broken calculation. - */ -static int very_broken_op(int a, int b) -{ - int x = a*b + 200; - int size; - const uint8_t *rtab; - - if (x%400 || b%5) - return x/400; - - x /= 400; - - size = tabs[b/5].size; - rtab = tabs[b/5].tab; - return x - rtab[size*av_log2(2*(x - 1)/size)+(x - 1)%size]; -} - -/** - * Sum to data a periodic peak of a given period, width and shape. - * - * @param period the period of the peak divised by 400.0 - */ -static void add_peak(int period, int width, const float *shape, - float ppc_gain, float *speech, int len) -{ - int i, j; - - const float *shape_end = shape + len; - int center; - - // First peak centered around zero - for (i = 0; i < width/2; i++) - speech[i] += ppc_gain * *shape++; - - for (i = 1; i < ROUNDED_DIV(len,width) ; i++) { - center = very_broken_op(period, i); - for (j = -width/2; j < (width+1)/2; j++) - speech[j+center] += ppc_gain * *shape++; - } - - // For the last block, be careful not to go beyond the end of the buffer - center = very_broken_op(period, i); - for (j = -width/2; j < (width + 1)/2 && shape < shape_end; j++) - speech[j+center] += ppc_gain * *shape++; } -static void decode_ppc(TwinContext *tctx, int period_coef, const float *shape, - float ppc_gain, float *speech) +static void dec_gain(TwinVQContext *tctx, + enum TwinVQFrameType ftype, float *out) { - const ModeTab *mtab = tctx->mtab; - int isampf = tctx->avctx->sample_rate/1000; - int ibps = tctx->avctx->bit_rate/(1000 * tctx->avctx->channels); - int min_period = ROUNDED_DIV( 40*2*mtab->size, isampf); - int max_period = ROUNDED_DIV(6*40*2*mtab->size, isampf); - int period_range = max_period - min_period; - - // This is actually the period multiplied by 400. It is just linearly coded - // between its maximum and minimum value. - int period = min_period + - ROUNDED_DIV(period_coef*period_range, (1 << mtab->ppc_period_bit) - 1); - int width; - - if (isampf == 22 && ibps == 32) { - // For some unknown reason, NTT decided to code this case differently... - width = ROUNDED_DIV((period + 800)* mtab->peak_per2wid, 400*mtab->size); - } else - width = (period )* mtab->peak_per2wid/(400*mtab->size); - - add_peak(period, width, shape, ppc_gain, speech, mtab->ppc_shape_len); -} - -static void dec_gain(TwinContext *tctx, GetBitContext *gb, enum FrameType ftype, - float *out) -{ - const ModeTab *mtab = tctx->mtab; + const TwinVQModeTab *mtab = tctx->mtab; + const TwinVQFrameData *bits = &tctx->bits[tctx->cur_frame]; int i, j; - int sub = mtab->fmode[ftype].sub; - float step = AMP_MAX / ((1 << GAIN_BITS) - 1); - float sub_step = SUB_AMP_MAX / ((1 << SUB_GAIN_BITS) - 1); + int sub = mtab->fmode[ftype].sub; + float step = TWINVQ_AMP_MAX / ((1 << TWINVQ_GAIN_BITS) - 1); + float sub_step = TWINVQ_SUB_AMP_MAX / ((1 << TWINVQ_SUB_GAIN_BITS) - 1); - if (ftype == FT_LONG) { + if (ftype == TWINVQ_FT_LONG) { for (i = 0; i < tctx->avctx->channels; i++) - out[i] = (1./(1<<13)) * - mulawinv(step * 0.5 + step * get_bits(gb, GAIN_BITS), - AMP_MAX, MULAW_MU); + out[i] = (1.0 / (1 << 13)) * + twinvq_mulawinv(step * 0.5 + step * bits->gain_bits[i], + TWINVQ_AMP_MAX, TWINVQ_MULAW_MU); } else { for (i = 0; i < tctx->avctx->channels; i++) { - float val = (1./(1<<23)) * - mulawinv(step * 0.5 + step * get_bits(gb, GAIN_BITS), - AMP_MAX, MULAW_MU); - - for (j = 0; j < sub; j++) { - out[i*sub + j] = - val*mulawinv(sub_step* 0.5 + - sub_step* get_bits(gb, SUB_GAIN_BITS), - SUB_AMP_MAX, MULAW_MU); - } + float val = (1.0 / (1 << 23)) * + twinvq_mulawinv(step * 0.5 + step * bits->gain_bits[i], + TWINVQ_AMP_MAX, TWINVQ_MULAW_MU); + + for (j = 0; j < sub; j++) + out[i * sub + j] = + val * twinvq_mulawinv(sub_step * 0.5 + + sub_step * bits->sub_gain_bits[i * sub + j], + TWINVQ_SUB_AMP_MAX, TWINVQ_MULAW_MU); } } } @@ -530,23 +252,23 @@ static void rearrange_lsp(int order, float *lsp, float min_dist) int i; float min_dist2 = min_dist * 0.5; for (i = 1; i < order; i++) - if (lsp[i] - lsp[i-1] < min_dist) { - float avg = (lsp[i] + lsp[i-1]) * 0.5; + if (lsp[i] - lsp[i - 1] < min_dist) { + float avg = (lsp[i] + lsp[i - 1]) * 0.5; - lsp[i-1] = avg - min_dist2; - lsp[i ] = avg + min_dist2; + lsp[i - 1] = avg - min_dist2; + lsp[i] = avg + min_dist2; } } -static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2, +static void decode_lsp(TwinVQContext *tctx, int lpc_idx1, uint8_t *lpc_idx2, int lpc_hist_idx, float *lsp, float *hist) { - const ModeTab *mtab = tctx->mtab; + const TwinVQModeTab *mtab = tctx->mtab; int i, j; - const float *cb = mtab->lspcodebook; - const float *cb2 = cb + (1 << mtab->lsp_bit1)*mtab->n_lsp; - const float *cb3 = cb2 + (1 << mtab->lsp_bit2)*mtab->n_lsp; + const float *cb = mtab->lspcodebook; + const float *cb2 = cb + (1 << mtab->lsp_bit1) * mtab->n_lsp; + const float *cb3 = cb2 + (1 << mtab->lsp_bit2) * mtab->n_lsp; const int8_t funny_rounding[4] = { -2, @@ -557,17 +279,18 @@ static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2, j = 0; for (i = 0; i < mtab->lsp_split; i++) { - int chunk_end = ((i + 1)*mtab->n_lsp + funny_rounding[i])/mtab->lsp_split; + int chunk_end = ((i + 1) * mtab->n_lsp + funny_rounding[i]) / + mtab->lsp_split; for (; j < chunk_end; j++) - lsp[j] = cb [lpc_idx1 * mtab->n_lsp + j] + + lsp[j] = cb[lpc_idx1 * mtab->n_lsp + j] + cb2[lpc_idx2[i] * mtab->n_lsp + j]; } rearrange_lsp(mtab->n_lsp, lsp, 0.0001); for (i = 0; i < mtab->n_lsp; i++) { - float tmp1 = 1. - cb3[lpc_hist_idx*mtab->n_lsp + i]; - float tmp2 = hist[i] * cb3[lpc_hist_idx*mtab->n_lsp + i]; + float tmp1 = 1.0 - cb3[lpc_hist_idx * mtab->n_lsp + i]; + float tmp2 = hist[i] * cb3[lpc_hist_idx * mtab->n_lsp + i]; hist[i] = lsp[i]; lsp[i] = lsp[i] * tmp1 + tmp2; } @@ -577,326 +300,287 @@ static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2, ff_sort_nearly_sorted_floats(lsp, mtab->n_lsp); } -static void dec_lpc_spectrum_inv(TwinContext *tctx, float *lsp, - enum FrameType ftype, float *lpc) +static void dec_lpc_spectrum_inv(TwinVQContext *tctx, float *lsp, + enum TwinVQFrameType ftype, float *lpc) { int i; int size = tctx->mtab->size / tctx->mtab->fmode[ftype].sub; for (i = 0; i < tctx->mtab->n_lsp; i++) - lsp[i] = 2*cos(lsp[i]); + lsp[i] = 2 * cos(lsp[i]); switch (ftype) { - case FT_LONG: + case TWINVQ_FT_LONG: eval_lpcenv_2parts(tctx, ftype, lsp, lpc, size, 8); break; - case FT_MEDIUM: + case TWINVQ_FT_MEDIUM: eval_lpcenv_2parts(tctx, ftype, lsp, lpc, size, 2); break; - case FT_SHORT: + case TWINVQ_FT_SHORT: eval_lpcenv(tctx, lsp, lpc); break; } } -static void imdct_and_window(TwinContext *tctx, enum FrameType ftype, int wtype, - float *in, float *prev, int ch) +static const uint8_t wtype_to_wsize[] = { 0, 0, 2, 2, 2, 1, 0, 1, 1 }; + +static void imdct_and_window(TwinVQContext *tctx, enum TwinVQFrameType ftype, + int wtype, float *in, float *prev, int ch) { - const ModeTab *mtab = tctx->mtab; + FFTContext *mdct = &tctx->mdct_ctx[ftype]; + const TwinVQModeTab *mtab = tctx->mtab; int bsize = mtab->size / mtab->fmode[ftype].sub; int size = mtab->size; float *buf1 = tctx->tmp_buf; - int j; - int wsize; // Window size - float *out = tctx->curr_frame + 2*ch*mtab->size; + int j, first_wsize, wsize; // Window size + float *out = tctx->curr_frame + 2 * ch * mtab->size; float *out2 = out; float *prev_buf; - int first_wsize; - - static const uint8_t wtype_to_wsize[] = {0, 0, 2, 2, 2, 1, 0, 1, 1}; int types_sizes[] = { - mtab->size / mtab->fmode[FT_LONG ].sub, - mtab->size / mtab->fmode[FT_MEDIUM].sub, - mtab->size / (2*mtab->fmode[FT_SHORT ].sub), + mtab->size / mtab->fmode[TWINVQ_FT_LONG].sub, + mtab->size / mtab->fmode[TWINVQ_FT_MEDIUM].sub, + mtab->size / (mtab->fmode[TWINVQ_FT_SHORT].sub * 2), }; - wsize = types_sizes[wtype_to_wsize[wtype]]; + wsize = types_sizes[wtype_to_wsize[wtype]]; first_wsize = wsize; - prev_buf = prev + (size - bsize)/2; + prev_buf = prev + (size - bsize) / 2; for (j = 0; j < mtab->fmode[ftype].sub; j++) { - int sub_wtype = ftype == FT_MEDIUM ? 8 : wtype; + int sub_wtype = ftype == TWINVQ_FT_MEDIUM ? 8 : wtype; if (!j && wtype == 4) sub_wtype = 4; - else if (j == mtab->fmode[ftype].sub-1 && wtype == 7) + else if (j == mtab->fmode[ftype].sub - 1 && wtype == 7) sub_wtype = 7; wsize = types_sizes[wtype_to_wsize[sub_wtype]]; - ff_imdct_half(&tctx->mdct_ctx[ftype], buf1 + bsize*j, in + bsize*j); + mdct->imdct_half(mdct, buf1 + bsize * j, in + bsize * j); - tctx->dsp.vector_fmul_window(out2, - prev_buf + (bsize-wsize)/2, - buf1 + bsize*j, - ff_sine_windows[av_log2(wsize)], - 0.0, - wsize/2); + tctx->fdsp.vector_fmul_window(out2, prev_buf + (bsize - wsize) / 2, + buf1 + bsize * j, + ff_sine_windows[av_log2(wsize)], + wsize / 2); out2 += wsize; - memcpy(out2, buf1 + bsize*j + wsize/2, (bsize - wsize/2)*sizeof(float)); + memcpy(out2, buf1 + bsize * j + wsize / 2, + (bsize - wsize / 2) * sizeof(float)); - out2 += ftype == FT_MEDIUM ? (bsize-wsize)/2 : bsize - wsize; + out2 += ftype == TWINVQ_FT_MEDIUM ? (bsize - wsize) / 2 : bsize - wsize; - prev_buf = buf1 + bsize*j + bsize/2; + prev_buf = buf1 + bsize * j + bsize / 2; } - tctx->last_block_pos[ch] = (size + first_wsize)/2; + tctx->last_block_pos[ch] = (size + first_wsize) / 2; } -static void imdct_output(TwinContext *tctx, enum FrameType ftype, int wtype, - float *out) +static void imdct_output(TwinVQContext *tctx, enum TwinVQFrameType ftype, + int wtype, float **out, int offset) { - const ModeTab *mtab = tctx->mtab; - float *prev_buf = tctx->prev_frame + tctx->last_block_pos[0]; - int i, j; + const TwinVQModeTab *mtab = tctx->mtab; + float *prev_buf = tctx->prev_frame + tctx->last_block_pos[0]; + int size1, size2, i; + float *out1, *out2; - for (i = 0; i < tctx->avctx->channels; i++) { + for (i = 0; i < tctx->avctx->channels; i++) imdct_and_window(tctx, ftype, wtype, - tctx->spectrum + i*mtab->size, - prev_buf + 2*i*mtab->size, + tctx->spectrum + i * mtab->size, + prev_buf + 2 * i * mtab->size, i); - } - if (tctx->avctx->channels == 2) { - for (i = 0; i < mtab->size - tctx->last_block_pos[0]; i++) { - float f1 = prev_buf[ i]; - float f2 = prev_buf[2*mtab->size + i]; - out[2*i ] = f1 + f2; - out[2*i + 1] = f1 - f2; - } - for (j = 0; i < mtab->size; j++,i++) { - float f1 = tctx->curr_frame[ j]; - float f2 = tctx->curr_frame[2*mtab->size + j]; - out[2*i ] = f1 + f2; - out[2*i + 1] = f1 - f2; - } - } else { - memcpy(out, prev_buf, - (mtab->size - tctx->last_block_pos[0]) * sizeof(*out)); - - out += mtab->size - tctx->last_block_pos[0]; + if (!out) + return; - memcpy(out, tctx->curr_frame, - (tctx->last_block_pos[0]) * sizeof(*out)); - } - -} + size2 = tctx->last_block_pos[0]; + size1 = mtab->size - size2; -static void dec_bark_env(TwinContext *tctx, const uint8_t *in, int use_hist, - int ch, float *out, float gain, enum FrameType ftype) -{ - const ModeTab *mtab = tctx->mtab; - int i,j; - float *hist = tctx->bark_hist[ftype][ch]; - float val = ((const float []) {0.4, 0.35, 0.28})[ftype]; - int bark_n_coef = mtab->fmode[ftype].bark_n_coef; - int fw_cb_len = mtab->fmode[ftype].bark_env_size / bark_n_coef; - int idx = 0; - - for (i = 0; i < fw_cb_len; i++) - for (j = 0; j < bark_n_coef; j++, idx++) { - float tmp2 = - mtab->fmode[ftype].bark_cb[fw_cb_len*in[j] + i] * (1./4096); - float st = use_hist ? - (1. - val) * tmp2 + val*hist[idx] + 1. : tmp2 + 1.; - - hist[idx] = tmp2; - if (st < -1.) st = 1.; - - memset_float(out, st * gain, mtab->fmode[ftype].bark_tab[idx]); - out += mtab->fmode[ftype].bark_tab[idx]; - } + out1 = &out[0][0] + offset; + memcpy(out1, prev_buf, size1 * sizeof(*out1)); + memcpy(out1 + size1, tctx->curr_frame, size2 * sizeof(*out1)); + if (tctx->avctx->channels == 2) { + out2 = &out[1][0] + offset; + memcpy(out2, &prev_buf[2 * mtab->size], + size1 * sizeof(*out2)); + memcpy(out2 + size1, &tctx->curr_frame[2 * mtab->size], + size2 * sizeof(*out2)); + tctx->fdsp.butterflies_float(out1, out2, mtab->size); + } } -static void read_and_decode_spectrum(TwinContext *tctx, GetBitContext *gb, - float *out, enum FrameType ftype) +static void read_and_decode_spectrum(TwinVQContext *tctx, float *out, + enum TwinVQFrameType ftype) { - const ModeTab *mtab = tctx->mtab; - int channels = tctx->avctx->channels; - int sub = mtab->fmode[ftype].sub; + const TwinVQModeTab *mtab = tctx->mtab; + TwinVQFrameData *bits = &tctx->bits[tctx->cur_frame]; + int channels = tctx->avctx->channels; + int sub = mtab->fmode[ftype].sub; int block_size = mtab->size / sub; - float gain[channels*sub]; - float ppc_shape[mtab->ppc_shape_len * channels * 4]; - uint8_t bark1[channels][sub][mtab->fmode[ftype].bark_n_coef]; - uint8_t bark_use_hist[channels][sub]; + float gain[TWINVQ_CHANNELS_MAX * TWINVQ_SUBBLOCKS_MAX]; + float ppc_shape[TWINVQ_PPC_SHAPE_LEN_MAX * TWINVQ_CHANNELS_MAX * 4]; - uint8_t lpc_idx1[channels]; - uint8_t lpc_idx2[channels][tctx->mtab->lsp_split]; - uint8_t lpc_hist_idx[channels]; - - int i, j, k; + int i, j; - dequant(tctx, gb, out, ftype, + dequant(tctx, bits->main_coeffs, out, ftype, mtab->fmode[ftype].cb0, mtab->fmode[ftype].cb1, mtab->fmode[ftype].cb_len_read); - for (i = 0; i < channels; i++) - for (j = 0; j < sub; j++) - for (k = 0; k < mtab->fmode[ftype].bark_n_coef; k++) - bark1[i][j][k] = - get_bits(gb, mtab->fmode[ftype].bark_n_bit); - - for (i = 0; i < channels; i++) - for (j = 0; j < sub; j++) - bark_use_hist[i][j] = get_bits1(gb); - - dec_gain(tctx, gb, ftype, gain); - - for (i = 0; i < channels; i++) { - lpc_hist_idx[i] = get_bits(gb, tctx->mtab->lsp_bit0); - lpc_idx1 [i] = get_bits(gb, tctx->mtab->lsp_bit1); - - for (j = 0; j < tctx->mtab->lsp_split; j++) - lpc_idx2[i][j] = get_bits(gb, tctx->mtab->lsp_bit2); - } + dec_gain(tctx, ftype, gain); - if (ftype == FT_LONG) { - int cb_len_p = (tctx->n_div[3] + mtab->ppc_shape_len*channels - 1)/ - tctx->n_div[3]; - dequant(tctx, gb, ppc_shape, FT_PPC, mtab->ppc_shape_cb, - mtab->ppc_shape_cb + cb_len_p*PPC_SHAPE_CB_SIZE, cb_len_p); + if (ftype == TWINVQ_FT_LONG) { + int cb_len_p = (tctx->n_div[3] + mtab->ppc_shape_len * channels - 1) / + tctx->n_div[3]; + dequant(tctx, bits->ppc_coeffs, ppc_shape, + TWINVQ_FT_PPC, mtab->ppc_shape_cb, + mtab->ppc_shape_cb + cb_len_p * TWINVQ_PPC_SHAPE_CB_SIZE, + cb_len_p); } for (i = 0; i < channels; i++) { float *chunk = out + mtab->size * i; - float lsp[tctx->mtab->n_lsp]; + float lsp[TWINVQ_LSP_COEFS_MAX]; for (j = 0; j < sub; j++) { - dec_bark_env(tctx, bark1[i][j], bark_use_hist[i][j], i, - tctx->tmp_buf, gain[sub*i+j], ftype); - - tctx->dsp.vector_fmul(chunk + block_size*j, tctx->tmp_buf, - block_size); + tctx->dec_bark_env(tctx, bits->bark1[i][j], + bits->bark_use_hist[i][j], i, + tctx->tmp_buf, gain[sub * i + j], ftype); + tctx->fdsp.vector_fmul(chunk + block_size * j, + chunk + block_size * j, + tctx->tmp_buf, block_size); } - if (ftype == FT_LONG) { - float pgain_step = 25000. / ((1 << mtab->pgain_bit) - 1); - int p_coef = get_bits(gb, tctx->mtab->ppc_period_bit); - int g_coef = get_bits(gb, tctx->mtab->pgain_bit); - float v = 1./8192* - mulawinv(pgain_step*g_coef+ pgain_step/2, 25000., PGAIN_MU); - - decode_ppc(tctx, p_coef, ppc_shape + i*mtab->ppc_shape_len, v, - chunk); - } + if (ftype == TWINVQ_FT_LONG) + tctx->decode_ppc(tctx, bits->p_coef[i], bits->g_coef[i], + ppc_shape + i * mtab->ppc_shape_len, chunk); - decode_lsp(tctx, lpc_idx1[i], lpc_idx2[i], lpc_hist_idx[i], lsp, - tctx->lsp_hist[i]); + decode_lsp(tctx, bits->lpc_idx1[i], bits->lpc_idx2[i], + bits->lpc_hist_idx[i], lsp, tctx->lsp_hist[i]); dec_lpc_spectrum_inv(tctx, lsp, ftype, tctx->tmp_buf); for (j = 0; j < mtab->fmode[ftype].sub; j++) { - tctx->dsp.vector_fmul(chunk, tctx->tmp_buf, block_size); + tctx->fdsp.vector_fmul(chunk, chunk, tctx->tmp_buf, block_size); chunk += block_size; } } } -static int twin_decode_frame(AVCodecContext * avctx, void *data, - int *data_size, AVPacket *avpkt) +const enum TwinVQFrameType ff_twinvq_wtype_to_ftype_table[] = { + TWINVQ_FT_LONG, TWINVQ_FT_LONG, TWINVQ_FT_SHORT, TWINVQ_FT_LONG, + TWINVQ_FT_MEDIUM, TWINVQ_FT_LONG, TWINVQ_FT_LONG, TWINVQ_FT_MEDIUM, + TWINVQ_FT_MEDIUM +}; + +int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - TwinContext *tctx = avctx->priv_data; - GetBitContext gb; - const ModeTab *mtab = tctx->mtab; - float *out = data; - enum FrameType ftype; - int window_type; - static const enum FrameType wtype_to_ftype_table[] = { - FT_LONG, FT_LONG, FT_SHORT, FT_LONG, - FT_MEDIUM, FT_LONG, FT_LONG, FT_MEDIUM, FT_MEDIUM - }; + int buf_size = avpkt->size; + TwinVQContext *tctx = avctx->priv_data; + const TwinVQModeTab *mtab = tctx->mtab; + float **out = NULL; + int ret; + + /* get output buffer */ + if (tctx->discarded_packets >= 2) { + frame->nb_samples = mtab->size * tctx->frames_per_packet; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + return ret; + } + out = (float **)frame->extended_data; + } - if (buf_size*8 < avctx->bit_rate*mtab->size/avctx->sample_rate + 8) { + if (buf_size < avctx->block_align) { av_log(avctx, AV_LOG_ERROR, "Frame too small (%d bytes). Truncated file?\n", buf_size); - *data_size = 0; - return buf_size; + return AVERROR(EINVAL); } - init_get_bits(&gb, buf, buf_size * 8); - skip_bits(&gb, get_bits(&gb, 8)); - window_type = get_bits(&gb, WINDOW_TYPE_BITS); - - if (window_type > 8) { - av_log(avctx, AV_LOG_ERROR, "Invalid window type, broken sample?\n"); - return -1; - } + if ((ret = tctx->read_bitstream(avctx, tctx, buf, buf_size)) < 0) + return ret; - ftype = wtype_to_ftype_table[window_type]; + for (tctx->cur_frame = 0; tctx->cur_frame < tctx->frames_per_packet; + tctx->cur_frame++) { + read_and_decode_spectrum(tctx, tctx->spectrum, + tctx->bits[tctx->cur_frame].ftype); - read_and_decode_spectrum(tctx, &gb, tctx->spectrum, ftype); + imdct_output(tctx, tctx->bits[tctx->cur_frame].ftype, + tctx->bits[tctx->cur_frame].window_type, out, + tctx->cur_frame * mtab->size); - imdct_output(tctx, ftype, window_type, out); - - FFSWAP(float*, tctx->curr_frame, tctx->prev_frame); + FFSWAP(float *, tctx->curr_frame, tctx->prev_frame); + } - if (tctx->avctx->frame_number < 2) { - *data_size=0; + if (tctx->discarded_packets < 2) { + tctx->discarded_packets++; + *got_frame_ptr = 0; return buf_size; } - tctx->dsp.vector_clipf(out, out, -32700./(1<<15), 32700./(1<<15), - avctx->channels * mtab->size); + *got_frame_ptr = 1; - *data_size = mtab->size*avctx->channels*4; - - return buf_size; + // VQF can deliver packets 1 byte greater than block align + if (buf_size == avctx->block_align + 1) + return buf_size; + return avctx->block_align; } /** * Init IMDCT and windowing tables */ -static av_cold void init_mdct_win(TwinContext *tctx) +static av_cold int init_mdct_win(TwinVQContext *tctx) { - int i,j; - const ModeTab *mtab = tctx->mtab; - int size_s = mtab->size / mtab->fmode[FT_SHORT].sub; - int size_m = mtab->size / mtab->fmode[FT_MEDIUM].sub; + int i, j, ret; + const TwinVQModeTab *mtab = tctx->mtab; + int size_s = mtab->size / mtab->fmode[TWINVQ_FT_SHORT].sub; + int size_m = mtab->size / mtab->fmode[TWINVQ_FT_MEDIUM].sub; int channels = tctx->avctx->channels; - float norm = channels == 1 ? 2. : 1.; + float norm = channels == 1 ? 2.0 : 1.0; for (i = 0; i < 3; i++) { - int bsize = tctx->mtab->size/tctx->mtab->fmode[i].sub; - ff_mdct_init(&tctx->mdct_ctx[i], av_log2(bsize) + 1, 1, - -sqrt(norm/bsize) / (1<<15)); + int bsize = tctx->mtab->size / tctx->mtab->fmode[i].sub; + if ((ret = ff_mdct_init(&tctx->mdct_ctx[i], av_log2(bsize) + 1, 1, + -sqrt(norm / bsize) / (1 << 15)))) + return ret; } - tctx->tmp_buf = av_malloc(mtab->size * sizeof(*tctx->tmp_buf)); + FF_ALLOC_OR_GOTO(tctx->avctx, tctx->tmp_buf, + mtab->size * sizeof(*tctx->tmp_buf), alloc_fail); - tctx->spectrum = av_malloc(2*mtab->size*channels*sizeof(float)); - tctx->curr_frame = av_malloc(2*mtab->size*channels*sizeof(float)); - tctx->prev_frame = av_malloc(2*mtab->size*channels*sizeof(float)); + FF_ALLOC_OR_GOTO(tctx->avctx, tctx->spectrum, + 2 * mtab->size * channels * sizeof(*tctx->spectrum), + alloc_fail); + FF_ALLOC_OR_GOTO(tctx->avctx, tctx->curr_frame, + 2 * mtab->size * channels * sizeof(*tctx->curr_frame), + alloc_fail); + FF_ALLOC_OR_GOTO(tctx->avctx, tctx->prev_frame, + 2 * mtab->size * channels * sizeof(*tctx->prev_frame), + alloc_fail); for (i = 0; i < 3; i++) { - int m = 4*mtab->size/mtab->fmode[i].sub; - double freq = 2*M_PI/m; - tctx->cos_tabs[i] = av_malloc((m/4)*sizeof(*tctx->cos_tabs)); - - for (j = 0; j <= m/8; j++) - tctx->cos_tabs[i][j] = cos((2*j + 1)*freq); - for (j = 1; j < m/8; j++) - tctx->cos_tabs[i][m/4-j] = tctx->cos_tabs[i][j]; + int m = 4 * mtab->size / mtab->fmode[i].sub; + double freq = 2 * M_PI / m; + FF_ALLOC_OR_GOTO(tctx->avctx, tctx->cos_tabs[i], + (m / 4) * sizeof(*tctx->cos_tabs[i]), alloc_fail); + + for (j = 0; j <= m / 8; j++) + tctx->cos_tabs[i][j] = cos((2 * j + 1) * freq); + for (j = 1; j < m / 8; j++) + tctx->cos_tabs[i][m / 4 - j] = tctx->cos_tabs[i][j]; } - ff_init_ff_sine_windows(av_log2(size_m)); - ff_init_ff_sine_windows(av_log2(size_s/2)); + ff_init_ff_sine_windows(av_log2(size_s / 2)); ff_init_ff_sine_windows(av_log2(mtab->size)); + + return 0; + +alloc_fail: + return AVERROR(ENOMEM); } /** @@ -908,40 +592,39 @@ static av_cold void init_mdct_win(TwinContext *tctx) static void permutate_in_line(int16_t *tab, int num_vect, int num_blocks, int block_size, const uint8_t line_len[2], int length_div, - enum FrameType ftype) - + enum TwinVQFrameType ftype) { - int i,j; + int i, j; for (i = 0; i < line_len[0]; i++) { int shift; - if (num_blocks == 1 || - (ftype == FT_LONG && num_vect % num_blocks) || - (ftype != FT_LONG && num_vect & 1 ) || + if (num_blocks == 1 || + (ftype == TWINVQ_FT_LONG && num_vect % num_blocks) || + (ftype != TWINVQ_FT_LONG && num_vect & 1) || i == line_len[1]) { shift = 0; - } else if (ftype == FT_LONG) { + } else if (ftype == TWINVQ_FT_LONG) { shift = i; } else - shift = i*i; + shift = i * i; - for (j = 0; j < num_vect && (j+num_vect*i < block_size*num_blocks); j++) - tab[i*num_vect+j] = i*num_vect + (j + shift) % num_vect; + for (j = 0; j < num_vect && (j + num_vect * i < block_size * num_blocks); j++) + tab[i * num_vect + j] = i * num_vect + (j + shift) % num_vect; } } /** * Interpret the input data as in the following table: * - * \verbatim + * @verbatim * * abcdefgh * ijklmnop * qrstuvw * x123456 * - * \endverbatim + * @endverbatim * * and transpose it, giving the output * aiqxbjr1cks2dlt3emu4fvn5gow6hp @@ -949,34 +632,37 @@ static void permutate_in_line(int16_t *tab, int num_vect, int num_blocks, static void transpose_perm(int16_t *out, int16_t *in, int num_vect, const uint8_t line_len[2], int length_div) { - int i,j; - int cont= 0; + int i, j; + int cont = 0; + for (i = 0; i < num_vect; i++) for (j = 0; j < line_len[i >= length_div]; j++) - out[cont++] = in[j*num_vect + i]; + out[cont++] = in[j * num_vect + i]; } static void linear_perm(int16_t *out, int16_t *in, int n_blocks, int size) { - int block_size = size/n_blocks; + int block_size = size / n_blocks; int i; for (i = 0; i < size; i++) out[i] = block_size * (in[i] % n_blocks) + in[i] / n_blocks; } -static av_cold void construct_perm_table(TwinContext *tctx,enum FrameType ftype) +static av_cold void construct_perm_table(TwinVQContext *tctx, + enum TwinVQFrameType ftype) { - int block_size; - const ModeTab *mtab = tctx->mtab; - int size = tctx->avctx->channels*mtab->fmode[ftype].sub; - int16_t *tmp_perm = (int16_t *) tctx->tmp_buf; + int block_size, size; + const TwinVQModeTab *mtab = tctx->mtab; + int16_t *tmp_perm = (int16_t *)tctx->tmp_buf; - if (ftype == FT_PPC) { - size = tctx->avctx->channels; + if (ftype == TWINVQ_FT_PPC) { + size = tctx->avctx->channels; block_size = mtab->ppc_shape_len; - } else + } else { + size = tctx->avctx->channels * mtab->fmode[ftype].sub; block_size = mtab->size / mtab->fmode[ftype].sub; + } permutate_in_line(tmp_perm, tctx->n_div[ftype], size, block_size, tctx->length[ftype], @@ -986,120 +672,87 @@ static av_cold void construct_perm_table(TwinContext *tctx,enum FrameType ftype) tctx->length[ftype], tctx->length_change[ftype]); linear_perm(tctx->permut[ftype], tctx->permut[ftype], size, - size*block_size); + size * block_size); } -static av_cold void init_bitstream_params(TwinContext *tctx) +static av_cold void init_bitstream_params(TwinVQContext *tctx) { - const ModeTab *mtab = tctx->mtab; - int n_ch = tctx->avctx->channels; - int total_fr_bits = tctx->avctx->bit_rate*mtab->size/ - tctx->avctx->sample_rate; + const TwinVQModeTab *mtab = tctx->mtab; + int n_ch = tctx->avctx->channels; + int total_fr_bits = tctx->avctx->bit_rate * mtab->size / + tctx->avctx->sample_rate; - int lsp_bits_per_block = n_ch*(mtab->lsp_bit0 + mtab->lsp_bit1 + - mtab->lsp_split*mtab->lsp_bit2); + int lsp_bits_per_block = n_ch * (mtab->lsp_bit0 + mtab->lsp_bit1 + + mtab->lsp_split * mtab->lsp_bit2); - int ppc_bits = n_ch*(mtab->pgain_bit + mtab->ppc_shape_bit + - mtab->ppc_period_bit); + int ppc_bits = n_ch * (mtab->pgain_bit + mtab->ppc_shape_bit + + mtab->ppc_period_bit); - int bsize_no_main_cb[3]; - int bse_bits[3]; - int i; - enum FrameType frametype; + int bsize_no_main_cb[3], bse_bits[3], i; + enum TwinVQFrameType frametype; for (i = 0; i < 3; i++) // +1 for history usage switch bse_bits[i] = n_ch * - (mtab->fmode[i].bark_n_coef * mtab->fmode[i].bark_n_bit + 1); + (mtab->fmode[i].bark_n_coef * + mtab->fmode[i].bark_n_bit + 1); bsize_no_main_cb[2] = bse_bits[2] + lsp_bits_per_block + ppc_bits + - WINDOW_TYPE_BITS + n_ch*GAIN_BITS; + TWINVQ_WINDOW_TYPE_BITS + n_ch * TWINVQ_GAIN_BITS; for (i = 0; i < 2; i++) bsize_no_main_cb[i] = - lsp_bits_per_block + n_ch*GAIN_BITS + WINDOW_TYPE_BITS + - mtab->fmode[i].sub*(bse_bits[i] + n_ch*SUB_GAIN_BITS); + lsp_bits_per_block + n_ch * TWINVQ_GAIN_BITS + + TWINVQ_WINDOW_TYPE_BITS + + mtab->fmode[i].sub * (bse_bits[i] + n_ch * TWINVQ_SUB_GAIN_BITS); + + if (tctx->codec == TWINVQ_CODEC_METASOUND && !tctx->is_6kbps) { + bsize_no_main_cb[1] += 2; + bsize_no_main_cb[2] += 2; + } // The remaining bits are all used for the main spectrum coefficients for (i = 0; i < 4; i++) { - int bit_size; - int vect_size; + int bit_size, vect_size; int rounded_up, rounded_down, num_rounded_down, num_rounded_up; if (i == 3) { bit_size = n_ch * mtab->ppc_shape_bit; vect_size = n_ch * mtab->ppc_shape_len; } else { - bit_size = total_fr_bits - bsize_no_main_cb[i]; + bit_size = total_fr_bits - bsize_no_main_cb[i]; vect_size = n_ch * mtab->size; } tctx->n_div[i] = (bit_size + 13) / 14; - rounded_up = (bit_size + tctx->n_div[i] - 1)/tctx->n_div[i]; - rounded_down = (bit_size )/tctx->n_div[i]; - num_rounded_down = rounded_up * tctx->n_div[i] - bit_size; - num_rounded_up = tctx->n_div[i] - num_rounded_down; - tctx->bits_main_spec[0][i][0] = (rounded_up + 1)/2; - tctx->bits_main_spec[1][i][0] = (rounded_up )/2; - tctx->bits_main_spec[0][i][1] = (rounded_down + 1)/2; - tctx->bits_main_spec[1][i][1] = (rounded_down )/2; + rounded_up = (bit_size + tctx->n_div[i] - 1) / + tctx->n_div[i]; + rounded_down = (bit_size) / tctx->n_div[i]; + num_rounded_down = rounded_up * tctx->n_div[i] - bit_size; + num_rounded_up = tctx->n_div[i] - num_rounded_down; + tctx->bits_main_spec[0][i][0] = (rounded_up + 1) / 2; + tctx->bits_main_spec[1][i][0] = rounded_up / 2; + tctx->bits_main_spec[0][i][1] = (rounded_down + 1) / 2; + tctx->bits_main_spec[1][i][1] = rounded_down / 2; tctx->bits_main_spec_change[i] = num_rounded_up; - rounded_up = (vect_size + tctx->n_div[i] - 1)/tctx->n_div[i]; - rounded_down = (vect_size )/tctx->n_div[i]; - num_rounded_down = rounded_up * tctx->n_div[i] - vect_size; - num_rounded_up = tctx->n_div[i] - num_rounded_down; - tctx->length[i][0] = rounded_up; - tctx->length[i][1] = rounded_down; + rounded_up = (vect_size + tctx->n_div[i] - 1) / + tctx->n_div[i]; + rounded_down = (vect_size) / tctx->n_div[i]; + num_rounded_down = rounded_up * tctx->n_div[i] - vect_size; + num_rounded_up = tctx->n_div[i] - num_rounded_down; + tctx->length[i][0] = rounded_up; + tctx->length[i][1] = rounded_down; tctx->length_change[i] = num_rounded_up; } - for (frametype = FT_SHORT; frametype <= FT_PPC; frametype++) + for (frametype = TWINVQ_FT_SHORT; frametype <= TWINVQ_FT_PPC; frametype++) construct_perm_table(tctx, frametype); } -static av_cold int twin_decode_init(AVCodecContext *avctx) -{ - TwinContext *tctx = avctx->priv_data; - int isampf = avctx->sample_rate/1000; - int ibps = avctx->bit_rate/(1000 * avctx->channels); - - tctx->avctx = avctx; - avctx->sample_fmt = SAMPLE_FMT_FLT; - - if (avctx->channels > 2) { - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %i\n", - avctx->channels); - return -1; - } - - switch ((isampf << 8) + ibps) { - case (8 <<8) + 8: tctx->mtab = &mode_08_08; break; - case (11<<8) + 8: tctx->mtab = &mode_11_08; break; - case (11<<8) + 10: tctx->mtab = &mode_11_10; break; - case (16<<8) + 16: tctx->mtab = &mode_16_16; break; - case (22<<8) + 20: tctx->mtab = &mode_22_20; break; - case (22<<8) + 24: tctx->mtab = &mode_22_24; break; - case (22<<8) + 32: tctx->mtab = &mode_22_32; break; - case (44<<8) + 40: tctx->mtab = &mode_44_40; break; - case (44<<8) + 48: tctx->mtab = &mode_44_48; break; - default: - av_log(avctx, AV_LOG_ERROR, "This version does not support %d kHz - %d kbit/s/ch mode.\n", isampf, isampf); - return -1; - } - - dsputil_init(&tctx->dsp, avctx); - init_mdct_win(tctx); - init_bitstream_params(tctx); - - memset_float(tctx->bark_hist[0][0], 0.1, FF_ARRAY_ELEMS(tctx->bark_hist)); - - return 0; -} - -static av_cold int twin_decode_close(AVCodecContext *avctx) +av_cold int ff_twinvq_decode_close(AVCodecContext *avctx) { - TwinContext *tctx = avctx->priv_data; + TwinVQContext *tctx = avctx->priv_data; int i; for (i = 0; i < 3; i++) { @@ -1107,7 +760,6 @@ static av_cold int twin_decode_close(AVCodecContext *avctx) av_free(tctx->cos_tabs[i]); } - av_free(tctx->curr_frame); av_free(tctx->spectrum); av_free(tctx->prev_frame); @@ -1116,15 +768,38 @@ static av_cold int twin_decode_close(AVCodecContext *avctx) return 0; } -AVCodec twinvq_decoder = +av_cold int ff_twinvq_decode_init(AVCodecContext *avctx) { - "twinvq", - AVMEDIA_TYPE_AUDIO, - CODEC_ID_TWINVQ, - sizeof(TwinContext), - twin_decode_init, - NULL, - twin_decode_close, - twin_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("VQF TwinVQ"), -}; + int ret; + TwinVQContext *tctx = avctx->priv_data; + + tctx->avctx = avctx; + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + + if (!avctx->block_align) { + avctx->block_align = tctx->frame_size + 7 >> 3; + } else if (avctx->block_align * 8 < tctx->frame_size) { + av_log(avctx, AV_LOG_ERROR, "Block align is %d bits, expected %d\n", + avctx->block_align * 8, tctx->frame_size); + return AVERROR_INVALIDDATA; + } + tctx->frames_per_packet = avctx->block_align * 8 / tctx->frame_size; + if (tctx->frames_per_packet > TWINVQ_MAX_FRAMES_PER_PACKET) { + av_log(avctx, AV_LOG_ERROR, "Too many frames per packet (%d)\n", + tctx->frames_per_packet); + return AVERROR_INVALIDDATA; + } + + avpriv_float_dsp_init(&tctx->fdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT); + if ((ret = init_mdct_win(tctx))) { + av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); + ff_twinvq_decode_close(avctx); + return ret; + } + init_bitstream_params(tctx); + + twinvq_memset_float(tctx->bark_hist[0][0], 0.1, + FF_ARRAY_ELEMS(tctx->bark_hist)); + + return 0; +}