diff options
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/dnxhd_parser.c | 95 |
4 files changed, 98 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a2195e863b..e942e3e997 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -345,6 +345,7 @@ OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o +OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 1475a7bd96..074054d912 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -304,6 +304,7 @@ void avcodec_register_all(void) REGISTER_PARSER (CAVSVIDEO, cavsvideo); REGISTER_PARSER (DCA, dca); REGISTER_PARSER (DIRAC, dirac); + REGISTER_PARSER (DNXHD, dnxhd); REGISTER_PARSER (DVBSUB, dvbsub); REGISTER_PARSER (DVDSUB, dvdsub); REGISTER_PARSER (H261, h261); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dfd7264458..3be94023a1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 0 +#define LIBAVCODEC_VERSION_MINOR 1 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c new file mode 100644 index 0000000000..b527913108 --- /dev/null +++ b/libavcodec/dnxhd_parser.c @@ -0,0 +1,95 @@ +/* + * DNxHD/VC-3 parser + * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@free.fr> + * + * 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 + */ + +/** + * @file dnxhd_parser.c + * DNxHD/VC-3 parser + */ + +#include "parser.h" + +#define DNXHD_HEADER_PREFIX 0x0000028001 + +static int dnxhd_find_frame_end(ParseContext *pc, + const uint8_t *buf, int buf_size) +{ + uint64_t state = pc->state64; + int pic_found = pc->frame_start_found; + int i = 0; + + if (!pic_found) { + for (i = 0; i < buf_size; i++) { + state = (state<<8) | buf[i]; + if ((state & 0xffffffffffLL) == DNXHD_HEADER_PREFIX) { + i++; + pic_found = 1; + break; + } + } + } + + if (pic_found) { + if (!buf_size) /* EOF considered as end of frame */ + return 0; + for (; i < buf_size; i++) { + state = (state<<8) | buf[i]; + if ((state & 0xffffffffffLL) == DNXHD_HEADER_PREFIX) { + pc->frame_start_found = 0; + pc->state64 = -1; + return i-4; + } + } + } + pc->frame_start_found = pic_found; + pc->state64 = state; + return END_NOT_FOUND; +} + +static int dnxhd_parse(AVCodecParserContext *s, + 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 = dnxhd_find_frame_end(pc, buf, buf_size); + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + *poutbuf = buf; + *poutbuf_size = buf_size; + return next; +} + +AVCodecParser dnxhd_parser = { + { CODEC_ID_DNXHD }, + sizeof(ParseContext), + NULL, + dnxhd_parse, + ff_parse_close, +}; |