# HG changeset patch # User kostya # Date 1170484790 0 # Node ID 5c94205a4730bd8ea5d7ce5e1bcd2b3404b812e7 # Parent b619aebd8469ec07ae8112622181b2cd6d470dbf VC-1 parser diff -r b619aebd8469 -r 5c94205a4730 allcodecs.c --- a/allcodecs.c Fri Feb 02 15:14:13 2007 +0000 +++ b/allcodecs.c Sat Feb 03 06:39:50 2007 +0000 @@ -254,6 +254,7 @@ REGISTER_PARSER (MPEGAUDIO, mpegaudio); REGISTER_PARSER (MPEGVIDEO, mpegvideo); REGISTER_PARSER (PNM, pnm); + REGISTER_PARSER (VC1, vc1); av_register_bitstream_filter(&dump_extradata_bsf); av_register_bitstream_filter(&remove_extradata_bsf); diff -r b619aebd8469 -r 5c94205a4730 avcodec.h --- a/avcodec.h Fri Feb 02 15:14:13 2007 +0000 +++ b/avcodec.h Sat Feb 03 06:39:50 2007 +0000 @@ -37,8 +37,8 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(29<<8)+0) -#define LIBAVCODEC_VERSION 51.29.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(30<<8)+0) +#define LIBAVCODEC_VERSION 51.30.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -2637,6 +2637,7 @@ extern AVCodecParser mpegaudio_parser; extern AVCodecParser mpegvideo_parser; extern AVCodecParser pnm_parser; +extern AVCodecParser vc1_parser; typedef struct AVBitStreamFilterContext { diff -r b619aebd8469 -r 5c94205a4730 vc1.c --- a/vc1.c Fri Feb 02 15:14:13 2007 +0000 +++ b/vc1.c Sat Feb 03 06:39:50 2007 +0000 @@ -4474,3 +4474,94 @@ CODEC_CAP_DELAY, NULL }; + +#ifdef CONFIG_VC1_PARSER +/** + * finds the end of the current frame in the bitstream. + * @return the position of the first byte of the next frame, or -1 + */ +static int vc1_find_frame_end(ParseContext *pc, const uint8_t *buf, + int buf_size) { + int pic_found, i; + uint32_t state; + + pic_found= pc->frame_start_found; + state= pc->state; + + i=0; + if(!pic_found){ + for(i=0; iframe_start_found=0; + pc->state=-1; + return i-3; + } + } + } + pc->frame_start_found= pic_found; + pc->state= state; + return END_NOT_FOUND; +} + +static int vc1_parse(AVCodecParserContext *s, + AVCodecContext *avctx, + 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= vc1_find_frame_end(pc, buf, buf_size); + + if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + *poutbuf = (uint8_t *)buf; + *poutbuf_size = buf_size; + return next; +} + +int vc1_split(AVCodecContext *avctx, + const uint8_t *buf, int buf_size) +{ + int i; + uint32_t state= -1; + + for(i=0; i