diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 33ac2b3b36..b375720b1e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -552,7 +552,7 @@ OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o OBJS-$(CONFIG_TSCC_DECODER) += tscc.o msrledec.o OBJS-$(CONFIG_TSCC2_DECODER) += tscc2.o OBJS-$(CONFIG_TTA_DECODER) += tta.o ttadata.o ttadsp.o -OBJS-$(CONFIG_TTA_ENCODER) += ttaenc.o ttadata.o +OBJS-$(CONFIG_TTA_ENCODER) += ttaenc.o ttaencdsp.o ttadata.o OBJS-$(CONFIG_TWINVQ_DECODER) += twinvqdec.o twinvq.o OBJS-$(CONFIG_TXD_DECODER) += txd.o OBJS-$(CONFIG_ULTI_DECODER) += ulti.o diff --git a/libavcodec/ttaenc.c b/libavcodec/ttaenc.c index 2f1c8db556..3cc54d78c5 100644 --- a/libavcodec/ttaenc.c +++ b/libavcodec/ttaenc.c @@ -20,6 +20,7 @@ #define BITSTREAM_WRITER_LE #include "ttadata.h" +#include "ttaencdsp.h" #include "avcodec.h" #include "put_bits.h" #include "internal.h" @@ -29,6 +30,7 @@ typedef struct TTAEncContext { const AVCRC *crc_table; int bps; TTAChannel *ch_ctx; + TTAEncDSPContext dsp; } TTAEncContext; static av_cold int tta_encode_init(AVCodecContext *avctx) @@ -57,38 +59,9 @@ static av_cold int tta_encode_init(AVCodecContext *avctx) if (!s->ch_ctx) return AVERROR(ENOMEM); - return 0; -} - -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]; - } + ff_ttaencdsp_init(&s->dsp); - 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; - - dl[4] = -dl[5]; dl[5] = -dl[6]; - dl[6] = *in - dl[7]; dl[7] = *in; - dl[5] += dl[6]; dl[4] += dl[5]; - - *in -= (sum >> c->shift); - c->error = *in; + return 0; } static int32_t get_sample(const AVFrame *frame, int sample, @@ -155,7 +128,8 @@ pkt_alloc: } c->predictor = temp; - ttafilter_process(filter, &value); + s->dsp.filter_process(filter->qm, filter->dx, filter->dl, &filter->error, &value, + filter->shift, filter->round); outval = (value > 0) ? (value << 1) - 1: -value << 1; k = rice->k0; diff --git a/libavcodec/ttaencdsp.c b/libavcodec/ttaencdsp.c new file mode 100644 index 0000000000..f407e78dd1 --- /dev/null +++ b/libavcodec/ttaencdsp.c @@ -0,0 +1,55 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/attributes.h" +#include "ttaencdsp.h" + +static void ttaenc_filter_process_c(int32_t *qm, int32_t *dx, int32_t *dl, + int32_t *error, int32_t *in, int32_t shift, + int32_t round) { + if (*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 (*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]; + } + + round += 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; + + dl[4] = -dl[5]; dl[5] = -dl[6]; + dl[6] = *in - dl[7]; dl[7] = *in; + dl[5] += dl[6]; dl[4] += dl[5]; + + *in -= (round >> shift); + *error = *in; +} + +av_cold void ff_ttaencdsp_init(TTAEncDSPContext *c) +{ + c->filter_process = ttaenc_filter_process_c; +} diff --git a/libavcodec/ttaencdsp.h b/libavcodec/ttaencdsp.h new file mode 100644 index 0000000000..950423d619 --- /dev/null +++ b/libavcodec/ttaencdsp.h @@ -0,0 +1,32 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_TTAENCDSP_H +#define AVCODEC_TTAENCDSP_H + +#include + +typedef struct TTAEncDSPContext { + void (*filter_process)(int32_t *qm, int32_t *dx, int32_t *dl, + int32_t *error, int32_t *in, int32_t shift, + int32_t round); +} TTAEncDSPContext; + +void ff_ttaencdsp_init(TTAEncDSPContext *c); + +#endif /* AVCODEC_TTAENCDSP_H */