|
|
|
@ -32,40 +32,41 @@ struct Mp4vParseContext { |
|
|
|
|
int first_picture; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ |
|
|
|
|
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) |
|
|
|
|
{ |
|
|
|
|
int vop_found, i; |
|
|
|
|
uint32_t state; |
|
|
|
|
|
|
|
|
|
vop_found= pc->frame_start_found; |
|
|
|
|
state= pc->state; |
|
|
|
|
vop_found = pc->frame_start_found; |
|
|
|
|
state = pc->state; |
|
|
|
|
|
|
|
|
|
i=0; |
|
|
|
|
if(!vop_found){ |
|
|
|
|
for(i=0; i<buf_size; i++){ |
|
|
|
|
state= (state<<8) | buf[i]; |
|
|
|
|
if(state == 0x1B6){ |
|
|
|
|
i = 0; |
|
|
|
|
if (!vop_found) { |
|
|
|
|
for (i = 0; i < buf_size; i++) { |
|
|
|
|
state = (state << 8) | buf[i]; |
|
|
|
|
if (state == 0x1B6) { |
|
|
|
|
i++; |
|
|
|
|
vop_found=1; |
|
|
|
|
vop_found = 1; |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(vop_found){ |
|
|
|
|
if (vop_found) { |
|
|
|
|
/* EOF considered as end of frame */ |
|
|
|
|
if (buf_size == 0) |
|
|
|
|
return 0; |
|
|
|
|
for(; i<buf_size; i++){ |
|
|
|
|
state= (state<<8) | buf[i]; |
|
|
|
|
if((state&0xFFFFFF00) == 0x100){ |
|
|
|
|
pc->frame_start_found=0; |
|
|
|
|
pc->state=-1; |
|
|
|
|
return i-3; |
|
|
|
|
for (; i < buf_size; i++) { |
|
|
|
|
state = (state << 8) | buf[i]; |
|
|
|
|
if ((state & 0xFFFFFF00) == 0x100) { |
|
|
|
|
pc->frame_start_found = 0; |
|
|
|
|
pc->state = -1; |
|
|
|
|
return i - 3; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
pc->frame_start_found= vop_found; |
|
|
|
|
pc->state= state; |
|
|
|
|
pc->frame_start_found = vop_found; |
|
|
|
|
pc->state = state; |
|
|
|
|
return END_NOT_FOUND; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -79,22 +80,23 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1, |
|
|
|
|
GetBitContext gb1, *gb = &gb1; |
|
|
|
|
int ret; |
|
|
|
|
|
|
|
|
|
s->avctx = avctx; |
|
|
|
|
s->avctx = avctx; |
|
|
|
|
s->current_picture_ptr = &s->current_picture; |
|
|
|
|
|
|
|
|
|
if (avctx->extradata_size && pc->first_picture){ |
|
|
|
|
init_get_bits(gb, avctx->extradata, avctx->extradata_size*8); |
|
|
|
|
if (avctx->extradata_size && pc->first_picture) { |
|
|
|
|
init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8); |
|
|
|
|
ret = ff_mpeg4_decode_picture_header(s, gb); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
init_get_bits(gb, buf, 8 * buf_size); |
|
|
|
|
ret = ff_mpeg4_decode_picture_header(s, gb); |
|
|
|
|
if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { |
|
|
|
|
if (s->width && (!avctx->width || !avctx->height || |
|
|
|
|
!avctx->coded_width || !avctx->coded_height)) { |
|
|
|
|
ret = ff_set_dimensions(avctx, s->width, s->height); |
|
|
|
|
if (ret < 0) |
|
|
|
|
return ret; |
|
|
|
|
} |
|
|
|
|
s1->pict_type= s->pict_type; |
|
|
|
|
s1->pict_type = s->pict_type; |
|
|
|
|
pc->first_picture = 0; |
|
|
|
|
return ret; |
|
|
|
|
} |
|
|
|
@ -103,38 +105,37 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s) |
|
|
|
|
{ |
|
|
|
|
struct Mp4vParseContext *pc = s->priv_data; |
|
|
|
|
|
|
|
|
|
pc->first_picture = 1; |
|
|
|
|
pc->first_picture = 1; |
|
|
|
|
pc->enc.slice_context_count = 1; |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int mpeg4video_parse(AVCodecParserContext *s, |
|
|
|
|
AVCodecContext *avctx, |
|
|
|
|
const uint8_t **poutbuf, int *poutbuf_size, |
|
|
|
|
const uint8_t *buf, int buf_size) |
|
|
|
|
AVCodecContext *avctx, |
|
|
|
|
const uint8_t **poutbuf, int *poutbuf_size, |
|
|
|
|
const uint8_t *buf, int buf_size) |
|
|
|
|
{ |
|
|
|
|
ParseContext *pc = s->priv_data; |
|
|
|
|
int next; |
|
|
|
|
|
|
|
|
|
if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ |
|
|
|
|
next= buf_size; |
|
|
|
|
}else{ |
|
|
|
|
next= ff_mpeg4_find_frame_end(pc, buf, buf_size); |
|
|
|
|
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { |
|
|
|
|
next = buf_size; |
|
|
|
|
} else { |
|
|
|
|
next = ff_mpeg4_find_frame_end(pc, buf, buf_size); |
|
|
|
|
|
|
|
|
|
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { |
|
|
|
|
*poutbuf = NULL; |
|
|
|
|
*poutbuf = NULL; |
|
|
|
|
*poutbuf_size = 0; |
|
|
|
|
return buf_size; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
av_mpeg4_decode_header(s, avctx, buf, buf_size); |
|
|
|
|
|
|
|
|
|
*poutbuf = buf; |
|
|
|
|
*poutbuf = buf; |
|
|
|
|
*poutbuf_size = buf_size; |
|
|
|
|
return next; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AVCodecParser ff_mpeg4video_parser = { |
|
|
|
|
.codec_ids = { AV_CODEC_ID_MPEG4 }, |
|
|
|
|
.priv_data_size = sizeof(struct Mp4vParseContext), |
|
|
|
|