From 429f742a61e79326c1b089e172694f847219c70d Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 12 Feb 2014 14:03:07 -0300 Subject: tta: split off hybrid filter processing as ttadsp Signed-off-by: James Almer Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/tta.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) (limited to 'libavcodec/tta.c') diff --git a/libavcodec/tta.c b/libavcodec/tta.c index b917881d65..19cdd8c7b2 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -30,6 +30,7 @@ #define BITSTREAM_READER_LE #include #include "ttadata.h" +#include "ttadsp.h" #include "avcodec.h" #include "get_bits.h" #include "thread.h" @@ -56,39 +57,9 @@ typedef struct TTAContext { uint8_t crc_pass[8]; uint8_t *pass; TTAChannel *ch_ctx; + TTADSPContext dsp; } TTAContext; -static inline void ttafilter_process(TTAFilter *c, int32_t *in) -{ - register int32_t *dl = c->dl, *qm = c->qm, *dx = c->dx, sum = c->round; - - if (c->error < 0) { - qm[0] -= dx[0]; qm[1] -= dx[1]; qm[2] -= dx[2]; qm[3] -= dx[3]; - qm[4] -= dx[4]; qm[5] -= dx[5]; qm[6] -= dx[6]; qm[7] -= dx[7]; - } else if (c->error > 0) { - qm[0] += dx[0]; qm[1] += dx[1]; qm[2] += dx[2]; qm[3] += dx[3]; - qm[4] += dx[4]; qm[5] += dx[5]; qm[6] += dx[6]; qm[7] += dx[7]; - } - - sum += dl[0] * qm[0] + dl[1] * qm[1] + dl[2] * qm[2] + dl[3] * qm[3] + - dl[4] * qm[4] + dl[5] * qm[5] + dl[6] * qm[6] + dl[7] * qm[7]; - - dx[0] = dx[1]; dx[1] = dx[2]; dx[2] = dx[3]; dx[3] = dx[4]; - dl[0] = dl[1]; dl[1] = dl[2]; dl[2] = dl[3]; dl[3] = dl[4]; - - dx[4] = ((dl[4] >> 30) | 1); - dx[5] = ((dl[5] >> 30) | 2) & ~1; - dx[6] = ((dl[6] >> 30) | 2) & ~1; - dx[7] = ((dl[7] >> 30) | 4) & ~3; - - c->error = *in; - *in += (sum >> c->shift); - - dl[4] = -dl[5]; dl[5] = -dl[6]; - dl[6] = *in - dl[7]; dl[7] = *in; - dl[5] += dl[6]; dl[4] += dl[5]; -} - static const int64_t tta_channel_layouts[7] = { AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY, @@ -234,6 +205,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) return AVERROR_INVALIDDATA; } + ff_ttadsp_init(&s->dsp); + return allocate_buffers(avctx); } @@ -335,7 +308,8 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, *p = 1 + ((value >> 1) ^ ((value & 1) - 1)); // run hybrid filter - ttafilter_process(filter, p); + s->dsp.ttafilter_process_dec(filter->qm, filter->dx, filter->dl, &filter->error, p, + filter->shift, filter->round); // fixed order prediction #define PRED(x, k) (int32_t)((((uint64_t)x << k) - x) >> k) -- cgit v1.2.3