[FFmpeg-cvslog] r21212 - in trunk: Changelog libavformat/Makefile libavformat/allformats.c libavformat/filmstripdec.c libavformat/filmstripenc.c
pross
subversion
Thu Jan 14 13:55:45 CET 2010
Author: pross
Date: Thu Jan 14 13:55:44 2010
New Revision: 21212
Log:
Adobe Filmstrip muxer and demuxer
Added:
trunk/libavformat/filmstripdec.c
trunk/libavformat/filmstripenc.c
Modified:
trunk/Changelog
trunk/libavformat/Makefile
trunk/libavformat/allformats.c
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog Thu Jan 14 02:32:49 2010 (r21211)
+++ trunk/Changelog Thu Jan 14 13:55:44 2010 (r21212)
@@ -49,6 +49,7 @@ version <next>:
- Auravision Aura 1 and 2 decoders
- Deluxe Paint Animation playback system
- SIPR decoding for modes 8k5, 6k5 and 5k0
+- Adobe Filmstrip muxer and demuxer
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile Thu Jan 14 02:32:49 2010 (r21211)
+++ trunk/libavformat/Makefile Thu Jan 14 13:55:44 2010 (r21212)
@@ -65,6 +65,8 @@ OBJS-$(CONFIG_EAC3_DEMUXER)
OBJS-$(CONFIG_EAC3_MUXER) += raw.o
OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o
OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o
+OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o
+OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o
OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o raw.o id3v1.o \
id3v2.o oggparsevorbis.o
OBJS-$(CONFIG_FLAC_MUXER) += flacenc.o
Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c Thu Jan 14 02:32:49 2010 (r21211)
+++ trunk/libavformat/allformats.c Thu Jan 14 13:55:44 2010 (r21212)
@@ -82,6 +82,7 @@ void av_register_all(void)
REGISTER_DEMUXER (EA_CDATA, ea_cdata);
REGISTER_MUXDEMUX (EAC3, eac3);
REGISTER_MUXDEMUX (FFM, ffm);
+ REGISTER_MUXDEMUX (FILMSTRIP, filmstrip);
REGISTER_MUXDEMUX (FLAC, flac);
REGISTER_DEMUXER (FLIC, flic);
REGISTER_MUXDEMUX (FLV, flv);
Added: trunk/libavformat/filmstripdec.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavformat/filmstripdec.c Thu Jan 14 13:55:44 2010 (r21212)
@@ -0,0 +1,111 @@
+/*
+ * Adobe Filmstrip demuxer
+ * Copyright (c) 2010 Peter Ross
+ *
+ * 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 libavformat/filmstripdec.c
+ * Adobe Filmstrip demuxer
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+
+#define RAND_TAG MKBETAG('R','a','n','d')
+
+typedef struct {
+ int leading;
+} FilmstripDemuxContext;
+
+static int read_header(AVFormatContext *s,
+ AVFormatParameters *ap)
+{
+ FilmstripDemuxContext *film = s->priv_data;
+ ByteIOContext *pb = s->pb;
+ AVStream *st;
+
+ if (url_is_streamed(s->pb))
+ return AVERROR(EIO);
+
+ url_fseek(pb, url_fsize(pb) - 36, SEEK_SET);
+ if (get_be32(pb) != RAND_TAG) {
+ av_log(s, AV_LOG_ERROR, "magic number not found");
+ return AVERROR_INVALIDDATA;
+ }
+
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ st->nb_frames = get_be32(pb);
+ if (get_be16(pb) != 0) {
+ av_log_ask_for_sample(s, "unsupported packing method\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ url_fskip(pb, 2);
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_id = CODEC_ID_RAWVIDEO;
+ st->codec->pix_fmt = PIX_FMT_RGBA;
+ st->codec->codec_tag = 0; /* no fourcc */
+ st->codec->width = get_be16(pb);
+ st->codec->height = get_be16(pb);
+ film->leading = get_be16(pb);
+ av_set_pts_info(st, 64, 1, get_be16(pb));
+
+ url_fseek(pb, 0, SEEK_SET);
+
+ return 0;
+}
+
+static int read_packet(AVFormatContext *s,
+ AVPacket *pkt)
+{
+ FilmstripDemuxContext *film = s->priv_data;
+ AVStream *st = s->streams[0];
+
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
+ pkt->dts = url_ftell(s->pb) / (st->codec->width * (st->codec->height + film->leading) * 4);
+ pkt->size = av_get_packet(s->pb, pkt, st->codec->width * st->codec->height * 4);
+ url_fskip(s->pb, st->codec->width * film->leading * 4);
+ if (pkt->size < 0)
+ return pkt->size;
+ pkt->flags |= PKT_FLAG_KEY;
+ return 0;
+}
+
+static int read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+{
+ AVStream *st = s->streams[stream_index];
+ url_fseek(s->pb, FFMAX(timestamp, 0) * st->codec->width * st->codec->height * 4, SEEK_SET);
+ return 0;
+}
+
+AVInputFormat filmstrip_demuxer = {
+ "filmstrip",
+ NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
+ sizeof(FilmstripDemuxContext),
+ NULL,
+ read_header,
+ read_packet,
+ NULL,
+ read_seek,
+ .extensions = "flm",
+};
Added: trunk/libavformat/filmstripenc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavformat/filmstripenc.c Thu Jan 14 13:55:44 2010 (r21212)
@@ -0,0 +1,85 @@
+/*
+ * Adobe Filmstrip muxer
+ * Copyright (c) 2010 Peter Ross
+ *
+ * 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 libavformat/filmstripenc.c
+ * Adobe Filmstrip muxer
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+
+#define RAND_TAG MKBETAG('R','a','n','d')
+
+typedef struct {
+ int nb_frames;
+} FilmstripMuxContext;
+
+static int write_header(AVFormatContext *s)
+{
+ if (s->streams[0]->codec->pix_fmt != PIX_FMT_RGBA) {
+ av_log(s, AV_LOG_ERROR, "only PIX_FMT_RGBA is supported\n");
+ return AVERROR_INVALIDDATA;
+ }
+ return 0;
+}
+
+static int write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ FilmstripMuxContext *film = s->priv_data;
+ put_buffer(s->pb, pkt->data, pkt->size);
+ film->nb_frames++;
+ return 0;
+}
+
+static int write_trailer(AVFormatContext *s)
+{
+ FilmstripMuxContext *film = s->priv_data;
+ ByteIOContext *pb = s->pb;
+ AVStream *st = s->streams[0];
+ int i;
+
+ put_be32(pb, RAND_TAG);
+ put_be32(pb, film->nb_frames);
+ put_be16(pb, 0); // packing method
+ put_be16(pb, 0); // reserved
+ put_be16(pb, st->codec->width);
+ put_be16(pb, st->codec->height);
+ put_be16(pb, 0); // leading
+ put_be16(pb, 1/av_q2d(st->codec->time_base));
+ for (i = 0; i < 16; i++)
+ put_byte(pb, 0x00); // reserved
+ put_flush_packet(pb);
+ return 0;
+}
+
+AVOutputFormat filmstrip_muxer = {
+ "filmstrip",
+ NULL_IF_CONFIG_SMALL("Adobe Filmstrip"),
+ NULL,
+ "flm",
+ sizeof(FilmstripMuxContext),
+ CODEC_ID_NONE,
+ CODEC_ID_RAWVIDEO,
+ write_header,
+ write_packet,
+ write_trailer,
+};
More information about the ffmpeg-cvslog
mailing list