diff options
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/vc1.c | 91 |
3 files changed, 95 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d0a5689e0f..5ae88fcb47 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -254,6 +254,7 @@ void avcodec_register_all(void) 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 --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 615f6c693b..379414b4e8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -37,8 +37,8 @@ extern "C" { #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 mpeg4video_parser; extern AVCodecParser mpegaudio_parser; extern AVCodecParser mpegvideo_parser; extern AVCodecParser pnm_parser; +extern AVCodecParser vc1_parser; typedef struct AVBitStreamFilterContext { diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index af2256b3fc..78bcfdd532 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -4474,3 +4474,94 @@ AVCodec wmv3_decoder = { 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; i<buf_size; i++){ + state= (state<<8) | buf[i]; + if(state == VC1_CODE_FRAME || state == VC1_CODE_FIELD){ + i++; + pic_found=1; + break; + } + } + } + + if(pic_found){ + /* EOF considered as end of frame */ + if (buf_size == 0) + return 0; + for(; i<buf_size; i++){ + state= (state<<8) | buf[i]; + if(IS_MARKER(state) && state != VC1_CODE_FIELD && state != VC1_CODE_SLICE){ + pc->frame_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<buf_size; i++){ + state= (state<<8) | buf[i]; + if(IS_MARKER(state) && state != VC1_CODE_SEQHDR && state != VC1_CODE_ENTRYPOINT) + return i-3; + } + return 0; +} + +AVCodecParser vc1_parser = { + { CODEC_ID_VC1 }, + sizeof(ParseContext1), + NULL, + vc1_parse, + ff_parse1_close, + vc1_split, +}; +#endif /* CONFIG_VC1_PARSER */ |