diff options
Diffstat (limited to 'libavcodec/shorten.c')
-rw-r--r-- | libavcodec/shorten.c | 109 |
1 files changed, 63 insertions, 46 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index fad69b8d08..cbfa23a4e5 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 */ @@ -50,8 +50,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 @@ -113,7 +117,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; avcodec_get_frame_defaults(&s->frame); avctx->coded_frame = &s->frame; @@ -130,11 +133,11 @@ static int allocate_buffers(ShortenContext *s) for (chan=0; chan<s->channels; chan++) { if(FFMAX(1, s->nmean) >= UINT_MAX/sizeof(int32_t)){ av_log(s->avctx, AV_LOG_ERROR, "nmean too large\n"); - return -1; + return AVERROR_INVALIDDATA; } if(s->blocksize + s->nwrap >= UINT_MAX/sizeof(int32_t) || s->blocksize + s->nwrap <= (unsigned)s->nwrap){ av_log(s->avctx, AV_LOG_ERROR, "s->blocksize + s->nwrap too large\n"); - return -1; + return AVERROR_INVALIDDATA; } tmp_ptr = av_realloc(s->offset[chan], sizeof(int32_t)*FFMAX(1, s->nmean)); @@ -187,13 +190,17 @@ static int init_offset(ShortenContext *s) /* 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++) @@ -205,31 +212,33 @@ static int init_offset(ShortenContext *s) static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, int header_size) { - int len; + int len, bps; short wave_format; - + const uint8_t *end= header + header_size; if (bytestream_get_le32(&header) != MKTAG('R','I','F','F')) { av_log(avctx, AV_LOG_ERROR, "missing RIFF tag\n"); - return -1; + return AVERROR_INVALIDDATA; } header += 4; /* chunk size */; if (bytestream_get_le32(&header) != MKTAG('W','A','V','E')) { av_log(avctx, AV_LOG_ERROR, "missing WAVE tag\n"); - return -1; + return AVERROR_INVALIDDATA; } while (bytestream_get_le32(&header) != MKTAG('f','m','t',' ')) { len = bytestream_get_le32(&header); + if(len<0 || end - header - 8 < len) + return AVERROR_INVALIDDATA; header += len; } len = bytestream_get_le32(&header); if (len < 16) { av_log(avctx, AV_LOG_ERROR, "fmt chunk was too short\n"); - return -1; + return AVERROR_INVALIDDATA; } wave_format = bytestream_get_le16(&header); @@ -239,18 +248,19 @@ static int decode_wave_header(AVCodecContext *avctx, const uint8_t *header, break; default: av_log(avctx, AV_LOG_ERROR, "unsupported wave format\n"); - return -1; + return AVERROR_PATCHWELCOME; } header += 2; // skip channels (already got from shorten header) avctx->sample_rate = bytestream_get_le32(&header); header += 4; // skip bit rate (represents original uncompressed bit rate) header += 2; // skip block align (not needed) - avctx->bits_per_coded_sample = bytestream_get_le16(&header); + bps = bytestream_get_le16(&header); + 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"); - return -1; + if (bps != 16 && bps != 8) { + av_log(avctx, AV_LOG_ERROR, "unsupported number of bits per sample: %d\n", bps); + return AVERROR_INVALIDDATA; } len -= 16; @@ -260,18 +270,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][3] = { { 1, 0, 0 }, { 2, -1, 0 }, @@ -333,7 +331,7 @@ static int read_header(ShortenContext *s) /* shorten signature */ if (get_bits_long(&s->gb, 32) != AV_RB32("ajkg")) { av_log(s->avctx, AV_LOG_ERROR, "missing shorten magic 'ajkg'\n"); - return -1; + return AVERROR_INVALIDDATA; } s->lpcqoffset = 0; @@ -345,7 +343,7 @@ static int read_header(ShortenContext *s) s->channels = get_uint(s, CHANSIZE); if (s->channels <= 0 || s->channels > MAX_CHANNELS) { av_log(s->avctx, AV_LOG_ERROR, "too many channels: %d\n", s->channels); - return -1; + return AVERROR_INVALIDDATA; } s->avctx->channels = s->channels; @@ -382,20 +380,20 @@ static int read_header(ShortenContext *s) 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"); - return -1; + return AVERROR_INVALIDDATA; } s->header_size = get_ur_golomb_shorten(&s->gb, VERBATIM_CKSIZE_SIZE); if (s->header_size >= OUT_BUFFER_SIZE || s->header_size < CANONICAL_HEADER_SIZE) { av_log(s->avctx, AV_LOG_ERROR, "header is wrong size: %d\n", s->header_size); - return -1; + return AVERROR_INVALIDDATA; } for (i=0; i<s->header_size; i++) s->header[i] = (char)get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE); - if (decode_wave_header(s->avctx, s->header, s->header_size) < 0) - return -1; + if ((ret = decode_wave_header(s->avctx, s->header, s->header_size)) < 0) + return ret; s->cur_chan = 0; s->bitshift = 0; @@ -417,7 +415,7 @@ 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); if (!tmp_ptr) { @@ -469,7 +467,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, s->cur_chan = 0; while (s->cur_chan < s->channels) { - int cmd; + unsigned int cmd; int len; if (get_bits_left(&s->gb) < 3+FNSIZE) { @@ -528,7 +526,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, /* get Rice code for residual decoding */ if (cmd != FN_ZERO) { residual_size = get_ur_golomb_shorten(&s->gb, ENERGYSIZE); - /* this is a hack as version 0 differed in defintion of get_sr_golomb_shorten */ + /* this is a hack as version 0 differed in definition of get_sr_golomb_shorten */ if (s->version == 0) residual_size--; } @@ -542,7 +540,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 */ @@ -580,15 +578,33 @@ 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 */ s->frame.nb_samples = s->blocksize; if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - /* interleave output */ - output_buffer((int16_t **)s->frame.extended_data, s->channels, - s->blocksize, s->decoded); + + for (chan = 0; chan < s->channels; chan++) { + samples_u8 = ((uint8_t **)s->frame.extended_data)[chan]; + samples_s16 = ((int16_t **)s->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; + } + } + } + *got_frame_ptr = 1; *(AVFrame *)data = s->frame; @@ -605,7 +621,7 @@ finish_frame: av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size); s->bitstream_size=0; s->bitstream_index=0; - return -1; + return AVERROR_INVALIDDATA; } if (s->bitstream_size) { s->bitstream_index += i; @@ -642,5 +658,6 @@ AVCodec ff_shorten_decoder = { .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Shorten"), .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_U8P, AV_SAMPLE_FMT_NONE }, }; |