RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58' 

* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-02 18:31:41 +01:00
parent a805e2e653 c68d4c230a
commit 1654e64bba
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
libavcodec/mpeg4video_parser.c
View File

@ -34,40 +34,41 @@ struct Mp4vParseContext {
int first_picture; 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; int vop_found, i;
uint32_t state; uint32_t state;
vop_found= pc->frame_start_found; vop_found = pc->frame_start_found;
state= pc->state; state = pc->state;
i=0; i = 0;
if(!vop_found){ if (!vop_found) {
for(i=0; i<buf_size; i++){ for (i = 0; i < buf_size; i++) {
state= (state<<8) | buf[i]; state = (state << 8) | buf[i];
if(state == 0x1B6){ if (state == 0x1B6) {
i++; i++;
vop_found=1; vop_found = 1;
break; break;
} }
} }
} }
if(vop_found){ if (vop_found) {
/* EOF considered as end of frame */ /* EOF considered as end of frame */
if (buf_size == 0) if (buf_size == 0)
return 0; return 0;
for(; i<buf_size; i++){ for (; i < buf_size; i++) {
state= (state<<8) | buf[i]; state = (state << 8) | buf[i];
if((state&0xFFFFFF00) == 0x100){ if ((state & 0xFFFFFF00) == 0x100) {
pc->frame_start_found=0; pc->frame_start_found = 0;
pc->state=-1; pc->state = -1;
return i-3; return i - 3;
} }
} }
} }
pc->frame_start_found= vop_found; pc->frame_start_found = vop_found;
pc->state= state; pc->state = state;
return END_NOT_FOUND; return END_NOT_FOUND;
} }
@ -81,17 +82,18 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
GetBitContext gb1, *gb = &gb1; GetBitContext gb1, *gb = &gb1;
int ret; int ret;
s->avctx = avctx; s->avctx = avctx;
s->current_picture_ptr = &s->current_picture; s->current_picture_ptr = &s->current_picture;
if (avctx->extradata_size && pc->first_picture){ if (avctx->extradata_size && pc->first_picture) {
init_get_bits(gb, avctx->extradata, avctx->extradata_size*8); init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8);
ret = ff_mpeg4_decode_picture_header(s, gb); ret = ff_mpeg4_decode_picture_header(s, gb);
} }
init_get_bits(gb, buf, 8 * buf_size); init_get_bits(gb, buf, 8 * buf_size);
ret = ff_mpeg4_decode_picture_header(s, gb); 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); ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -103,7 +105,7 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
s1->pts = av_rescale_q(s->time, (AVRational){1, s->avctx->time_base.den}, (AVRational){1, 1200000}); s1->pts = av_rescale_q(s->time, (AVRational){1, s->avctx->time_base.den}, (AVRational){1, 1200000});
} }
s1->pict_type= s->pict_type; s1->pict_type = s->pict_type;
pc->first_picture = 0; pc->first_picture = 0;
return ret; return ret;
} }
@ -114,40 +116,39 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s)
ff_mpeg4videodec_static_init(); ff_mpeg4videodec_static_init();
pc->first_picture = 1; pc->first_picture = 1;
pc->enc.quant_precision=5; pc->enc.quant_precision = 5;
pc->enc.slice_context_count = 1; pc->enc.slice_context_count = 1;
pc->enc.showed_packed_warning = 1; pc->enc.showed_packed_warning = 1;
return 0; return 0;
} }
static int mpeg4video_parse(AVCodecParserContext *s, static int mpeg4video_parse(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
ParseContext *pc = s->priv_data; ParseContext *pc = s->priv_data;
int next; int next;
if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next= buf_size; next = buf_size;
}else{ } else {
next= ff_mpeg4_find_frame_end(pc, buf, buf_size); next = ff_mpeg4_find_frame_end(pc, buf, buf_size);
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;
*poutbuf_size = 0; *poutbuf_size = 0;
return buf_size; return buf_size;
} }
} }
av_mpeg4_decode_header(s, avctx, buf, buf_size); av_mpeg4_decode_header(s, avctx, buf, buf_size);
*poutbuf = buf; *poutbuf = buf;
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
return next; return next;
} }
AVCodecParser ff_mpeg4video_parser = { AVCodecParser ff_mpeg4video_parser = {
.codec_ids = { AV_CODEC_ID_MPEG4 }, .codec_ids = { AV_CODEC_ID_MPEG4 },
.priv_data_size = sizeof(struct Mp4vParseContext), .priv_data_size = sizeof(struct Mp4vParseContext),