[FFmpeg-cvslog] avformat: Add v210[x] demuxer
Timothy Gu
git at videolan.org
Tue Nov 10 05:45:32 CET 2015
ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Sat Nov 7 15:59:01 2015 -0800| [480bad7c6d087d9cd10ae4ab7b4e12cb594aa4c5] | committer: Timothy Gu
avformat: Add v210[x] demuxer
Allows one to do:
ffmpeg -s 1920x1080 -i blah.v210 ...
ffmpeg -s 1920x1080 -f v210x -i blah.yuv10 ...
Fixes #1869.
Reviewed-by: James Almer <jamrial at gmail.com>
Reviewed-by: Kieran Kunhya <kierank at obe.tv>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=480bad7c6d087d9cd10ae4ab7b4e12cb594aa4c5
---
libavformat/Makefile | 2 +
libavformat/allformats.c | 2 +
libavformat/v210.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index f2326df..1a03e0c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -447,6 +447,8 @@ OBJS-$(CONFIG_TTA_DEMUXER) += tta.o apetag.o img2.o
OBJS-$(CONFIG_TTY_DEMUXER) += tty.o sauce.o
OBJS-$(CONFIG_TXD_DEMUXER) += txd.o
OBJS-$(CONFIG_UNCODEDFRAMECRC_MUXER) += uncodedframecrcenc.o framehash.o
+OBJS-$(CONFIG_V210_DEMUXER) += v210.o
+OBJS-$(CONFIG_V210X_DEMUXER) += v210.o
OBJS-$(CONFIG_VAG_DEMUXER) += vag.o
OBJS-$(CONFIG_VC1_DEMUXER) += rawdec.o vc1dec.o
OBJS-$(CONFIG_VC1_MUXER) += rawenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 92e321c..8b8d9f2 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -314,6 +314,8 @@ void av_register_all(void)
REGISTER_DEMUXER (TXD, txd);
REGISTER_DEMUXER (TTY, tty);
REGISTER_MUXER (UNCODEDFRAMECRC, uncodedframecrc);
+ REGISTER_DEMUXER (V210, v210);
+ REGISTER_DEMUXER (V210X, v210x);
REGISTER_DEMUXER (VAG, vag);
REGISTER_MUXDEMUX(VC1, vc1);
REGISTER_MUXDEMUX(VC1T, vc1t);
diff --git a/libavformat/v210.c b/libavformat/v210.c
new file mode 100644
index 0000000..ab29171
--- /dev/null
+++ b/libavformat/v210.c
@@ -0,0 +1,133 @@
+/*
+ * Raw v210 video demuxer
+ * Copyright (c) 2015 Tiancheng "Timothy" Gu
+ *
+ * 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 "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/opt.h"
+#include "internal.h"
+#include "avformat.h"
+
+typedef struct V210DemuxerContext {
+ const AVClass *class; /**< Class for private options. */
+ int width, height; /**< Integers describing video size, set by a private option. */
+ AVRational framerate; /**< AVRational describing framerate, set by a private option. */
+} V210DemuxerContext;
+
+// v210 frame width is padded to multiples of 48
+#define GET_PACKET_SIZE(w, h) (((w + 47) / 48) * 48 * h * 8 / 3)
+
+static int v210_read_header(AVFormatContext *ctx)
+{
+ V210DemuxerContext *s = ctx->priv_data;
+ AVStream *st;
+
+ st = avformat_new_stream(ctx, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ st->codec->codec_id = ctx->iformat->raw_codec_id;
+
+ avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num);
+
+ st->codec->width = s->width;
+ st->codec->height = s->height;
+ st->codec->pix_fmt = ctx->iformat->raw_codec_id == AV_CODEC_ID_V210 ?
+ AV_PIX_FMT_YUV422P10 : AV_PIX_FMT_YUV422P16;
+ st->codec->bit_rate = av_rescale_q(GET_PACKET_SIZE(s->width, s->height),
+ (AVRational){8,1}, st->time_base);
+
+ return 0;
+}
+
+
+static int v210_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ int packet_size, ret, width, height;
+ AVStream *st = s->streams[0];
+
+ width = st->codec->width;
+ height = st->codec->height;
+
+ packet_size = GET_PACKET_SIZE(width, height);
+ if (packet_size < 0)
+ return -1;
+
+ ret = av_get_packet(s->pb, pkt, packet_size);
+ pkt->pts = pkt->dts = pkt->pos / packet_size;
+
+ pkt->stream_index = 0;
+ if (ret < 0)
+ return ret;
+ return 0;
+}
+
+#define OFFSET(x) offsetof(V210DemuxerContext, x)
+#define DEC AV_OPT_FLAG_DECODING_PARAM
+static const AVOption v210_options[] = {
+ { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC },
+ { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, DEC },
+ { NULL },
+};
+
+#if CONFIG_V210_DEMUXER
+static const AVClass v210_demuxer_class = {
+ .class_name = "v210 demuxer",
+ .item_name = av_default_item_name,
+ .option = v210_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVInputFormat ff_v210_demuxer = {
+ .name = "v210",
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
+ .priv_data_size = sizeof(V210DemuxerContext),
+ .read_header = v210_read_header,
+ .read_packet = v210_read_packet,
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "v210",
+ .raw_codec_id = AV_CODEC_ID_V210,
+ .priv_class = &v210_demuxer_class,
+};
+#endif // CONFIG_V210_DEMUXER
+
+#if CONFIG_V210X_DEMUXER
+static const AVClass v210x_demuxer_class = {
+ .class_name = "v210x demuxer",
+ .item_name = av_default_item_name,
+ .option = v210_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+AVInputFormat ff_v210x_demuxer = {
+ .name = "v210x",
+ .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
+ .priv_data_size = sizeof(V210DemuxerContext),
+ .read_header = v210_read_header,
+ .read_packet = v210_read_packet,
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "yuv10",
+ .raw_codec_id = AV_CODEC_ID_V210X,
+ .priv_class = &v210x_demuxer_class,
+};
+#endif // CONFIG_V210X_DEMUXER
More information about the ffmpeg-cvslog
mailing list