[FFmpeg-devel] [PATCH] Megalux Frame muxer and demuxer
Peter Ross
pross at xvid.org
Sun Dec 30 10:18:11 CET 2012
Signed-off-by: Peter Ross <pross at xvid.org>
---
This is a bit of a toy. Gathering dust in my tree.
Samples: /incoming/megalux-frame/
Changelog | 1 +
doc/general.texi | 2 +
libavformat/Makefile | 2 +
libavformat/allformats.c | 1 +
libavformat/frm.c | 35 ++++++++++++++++++
libavformat/frm.h | 34 +++++++++++++++++
libavformat/frmdec.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
libavformat/frmenc.c | 64 ++++++++++++++++++++++++++++++++
8 files changed, 235 insertions(+)
create mode 100644 libavformat/frm.c
create mode 100644 libavformat/frm.h
create mode 100644 libavformat/frmdec.c
create mode 100644 libavformat/frmenc.c
diff --git a/Changelog b/Changelog
index 9eec45c..e809f26 100644
--- a/Changelog
+++ b/Changelog
@@ -337,6 +337,7 @@ easier to use. The changes are:
- Simple segmenting muxer
- Indeo 4 decoder
- SMJPEG demuxer
+- Megalux Frame muxer and demuxer
version 0.8:
diff --git a/doc/general.texi b/doc/general.texi
index 5dc1954..de3c5e9 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -253,6 +253,8 @@ library:
@tab Used in Sim City 3000; file extension .xa.
@item MD Studio @tab @tab X
@item Metal Gear Solid: The Twin Snakes @tab @tab X
+ at item Megalux Frame @tab X @tab X
+ @tab Used by Megalux Ultimate Paint
@item Mobotix .mxg @tab @tab X
@item Monkey's Audio @tab @tab X
@item Motion Pixels MVI @tab @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 13fbe7c..28ca9d3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -135,6 +135,8 @@ OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o
OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o framehash.o
OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o framehash.o
+OBJS-$(CONFIG_FRM_DEMUXER) += frm.o frmdec.o
+OBJS-$(CONFIG_FRM_MUXER) += frm.o frmenc.o
OBJS-$(CONFIG_GIF_MUXER) += gif.o
OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o
OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 739f5a1..2ecab5d 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -123,6 +123,7 @@ void av_register_all(void)
REGISTER_DEMUXER (FOURXM, fourxm);
REGISTER_MUXER (FRAMECRC, framecrc);
REGISTER_MUXER (FRAMEMD5, framemd5);
+ REGISTER_MUXDEMUX(FRM, frm);
REGISTER_MUXDEMUX(G722, g722);
REGISTER_MUXDEMUX(G723_1, g723_1);
REGISTER_DEMUXER (G729, g729);
diff --git a/libavformat/frm.c b/libavformat/frm.c
new file mode 100644
index 0000000..0ca6257
--- /dev/null
+++ b/libavformat/frm.c
@@ -0,0 +1,35 @@
+/*
+ * Megalux Frame common code
+ * Copyright (c) 2010 Peter Ross <pross at xvid.org>
+ *
+ * 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
+ * Megalux Frame common code
+ */
+
+#include "frm.h"
+
+const AVCodecTag ff_frm_pix_fmt_tags[] = {
+ { PIX_FMT_RGB555, 1 },
+ { PIX_FMT_BGR32, 2 },
+ { PIX_FMT_RGB24, 3 },
+ { PIX_FMT_BGRA, 4 },
+ { PIX_FMT_BGRA, 5 },
+};
diff --git a/libavformat/frm.h b/libavformat/frm.h
new file mode 100644
index 0000000..f52a983
--- /dev/null
+++ b/libavformat/frm.h
@@ -0,0 +1,34 @@
+/*
+ * Megalux Frame common code
+ * Copyright (c) 2010 Peter Ross <pross at xvid.org>
+ *
+ * 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
+ * Megalux Frame common code
+ */
+
+#ifndef AVFORMAT_FRM_H
+#define AVFORMAT_FRM_H
+
+#include "internal.h"
+
+extern const AVCodecTag ff_frm_pix_fmt_tags[];
+
+#endif /* AVFORMAT_FRM_H */
diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c
new file mode 100644
index 0000000..0c4d260
--- /dev/null
+++ b/libavformat/frmdec.c
@@ -0,0 +1,96 @@
+/*
+ * Megalux Frame demuxer
+ * Copyright (c) 2010 Peter Ross <pross at xvid.org>
+ *
+ * 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
+ * Megalux Frame demuxer
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "riff.h"
+#include "frm.h"
+
+typedef struct {
+ int count;
+} FrmContext;
+
+static int frm_read_probe(AVProbeData *p)
+{
+ if (p->buf_size > 8 &&
+ p->buf[0] == 'F' && p->buf[1] == 'R' && p->buf[2] == 'M' &&
+ AV_RL16(&p->buf[4]) && AV_RL16(&p->buf[6]))
+ return AVPROBE_SCORE_MAX;
+ return 0;
+}
+
+static int frm_read_header(AVFormatContext *avctx)
+{
+ AVIOContext *pb = avctx->pb;
+ AVStream *st = avformat_new_stream(avctx, 0);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
+ avio_skip(pb, 3);
+
+ st->codec->pix_fmt = ff_codec_get_id(ff_frm_pix_fmt_tags, avio_r8(pb));
+ if (!st->codec->pix_fmt)
+ return AVERROR_INVALIDDATA;
+
+ st->codec->codec_tag = 0;
+ st->codec->width = avio_rl16(pb);
+ st->codec->height = avio_rl16(pb);
+ return 0;
+}
+
+static int frm_read_packet(AVFormatContext *avctx, AVPacket *pkt)
+{
+ FrmContext *s = avctx->priv_data;
+ AVCodecContext *stc = avctx->streams[0]->codec;
+ int packet_size, ret;
+
+ if (s->count)
+ return AVERROR_EOF;
+
+ packet_size = avpicture_get_size(stc->pix_fmt, stc->width, stc->height);
+ if (packet_size < 0)
+ return AVERROR_INVALIDDATA;
+
+ ret = av_get_packet(avctx->pb, pkt, packet_size);
+ if (ret < 0)
+ return ret;
+
+ pkt->stream_index = 0;
+ s->count++;
+
+ return 0;
+}
+
+AVInputFormat ff_frm_demuxer = {
+ .name = "frm",
+ .priv_data_size = sizeof(FrmContext),
+ .long_name = NULL_IF_CONFIG_SMALL("Megalux Frame"),
+ .read_probe = frm_read_probe,
+ .read_header = frm_read_header,
+ .read_packet = frm_read_packet,
+};
diff --git a/libavformat/frmenc.c b/libavformat/frmenc.c
new file mode 100644
index 0000000..84bcb4f
--- /dev/null
+++ b/libavformat/frmenc.c
@@ -0,0 +1,64 @@
+/*
+ * Megalux Frame muxer
+ * Copyright (c) 2010 Peter Ross <pross at xvid.org>
+ *
+ * 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
+ * Megalux Frame muxer
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "riff.h"
+#include "frm.h"
+
+static int write_header(AVFormatContext *s)
+{
+ AVCodecContext *stc = s->streams[0]->codec;
+ int tag;
+
+ tag = ff_codec_get_tag(ff_frm_pix_fmt_tags, stc->pix_fmt);
+ if (!tag) {
+ av_log(s, AV_LOG_ERROR, "unsupported pix_fmt\n");
+ return AVERROR_INVALIDDATA;
+ }
+ avio_write(s->pb, "FRM", 3);
+ avio_w8(s->pb, tag);
+ avio_wl16(s->pb, stc->width);
+ avio_wl16(s->pb, stc->height);
+ return 0;
+}
+
+static int write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ avio_write(s->pb, pkt->data, pkt->size);
+ return 0;
+}
+
+AVOutputFormat ff_frm_muxer = {
+ .name = "frm",
+ .long_name = NULL_IF_CONFIG_SMALL("Megalux Frame"),
+ .extensions = "frm",
+ .audio_codec = CODEC_ID_NONE,
+ .video_codec = CODEC_ID_RAWVIDEO,
+ .write_header = write_header,
+ .write_packet = write_packet,
+ .flags = AVFMT_NOTIMESTAMPS,
+};
--
1.8.0
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121230/9d9fc3a4/attachment.asc>
More information about the ffmpeg-devel
mailing list