typedef struct DCAParseContext {
ParseContext pc;
uint32_t lastmarker;
+ int size;
+ int framesize;
} DCAParseContext;
#define IS_MARKER(state, i, buf, buf_size) \
}
if (start_found) {
for (; i < buf_size; i++) {
+ pc1->size++;
state = (state << 8) | buf[i];
- if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size)) {
+ if (state == pc1->lastmarker && IS_MARKER(state, i, buf, buf_size) && (!pc1->framesize || pc1->framesize == pc1->size)) {
pc->frame_start_found = 0;
pc->state = -1;
+ pc1->framesize = pc1->size;
+ pc1->size = 0;
return i - 3;
}
}
return END_NOT_FOUND;
}
-static int dca_parse_init(AVCodecParserContext * s)
+static av_cold int dca_parse_init(AVCodecParserContext * s)
{
DCAParseContext *pc1 = s->priv_data;
static int dca_parse(AVCodecParserContext * s,
AVCodecContext * avctx,
- uint8_t ** poutbuf, int *poutbuf_size,
+ const uint8_t ** poutbuf, int *poutbuf_size,
const uint8_t * buf, int buf_size)
{
DCAParseContext *pc1 = s->priv_data;
} else {
next = dca_find_frame_end(pc1, buf, buf_size);
- if (ff_combine_frame(pc, next, (uint8_t **) & buf, &buf_size) < 0) {
+ if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
}
}
- *poutbuf = (uint8_t *) buf;
+ *poutbuf = buf;
*poutbuf_size = buf_size;
return next;
}