diff options
Diffstat (limited to 'libavcodec/shorten.c')
-rw-r--r-- | libavcodec/shorten.c | 268 |
1 files changed, 192 insertions, 76 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index ee6dc70..e4cef61 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -2,20 +2,20 @@ * Shorten decoder * Copyright (c) 2005 Jeff Muizelaar * - * 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 */ @@ -49,8 +49,12 @@ #define ENERGYSIZE 3 #define BITSHIFTSIZE 2 +#define TYPE_S8 1 +#define TYPE_U8 2 #define TYPE_S16HL 3 +#define TYPE_U16HL 4 #define TYPE_S16LH 5 +#define TYPE_U16LH 6 #define NWRAP 3 #define NSKIPSIZE 1 @@ -111,7 +115,6 @@ static av_cold int shorten_decode_init(AVCodecContext *avctx) { ShortenContext *s = avctx->priv_data; s->avctx = avctx; - avctx->sample_fmt = AV_SAMPLE_FMT_S16P; return 0; } @@ -125,19 +128,18 @@ static int allocate_buffers(ShortenContext *s) av_log(s->avctx, AV_LOG_ERROR, "nmean too large\n"); return AVERROR_INVALIDDATA; } - if (s->blocksize + s->nwrap >= UINT_MAX / sizeof(int32_t) || - s->blocksize + s->nwrap <= (unsigned)s->nwrap) { + if (s->blocksize + (uint64_t)s->nwrap >= UINT_MAX / sizeof(int32_t)) { av_log(s->avctx, AV_LOG_ERROR, "s->blocksize + s->nwrap too large\n"); return AVERROR_INVALIDDATA; } - if ((err = av_reallocp(&s->offset[chan], - sizeof(int32_t) * + if ((err = av_reallocp_array(&s->offset[chan], + sizeof(int32_t), FFMAX(1, s->nmean))) < 0) return err; - if ((err = av_reallocp(&s->decoded_base[chan], (s->blocksize + s->nwrap) * + if ((err = av_reallocp_array(&s->decoded_base[chan], (s->blocksize + s->nwrap), sizeof(s->decoded_base[0][0]))) < 0) return err; for (i = 0; i < s->nwrap; i++) @@ -145,7 +147,7 @@ static int allocate_buffers(ShortenContext *s) s->decoded[chan] = s->decoded_base[chan] + s->nwrap; } - if ((err = av_reallocp(&s->coeffs, s->nwrap * sizeof(*s->coeffs))) < 0) + if ((err = av_reallocp_array(&s->coeffs, s->nwrap, sizeof(*s->coeffs))) < 0) return err; return 0; @@ -162,9 +164,13 @@ static void fix_bitshift(ShortenContext *s, int32_t *buffer) { int i; - if (s->bitshift != 0) + if (s->bitshift == 32) { + for (i = 0; i < s->blocksize; i++) + buffer[i] = 0; + } else if (s->bitshift != 0) { for (i = 0; i < s->blocksize; i++) buffer[i] <<= s->bitshift; + } } static int init_offset(ShortenContext *s) @@ -174,13 +180,17 @@ static int init_offset(ShortenContext *s) int nblock = FFMAX(1, s->nmean); /* initialise offset */ switch (s->internal_ftype) { + case TYPE_U8: + s->avctx->sample_fmt = AV_SAMPLE_FMT_U8P; + mean = 0x80; + break; case TYPE_S16HL: case TYPE_S16LH: - mean = 0; + s->avctx->sample_fmt = AV_SAMPLE_FMT_S16P; break; default: - av_log(s->avctx, AV_LOG_ERROR, "unknown audio type"); - return AVERROR_INVALIDDATA; + av_log(s->avctx, AV_LOG_ERROR, "unknown audio type\n"); + return AVERROR_PATCHWELCOME; } for (chan = 0; chan < s->channels; chan++) @@ -189,10 +199,74 @@ static int init_offset(ShortenContext *s) return 0; } +static int decode_aiff_header(AVCodecContext *avctx, const uint8_t *header, + int header_size) +{ + int len, bps, exp; + GetByteContext gb; + uint64_t val; + uint32_t tag; + + bytestream2_init(&gb, header, header_size); + + if (bytestream2_get_le32(&gb) != MKTAG('F', 'O', 'R', 'M')) { + av_log(avctx, AV_LOG_ERROR, "missing FORM tag\n"); + return AVERROR_INVALIDDATA; + } + + bytestream2_skip(&gb, 4); /* chunk size */ + + tag = bytestream2_get_le32(&gb); + if (tag != MKTAG('A', 'I', 'F', 'F')) { + av_log(avctx, AV_LOG_ERROR, "missing AIFF tag\n"); + return AVERROR_INVALIDDATA; + } + + while (bytestream2_get_le32(&gb) != MKTAG('C', 'O', 'M', 'M')) { + len = bytestream2_get_be32(&gb); + bytestream2_skip(&gb, len + (len & 1)); + if (len < 0 || bytestream2_get_bytes_left(&gb) < 18) { + av_log(avctx, AV_LOG_ERROR, "no COMM chunk found\n"); + return AVERROR_INVALIDDATA; + } + } + len = bytestream2_get_be32(&gb); + + if (len < 18) { + av_log(avctx, AV_LOG_ERROR, "COMM chunk was too short\n"); + return AVERROR_INVALIDDATA; + } + + bytestream2_skip(&gb, 6); + bps = bytestream2_get_be16(&gb); + avctx->bits_per_coded_sample = bps; + + if (bps != 16 && bps != 8) { + av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample: %d\n", bps); + return AVERROR(ENOSYS); + } + + exp = bytestream2_get_be16(&gb) - 16383 - 63; + val = bytestream2_get_be64(&gb); + if (exp < -63 || exp > 63) { + av_log(avctx, AV_LOG_ERROR, "exp %d is out of range\n", exp); + return AVERROR_INVALIDDATA; + } + if (exp >= 0) + avctx->sample_rate = val << exp; + else + avctx->sample_rate = (val + (1ULL<<(-exp-1))) >> -exp; + len -= 18; + if (len > 0) + av_log(avctx, AV_LOG_INFO, "%d header bytes unparsed\n", len); + + return 0; +} + static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, int header_size) { - int len; + int len, bps; short wave_format; GetByteContext gb; @@ -213,7 +287,7 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, while (bytestream2_get_le32(&gb) != MKTAG('f', 'm', 't', ' ')) { len = bytestream2_get_le32(&gb); bytestream2_skip(&gb, len); - if (bytestream2_get_bytes_left(&gb) < 16) { + if (len < 0 || bytestream2_get_bytes_left(&gb) < 16) { av_log(avctx, AV_LOG_ERROR, "no fmt chunk found\n"); return AVERROR_INVALIDDATA; } @@ -239,10 +313,11 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, avctx->sample_rate = bytestream2_get_le32(&gb); bytestream2_skip(&gb, 4); // skip bit rate (represents original uncompressed bit rate) bytestream2_skip(&gb, 2); // skip block align (not needed) - avctx->bits_per_coded_sample = bytestream2_get_le16(&gb); + bps = bytestream2_get_le16(&gb); + avctx->bits_per_coded_sample = bps; - if (avctx->bits_per_coded_sample != 16) { - av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample\n"); + if (bps != 16 && bps != 8) { + av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample: %d\n", bps); return AVERROR(ENOSYS); } @@ -253,18 +328,6 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, return 0; } -static void output_buffer(int16_t **samples, int nchan, int blocksize, - int32_t **buffer) -{ - int i, ch; - for (ch = 0; ch < nchan; ch++) { - int32_t *in = buffer[ch]; - int16_t *out = samples[ch]; - for (i = 0; i < blocksize; i++) - out[i] = av_clip_int16(in[i]); - } -} - static const int fixed_coeffs[][3] = { { 0, 0, 0 }, { 1, 0, 0 }, @@ -281,7 +344,7 @@ static int decode_subframe_lpc(ShortenContext *s, int command, int channel, if (command == FN_QLPC) { /* read/validate prediction order */ pred_order = get_ur_golomb_shorten(&s->gb, LPCQSIZE); - if (pred_order > s->nwrap) { + if ((unsigned)pred_order > s->nwrap) { av_log(s->avctx, AV_LOG_ERROR, "invalid pred_order %d\n", pred_order); return AVERROR(EINVAL); @@ -373,6 +436,11 @@ static int read_header(ShortenContext *s) s->nmean = get_uint(s, 0); skip_bytes = get_uint(s, NSKIPSIZE); + if ((unsigned)skip_bytes > get_bits_left(&s->gb)/8) { + av_log(s->avctx, AV_LOG_ERROR, "invalid skip_bytes: %d\n", skip_bytes); + return AVERROR_INVALIDDATA; + } + for (i = 0; i < skip_bytes; i++) skip_bits(&s->gb, 8); } @@ -387,6 +455,9 @@ static int read_header(ShortenContext *s) if (s->version > 1) s->lpcqoffset = V2LPCQOFFSET; + if (s->avctx->extradata_size > 0) + goto end; + if (get_ur_golomb_shorten(&s->gb, FNSIZE) != FN_VERBATIM) { av_log(s->avctx, AV_LOG_ERROR, "missing verbatim section at beginning of stream\n"); @@ -404,9 +475,18 @@ static int read_header(ShortenContext *s) for (i = 0; i < s->header_size; i++) s->header[i] = (char)get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE); - if ((ret = decode_wave_header(s->avctx, s->header, s->header_size)) < 0) - return ret; + if (AV_RL32(s->header) == MKTAG('R','I','F','F')) { + if ((ret = decode_wave_header(s->avctx, s->header, s->header_size)) < 0) + return ret; + } else if (AV_RL32(s->header) == MKTAG('F','O','R','M')) { + if ((ret = decode_aiff_header(s->avctx, s->header, s->header_size)) < 0) + return ret; + } else { + avpriv_report_missing_feature(s->avctx, "unsupported bit packing %X", AV_RL32(s->header)); + return AVERROR_PATCHWELCOME; + } +end: s->cur_chan = 0; s->bitshift = 0; @@ -428,51 +508,68 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, /* allocate internal bitstream buffer */ if (s->max_framesize == 0) { void *tmp_ptr; - s->max_framesize = 1024; // should hopefully be enough for the first header + s->max_framesize = 8192; // should hopefully be enough for the first header tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize + AV_INPUT_BUFFER_PADDING_SIZE); if (!tmp_ptr) { + s->max_framesize = 0; av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n"); return AVERROR(ENOMEM); } + memset(tmp_ptr, 0, s->allocated_bitstream_size); s->bitstream = tmp_ptr; } /* append current packet data to bitstream buffer */ - if (1 && s->max_framesize) { //FIXME truncated - buf_size = FFMIN(buf_size, s->max_framesize - s->bitstream_size); - input_buf_size = buf_size; - - if (s->bitstream_index + s->bitstream_size + buf_size > - s->allocated_bitstream_size) { - memmove(s->bitstream, &s->bitstream[s->bitstream_index], - s->bitstream_size); - s->bitstream_index = 0; - } - if (buf) - memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf, - buf_size); - buf = &s->bitstream[s->bitstream_index]; - buf_size += s->bitstream_size; - s->bitstream_size = buf_size; - - /* do not decode until buffer has at least max_framesize bytes or - * the end of the file has been reached */ - if (buf_size < s->max_framesize && avpkt->data) { - *got_frame_ptr = 0; - return input_buf_size; - } + buf_size = FFMIN(buf_size, s->max_framesize - s->bitstream_size); + input_buf_size = buf_size; + + if (s->bitstream_index + s->bitstream_size + buf_size + AV_INPUT_BUFFER_PADDING_SIZE > + s->allocated_bitstream_size) { + memmove(s->bitstream, &s->bitstream[s->bitstream_index], + s->bitstream_size); + s->bitstream_index = 0; + } + if (buf) + memcpy(&s->bitstream[s->bitstream_index + s->bitstream_size], buf, + buf_size); + buf = &s->bitstream[s->bitstream_index]; + buf_size += s->bitstream_size; + s->bitstream_size = buf_size; + + /* do not decode until buffer has at least max_framesize bytes or + * the end of the file has been reached */ + if (buf_size < s->max_framesize && avpkt->data) { + *got_frame_ptr = 0; + return input_buf_size; } /* init and position bitstream reader */ - init_get_bits(&s->gb, buf, buf_size * 8); + if ((ret = init_get_bits8(&s->gb, buf, buf_size)) < 0) + return ret; skip_bits(&s->gb, s->bitindex); /* process header or next subblock */ if (!s->got_header) { + if ((ret = read_header(s)) < 0) return ret; - *got_frame_ptr = 0; - goto finish_frame; + + if (avpkt->size) { + int max_framesize; + void *tmp_ptr; + + max_framesize = FFMAX(s->max_framesize, s->blocksize * s->channels * 8); + tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, + max_framesize + AV_INPUT_BUFFER_PADDING_SIZE); + if (!tmp_ptr) { + av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n"); + return AVERROR(ENOMEM); + } + s->bitstream = tmp_ptr; + s->max_framesize = max_framesize; + *got_frame_ptr = 0; + goto finish_frame; + } } /* if quit command was read previously, don't decode anything */ @@ -507,11 +604,16 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, while (len--) get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE); break; - case FN_BITSHIFT: - s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); - if (s->bitshift < 0) + case FN_BITSHIFT: { + unsigned bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); + if (bitshift > 32) { + av_log(avctx, AV_LOG_ERROR, "bitshift %d is invalid\n", + bitshift); return AVERROR_INVALIDDATA; + } + s->bitshift = bitshift; break; + } case FN_BLOCKSIZE: { unsigned blocksize = get_uint(s, av_log2(s->blocksize)); if (blocksize > s->blocksize) { @@ -531,10 +633,8 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, s->got_quit_command = 1; break; } - if (cmd == FN_BLOCKSIZE || cmd == FN_QUIT) { - *got_frame_ptr = 0; + if (cmd == FN_QUIT) break; - } } else { /* process audio command */ int residual_size = 0; @@ -559,7 +659,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, sum += s->offset[channel][i]; coffset = sum / s->nmean; if (s->version >= 2) - coffset >>= FFMIN(1, s->bitshift); + coffset = s->bitshift == 0 ? coffset : coffset >> s->bitshift - 1 >> 1; } /* decode samples for this channel */ @@ -584,7 +684,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, if (s->version < 2) s->offset[channel][s->nmean - 1] = sum / s->blocksize; else - s->offset[channel][s->nmean - 1] = (sum / s->blocksize) << s->bitshift; + s->offset[channel][s->nmean - 1] = s->bitshift == 32 ? 0 : (sum / s->blocksize) << s->bitshift; } /* copy wrap samples for use with next block */ @@ -598,15 +698,30 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, /* if this is the last channel in the block, output the samples */ s->cur_chan++; if (s->cur_chan == s->channels) { + uint8_t *samples_u8; + int16_t *samples_s16; + int chan; + /* get output buffer */ frame->nb_samples = s->blocksize; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; + + for (chan = 0; chan < s->channels; chan++) { + samples_u8 = ((uint8_t **)frame->extended_data)[chan]; + samples_s16 = ((int16_t **)frame->extended_data)[chan]; + for (i = 0; i < s->blocksize; i++) { + switch (s->internal_ftype) { + case TYPE_U8: + *samples_u8++ = av_clip_uint8(s->decoded[chan][i]); + break; + case TYPE_S16HL: + case TYPE_S16LH: + *samples_s16++ = av_clip_int16(s->decoded[chan][i]); + break; + } + } } - /* interleave output */ - output_buffer((int16_t **)frame->extended_data, s->channels, - s->blocksize, s->decoded); *got_frame_ptr = 1; } @@ -657,7 +772,8 @@ AVCodec ff_shorten_decoder = { .init = shorten_decode_init, .close = shorten_decode_close, .decode = shorten_decode_frame, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; |