#include "libavutil/internal.h"
#include "libavutil/samplefmt.h"
#include "tak.h"
+#include "audiodsp.h"
#include "thread.h"
#include "avcodec.h"
-#include "dsputil.h"
#include "internal.h"
#include "unary.h"
typedef struct TAKDecContext {
AVCodecContext *avctx; ///< parent AVCodecContext
- DSPContext dsp;
+ AudioDSPContext adsp;
TAKStreamInfo ti;
GetBitContext gb; ///< bitstream reader initialized to start at the current frame
{
TAKDecContext *s = avctx->priv_data;
- ff_dsputil_init(&s->dsp, avctx);
+ ff_audiodsp_init(&s->adsp);
s->avctx = avctx;
avctx->bits_per_raw_sample = avctx->bits_per_coded_sample;
int v = 1 << (filter_quant - 1);
if (filter_order & -16)
- v += s->dsp.scalarproduct_int16(&s->residues[i], s->filter,
- filter_order & -16);
+ v += s->adsp.scalarproduct_int16(&s->residues[i], s->filter,
+ filter_order & -16);
for (j = filter_order & -16; j < filter_order; j += 4) {
v += s->residues[i + j + 3] * s->filter[j + 3] +
s->residues[i + j + 2] * s->filter[j + 2] +
int v = 1 << 9;
if (filter_order == 16) {
- v += s->dsp.scalarproduct_int16(&s->residues[i], s->filter,
- filter_order);
+ v += s->adsp.scalarproduct_int16(&s->residues[i], s->filter,
+ filter_order);
} else {
v += s->residues[i + 7] * s->filter[7] +
s->residues[i + 6] * s->filter[6] +