generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adx_parser: rewrite.

Browse Source 
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Michael Niedermayer 2011-12-18 18:57:56 +01:00 committed by Justin Ruggles
parent 6fd075f180
commit b024209b1f
1 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libavcodec/adx_parser.c
View File

@ -22,7 +22,7 @@
* @file * @file
* ADX audio parser * ADX audio parser
* *
* Reads header to extradata and splits packets into individual blocks. * Splits packets into individual blocks.
*/ */
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
@ -33,11 +33,9 @@ typedef struct ADXParseContext {
ParseContext pc; ParseContext pc;
int header_size; int header_size;
int block_size; int block_size;
int buf_pos; int remaining;
} ADXParseContext; } ADXParseContext;
#define MIN_HEADER_SIZE 24
static int adx_parse(AVCodecParserContext *s1, static int adx_parse(AVCodecParserContext *s1,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
@ -46,45 +44,36 @@ static int adx_parse(AVCodecParserContext *s1,
ADXParseContext *s = s1->priv_data; ADXParseContext *s = s1->priv_data;
ParseContext *pc = &s->pc; ParseContext *pc = &s->pc;
int next = END_NOT_FOUND; int next = END_NOT_FOUND;
int i;
uint64_t state = pc->state64;
if (!avctx->extradata_size) { if (!s->header_size) {
int ret; for (i = 0; i < buf_size; i++) {
state = (state << 8) | buf[i];
ff_combine_frame(pc, END_NOT_FOUND, &buf, &buf_size); /* check for fixed fields in ADX header for possible match */
if ((state & 0xFFFF0000FFFFFF00) == 0x8000000003120400ULL) {
if (!s->header_size && pc->index >= MIN_HEADER_SIZE) { int channels = state & 0xFF;
if (ret = avpriv_adx_decode_header(avctx, pc->buffer, pc->index, int header_size = ((state >> 32) & 0xFFFF) + 4;
&s->header_size, NULL)) if (channels > 0 && header_size >= 8) {
return AVERROR_INVALIDDATA; s->header_size = header_size;
s->block_size = BLOCK_SIZE * avctx->channels; s->block_size = BLOCK_SIZE * channels;
s->remaining = i - 7 + s->header_size + s->block_size;
break;
}
}
} }
if (s->header_size && s->header_size <= pc->index) { pc->state64 = state;
avctx->extradata = av_mallocz(s->header_size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!avctx->extradata)
return AVERROR(ENOMEM);
avctx->extradata_size = s->header_size;
memcpy(avctx->extradata, pc->buffer, s->header_size);
memmove(pc->buffer, pc->buffer + s->header_size, s->header_size);
pc->index -= s->header_size;
}
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
} }
if (pc->index - s->buf_pos >= s->block_size) { if (s->header_size) {
*poutbuf = &pc->buffer[s->buf_pos]; if (!s->remaining)
*poutbuf_size = s->block_size; s->remaining = s->block_size;
s->buf_pos += s->block_size; if (s->remaining <= buf_size) {
return 0; next = s->remaining;
s->remaining = 0;
} else
s->remaining -= buf_size;
} }
if (pc->index && s->buf_pos) {
memmove(pc->buffer, &pc->buffer[s->buf_pos], pc->index - s->buf_pos);
pc->index -= s->buf_pos;
s->buf_pos = 0;
}
if (buf_size + pc->index >= s->block_size)
next = s->block_size - pc->index;
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0 || !buf_size) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0 || !buf_size) {
*poutbuf = NULL; *poutbuf = NULL;