From 0c587a4ea8256f12735f5234e783be02532696bb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 26 Jun 2008 11:25:42 +0000 Subject: [PATCH] VP3 & Theora parser to extract keyframe flags. This parser is not able to split random bitstream pieces. Originally committed as revision 13986 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/vp3_parser.c | 43 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 libavcodec/vp3_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index dedc5c2e8b..d0ea2a81b8 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -350,6 +350,7 @@ OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o mpegaudiodecheader. OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o +OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 33a42426f6..d15abe89ff 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -310,6 +310,7 @@ void avcodec_register_all(void) REGISTER_PARSER (MPEGVIDEO, mpegvideo); REGISTER_PARSER (PNM, pnm); REGISTER_PARSER (VC1, vc1); + REGISTER_PARSER (VP3, vp3); /* bitstream filters */ REGISTER_BSF (DUMP_EXTRADATA, dump_extradata); diff --git a/libavcodec/vp3_parser.c b/libavcodec/vp3_parser.c new file mode 100644 index 0000000000..818b460ffc --- /dev/null +++ b/libavcodec/vp3_parser.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2008 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "parser.h" + +static int parse(AVCodecParserContext *s, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + if(avctx->codec_id == CODEC_ID_THEORA) + s->pict_type= (buf[0]&0x40) ? FF_P_TYPE : FF_I_TYPE; + else + s->pict_type= (buf[0]&0x80) ? FF_P_TYPE : FF_I_TYPE; + + *poutbuf = buf; + *poutbuf_size = buf_size; + return buf_size; +} + +AVCodecParser vp3_parser = { + { CODEC_ID_THEORA, CODEC_ID_VP3 }, + 0, + NULL, + parse, +};