diff options
Diffstat (limited to 'libavcodec/tta.c')
-rw-r--r-- | libavcodec/tta.c | 123 |
1 files changed, 61 insertions, 62 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 7825c0c..ce41cb3 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -2,20 +2,20 @@ * TTA (The Lossless True Audio) decoder * Copyright (c) 2006 Alex Beregszaszi * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -99,67 +99,35 @@ static void ttafilter_init(TTAFilter *c, int32_t shift) { // c->round = 1 << (shift - 1); } -// FIXME: copy paste from original -static inline void memshl(register int32_t *a, register int32_t *b) { - *a++ = *b++; - *a++ = *b++; - *a++ = *b++; - *a++ = *b++; - *a++ = *b++; - *a++ = *b++; - *a++ = *b++; - *a = *b; -} - 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) { - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - sum += *dl++ * *qm, qm++; - dx += 8; - } else if(c->error < 0) { - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - sum += *dl++ * (*qm -= *dx++), qm++; - } else { - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; - sum += *dl++ * (*qm += *dx++), qm++; + 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]; } - *(dx-0) = ((*(dl-1) >> 30) | 1) << 2; - *(dx-1) = ((*(dl-2) >> 30) | 1) << 1; - *(dx-2) = ((*(dl-3) >> 30) | 1) << 1; - *(dx-3) = ((*(dl-4) >> 30) | 1); + 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 = *in; - *(dl-1) = *dl - *(dl-1); - *(dl-2) = *(dl-1) - *(dl-2); - *(dl-3) = *(dl-2) - *(dl-3); - - memshl(c->dl, c->dl + 1); - memshl(c->dx, c->dx + 1); + 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 void rice_init(TTARice *c, uint32_t k0, uint32_t k1) @@ -180,6 +148,16 @@ static int tta_get_unary(GetBitContext *gb) return ret; } +static const int64_t tta_channel_layouts[7] = { + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY, + AV_CH_LAYOUT_QUAD, + 0, + AV_CH_LAYOUT_5POINT1_BACK, + AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER, + AV_CH_LAYOUT_7POINT1_WIDE +}; + static int tta_check_crc(TTAContext *s, const uint8_t *buf, int buf_size) { uint32_t crc, CRC; @@ -225,6 +203,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) return AVERROR(EINVAL); } avctx->channels = s->channels = get_bits(&s->gb, 16); + if (s->channels > 1 && s->channels < 9) + avctx->channel_layout = tta_channel_layouts[s->channels-2]; avctx->bits_per_coded_sample = get_bits(&s->gb, 16); s->bps = (avctx->bits_per_coded_sample + 7) / 8; avctx->sample_rate = get_bits_long(&s->gb, 32); @@ -240,6 +220,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) } switch(s->bps) { + case 1: avctx->sample_fmt = AV_SAMPLE_FMT_U8; break; case 2: avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->bits_per_raw_sample = 16; @@ -248,6 +229,7 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) avctx->sample_fmt = AV_SAMPLE_FMT_S32; avctx->bits_per_raw_sample = 24; break; + //case 4: avctx->sample_fmt = AV_SAMPLE_FMT_S32; break; default: av_log(avctx, AV_LOG_ERROR, "Invalid/unsupported sample format.\n"); return AVERROR_INVALIDDATA; @@ -270,12 +252,15 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) av_log(s->avctx, AV_LOG_DEBUG, "data_length: %d frame_length: %d last: %d total: %d\n", s->data_length, s->frame_length, s->last_frame_length, s->total_frames); + if (s->total_frames < 0) + return AVERROR_INVALIDDATA; + // FIXME: seek table if (avctx->extradata_size <= 26 || s->total_frames > INT_MAX / 4 || avctx->extradata_size - 26 < s->total_frames * 4) av_log(avctx, AV_LOG_WARNING, "Seek table missing or too small\n"); else if (avctx->err_recognition & AV_EF_CRCCHECK) { - if (tta_check_crc(s, avctx->extradata + 22, s->total_frames * 4)) + if (avctx->extradata_size < 26 + s->total_frames * 4 || tta_check_crc(s, avctx->extradata + 22, s->total_frames * 4)) return AVERROR_INVALIDDATA; } skip_bits_long(&s->gb, 32 * s->total_frames); @@ -286,11 +271,12 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) return -1; } - if (s->bps == 2) { + if (s->bps < 3) { s->decode_buffer = av_mallocz(sizeof(int32_t)*s->frame_length*s->channels); if (!s->decode_buffer) return AVERROR(ENOMEM); - } + } else + s->decode_buffer = NULL; s->ch_ctx = av_malloc(avctx->channels * sizeof(*s->ch_ctx)); if (!s->ch_ctx) { av_freep(&s->decode_buffer); @@ -433,17 +419,28 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, skip_bits_long(&s->gb, 32); // frame crc // convert to output buffer - if (s->bps == 2) { + switch (s->bps) { + case 1: { + uint8_t *samples = (uint8_t *)s->frame.data[0]; + for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) + *samples++ = *p + 0x80; + break; + } + case 2: { int16_t *samples = (int16_t *)s->frame.data[0]; for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) *samples++ = *p; - } else { + break; + } + case 3: { // shift samples for 24-bit sample format int32_t *samples = (int32_t *)s->frame.data[0]; - for (i = 0; i < framelen * s->channels; i++) + for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++) *samples++ <<= 8; // reset decode buffer s->decode_buffer = NULL; + break; + } } *got_frame_ptr = 1; @@ -460,7 +457,9 @@ error: static av_cold int tta_decode_close(AVCodecContext *avctx) { TTAContext *s = avctx->priv_data; - av_free(s->decode_buffer); + if (s->bps < 3) + av_free(s->decode_buffer); + s->decode_buffer = NULL; av_freep(&s->ch_ctx); return 0; |