This is a WIP patch for the RAM playlist format:
http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ramfile.htm,
http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ramsum.htm.
The implementation is currently essentially a kitchen sink dump of
concatdec; hence the copyright notice is preserved.
Metadata stuff is currently lacking. Feedback appreciated; this is my
first demuxer.
Done some very simple, basic testing.
Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com>
---
MAINTAINERS | 1 +
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/ramdec.c | 467 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 470 insertions(+)
create mode 100644 libavformat/ramdec.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 9add13d..ba1034e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -486,6 +486,7 @@ Muxers/Demuxers:
rdt.c Ronald S. Bultje
rl2.c Sascha Sommer
rmdec.c, rmenc.c Ronald S. Bultje, Kostya Shishkov
+ ramdec.c Ganesh Ajjanagadde
rtmp* Kostya Shishkov
rtp.c, rtpenc.c Martin Storsjo
rtpdec_ac3.* Gilles Chanteperdrix
diff --git a/libavformat/Makefile b/libavformat/Makefile
index e03c73e..708e622 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -377,6 +377,7 @@ OBJS-$(CONFIG_REALTEXT_DEMUXER) += realtextdec.o
subtitles.o
OBJS-$(CONFIG_REDSPARK_DEMUXER) += redspark.o
OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o
OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o rmsipr.o
+OBJS-$(CONFIG_RAM_DEMUXER) += ramdec.o
OBJS-$(CONFIG_RM_MUXER) += rmenc.o rm.o
OBJS-$(CONFIG_ROQ_DEMUXER) += idroqdec.o
OBJS-$(CONFIG_ROQ_MUXER) += idroqenc.o rawenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index dabfa34..f1dea3e 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -262,6 +262,7 @@ void av_register_all(void)
REGISTER_DEMUXER (REDSPARK, redspark);
REGISTER_DEMUXER (RL2, rl2);
REGISTER_MUXDEMUX(RM, rm);
+ REGISTER_DEMUXER (RAM, ram);
REGISTER_MUXDEMUX(ROQ, roq);
REGISTER_DEMUXER (RPL, rpl);
REGISTER_DEMUXER (RSD, rsd);
diff --git a/libavformat/ramdec.c b/libavformat/ramdec.c
new file mode 100644
index 0000000..e5e8ec1
--- /dev/null
+++ b/libavformat/ramdec.c
@@ -0,0 +1,467 @@
+/*
+ * RAM playlist demuxer
+ * Copyright (c) 2016 Nicolas George
+ *
+ * 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/avstring.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/timestamp.h"
+#include "avformat.h"
+#include "internal.h"
+#include "url.h"
+
+/* FIXME: multiple files, seeking, metadata */
+typedef enum RamMatchMode {
+ MATCH_ONE_TO_ONE,
+ MATCH_EXACT_ID,
+} RamMatchMode;
+
+typedef struct RamStream {
+ AVBitStreamFilterContext *bsf;
+ int out_stream_index;
+} RamStream;
+
+typedef struct {
+ char *url;
+ AVDictionary *metadata;
+ RamStream *streams;
+ int64_t start_time;
+ int64_t file_start_time;
+ int64_t file_inpoint;
+ int64_t duration;
+ int64_t inpoint;
+ int64_t outpoint;
+ int nb_streams;
+} RamFile;
+
+typedef struct {
+ AVClass *class;
+ RamFile *files;
+ RamFile *cur_file;
+ AVFormatContext *avf;
+ unsigned nb_files;
+ int eof;
+ RamMatchMode stream_match_mode;
+ unsigned auto_convert;
+ int segment_time_metadata;
+} RamContext;
+
+static int ram_probe(AVProbeData *probe)
+{
+ char *line_buf;
+ char *next_line;
+ char probe_str[4];
+ AVIOContext *pb;
+ int ret;
+ line_buf = av_strtok(probe->buf, "\r\n", &next_line);
+
+ /* skip over comments */
+ while (line_buf && *line_buf == '#')
+ line_buf = av_strtok(NULL, "\r\n", &next_line);
+
+ if ((ret = avio_open(&pb, line_buf, AVIO_FLAG_READ)) < 0)
+ return ret;
+ if ((ret = avio_read(pb, probe_str, sizeof(probe_str))) < 0)
+ goto fail;
+ if (!memcmp(probe_str, ".RMF", 4) || !memcmp(probe_str, ".ra", 3))
+ return AVPROBE_SCORE_MAX;
+
+fail:
+ return avio_close(pb);
+}
+
+static int ram_read_close(AVFormatContext *avf)
+{
+ RamContext *ram = avf->priv_data;
+
+ if (ram->avf)
+ avformat_close_input(&ram->avf);
+ for (int i = 0; i < ram->nb_files; i++) {
+ av_freep(&ram->files[i].url);
+ av_freep(&ram->files[i].streams);
+ av_dict_free(&ram->files[i].metadata);
+ }
+ av_freep(&ram->files);
+ return 0;
+}
+
+#define FAIL(retcode) do { ret = (retcode); goto fail; } while(0)
+
+static int add_file(AVFormatContext *avf, char *filename, unsigned
*nb_files_alloc)
+{
+ RamContext *ram = avf->priv_data;
+ RamFile *file;
+ int ret;
+
+ if (ram->nb_files >= *nb_files_alloc) {
+ size_t n = FFMAX(*nb_files_alloc * 2, 16);
+ RamFile *new_files;
+ if (n <= ram->nb_files || n > SIZE_MAX / sizeof(*ram->files) ||
+ !(new_files = av_realloc(ram->files, n * sizeof(*ram->files))))
+ FAIL(AVERROR(ENOMEM));
+ ram->files = new_files;
+ *nb_files_alloc = n;
+ }
+
+ file = &ram->files[ram->nb_files++];
+ memset(file, 0, sizeof(*file));
+
+ file->url = av_strdup(filename);
+ file->start_time = AV_NOPTS_VALUE;
+ file->duration = AV_NOPTS_VALUE;
+ file->inpoint = AV_NOPTS_VALUE;
+ file->outpoint = AV_NOPTS_VALUE;
+
+ return 0;
+
+fail:
+ return ret;
+}
+
+static int copy_stream_props(AVStream *st, AVStream *source_st)
+{
+ int ret;
+
+ if (st->codec->codec_id || !source_st->codec->codec_id) {
+ if (st->codec->extradata_size < source_st->codec->extradata_size) {
+ ret = ff_alloc_extradata(st->codec,
+ source_st->codec->extradata_size);
+ if (ret < 0)
+ return ret;
+ }
+ memcpy(st->codec->extradata, source_st->codec->extradata,
+ source_st->codec->extradata_size);
+ return 0;
+ }
+ if ((ret = avcodec_copy_context(st->codec, source_st->codec)) < 0)
+ return ret;
+ st->r_frame_rate = source_st->r_frame_rate;
+ st->avg_frame_rate = source_st->avg_frame_rate;
+ st->time_base = source_st->time_base;
+ st->sample_aspect_ratio = source_st->sample_aspect_ratio;
+
+ av_dict_copy(&st->metadata, source_st->metadata, 0);
+ return 0;
+}
+
+static int detect_stream_specific(AVFormatContext *avf, int idx)
+{
+ RamContext *ram = avf->priv_data;
+ AVStream *st = ram->avf->streams[idx];
+ RamStream *cs = &ram->cur_file->streams[idx];
+ AVBitStreamFilterContext *bsf;
+
+ if (ram->auto_convert && st->codec->codec_id == AV_CODEC_ID_H264 &&
+ (st->codec->extradata_size < 4 || AV_RB32(st->codec->extradata) != 1))
{
+ av_log(ram->avf, AV_LOG_INFO,
+ "Auto-inserting h264_mp4toannexb bitstream filter\n");
+ if (!(bsf = av_bitstream_filter_init("h264_mp4toannexb"))) {
+ av_log(avf, AV_LOG_ERROR, "h264_mp4toannexb bitstream filter "
+ "required for H.264 streams\n");
+ return AVERROR_BSF_NOT_FOUND;
+ }
+ cs->bsf = bsf;
+ }
+ return 0;
+}
+
+static int match_streams_one_to_one(AVFormatContext *avf)
+{
+ RamContext *cat = avf->priv_data;
+ AVStream *st;
+ int i, ret;
+
+ for (i = cat->cur_file->nb_streams; i < cat->avf->nb_streams; i++) {
+ if (i < avf->nb_streams) {
+ st = avf->streams[i];
+ } else {
+ if (!(st = avformat_new_stream(avf, NULL)))
+ return AVERROR(ENOMEM);
+ }
+ if ((ret = copy_stream_props(st, cat->avf->streams[i])) < 0)
+ return ret;
+ cat->cur_file->streams[i].out_stream_index = i;
+ }
+ return 0;
+}
+
+static int match_streams_exact_id(AVFormatContext *avf)
+{
+ RamContext *ram = avf->priv_data;
+ AVStream *st;
+ int i, j, ret;
+
+ for (i = ram->cur_file->nb_streams; i < ram->avf->nb_streams; i++) {
+ st = ram->avf->streams[i];
+ for (j = 0; j < avf->nb_streams; j++) {
+ if (avf->streams[j]->id == st->id) {
+ av_log(avf, AV_LOG_VERBOSE,
+ "Match slave stream #%d with stream #%d id 0x%x\n",
+ i, j, st->id);
+ if ((ret = copy_stream_props(avf->streams[j], st)) < 0)
+ return ret;
+ ram->cur_file->streams[i].out_stream_index = j;
+ }
+ }
+ }
+ return 0;
+}
+
+static int match_streams(AVFormatContext *avf)
+{
+ RamContext *ram = avf->priv_data;
+ RamStream *map;
+ int i, ret;
+
+ if (ram->cur_file->nb_streams >= ram->avf->nb_streams)
+ return 0;
+ map = av_realloc(ram->cur_file->streams,
+ ram->avf->nb_streams * sizeof(*map));
+ if (!map)
+ return AVERROR(ENOMEM);
+ ram->cur_file->streams = map;
+ memset(map + ram->cur_file->nb_streams, 0,
+ (ram->avf->nb_streams - ram->cur_file->nb_streams) * sizeof(*map));
+
+ for (i = ram->cur_file->nb_streams; i < ram->avf->nb_streams; i++)
+ map[i].out_stream_index = -1;
+ switch (ram->stream_match_mode) {
+ case MATCH_ONE_TO_ONE:
+ ret = match_streams_one_to_one(avf);
+ break;
+ case MATCH_EXACT_ID:
+ ret = match_streams_exact_id(avf);
+ break;
+ default:
+ ret = AVERROR_BUG;
+ }
+ if (ret < 0)
+ return ret;
+ for (i = ram->cur_file->nb_streams; i < ram->avf->nb_streams; i++)
+ if ((ret = detect_stream_specific(avf, i)) < 0)
+ return ret;
+ ram->cur_file->nb_streams = ram->avf->nb_streams;
+ return 0;
+}
+
+static int open_file(AVFormatContext *avf, unsigned fileno)
+{
+ RamContext *ram = avf->priv_data;
+ RamFile *file = &ram->files[fileno];
+ int ret;
+
+ if (ram->avf)
+ avformat_close_input(&ram->avf);
+
+ ram->avf = avformat_alloc_context();
+ if (!ram->avf)
+ return AVERROR(ENOMEM);
+
+ if ((ret = ff_copy_whitelists(ram->avf, avf)) < 0)
+ return ret;
+
+ if ((ret = avformat_open_input(&ram->avf, file->url, NULL, NULL)) < 0 ||
+ (ret = avformat_find_stream_info(ram->avf, NULL)) < 0) {
+ av_log(avf, AV_LOG_ERROR, "Impossible to open '%s'\n", file->url);
+ avformat_close_input(&ram->avf);
+ return ret;
+ }
+ ram->cur_file = file;
+ if (file->start_time == AV_NOPTS_VALUE)
+ file->start_time = !fileno ? 0 :
+ ram->files[fileno - 1].start_time +
+ ram->files[fileno - 1].duration;
+ file->file_start_time = (ram->avf->start_time == AV_NOPTS_VALUE) ? 0 :
ram->avf->start_time;
+ file->file_inpoint = (file->inpoint == AV_NOPTS_VALUE) ?
file->file_start_time : file->inpoint;
+ if (file->duration == AV_NOPTS_VALUE && file->outpoint != AV_NOPTS_VALUE)
+ file->duration = file->outpoint - file->file_inpoint;
+
+ if (ram->segment_time_metadata) {
+ av_dict_set_int(&file->metadata, "lavf.concatdec.start_time",
file->start_time, 0);
+ if (file->duration != AV_NOPTS_VALUE)
+ av_dict_set_int(&file->metadata, "lavf.concatdec.duration",
file->duration, 0);
+ }
+
+ if ((ret = match_streams(avf)) < 0)
+ return ret;
+ if (file->inpoint != AV_NOPTS_VALUE) {
+ if ((ret = avformat_seek_file(ram->avf, -1, INT64_MIN, file->inpoint,
file->inpoint, 0)) < 0)
+ return ret;
+ }
+ return 0;
+}
+
+static int open_next_file(AVFormatContext *avf)
+{
+ RamContext *ram = avf->priv_data;
+ unsigned fileno = ram->cur_file - ram->files;
+
+ if (ram->cur_file->duration == AV_NOPTS_VALUE)
+ ram->cur_file->duration = ram->avf->duration -
(ram->cur_file->file_inpoint - ram->cur_file->file_start_time);
+
+ if (++fileno >= ram->nb_files) {
+ ram->eof = 1;
+ return AVERROR_EOF;
+ }
+ return open_file(avf, fileno);
+}
+
+static int ram_read_header(AVFormatContext *avf)
+{
+ RamContext *ram = avf->priv_data;
+ uint8_t line_buf[4096];
+ int ret, i;
+ unsigned nb_files_alloc = 0;
+ int64_t time = 0;
+ char end;
+
+ while (1) {
+ if ((ret = ff_get_line(avf->pb, line_buf, sizeof(line_buf))) <= 0)
+ break;
+
+ /* skip over comments */
+ if (!*line_buf || *line_buf == '#' || *line_buf == '\r' || *line_buf
== '\n')
+ continue;
+
+ /* FIXME: a hack */
+ end = line_buf[strlen(line_buf)-1];
+ if (end == '\r' || end == '\n')
+ line_buf[strlen(line_buf)-1] = '\0';
+ if ((ret = add_file(avf, line_buf, &nb_files_alloc)) < 0)
+ FAIL(ret);
+ }
+ if (!ram->nb_files)
+ FAIL(AVERROR_INVALIDDATA);
+
+ for (i = 0; i < ram->nb_files; i++) {
+ if (ram->files[i].start_time == AV_NOPTS_VALUE)
+ ram->files[i].start_time = time;
+ else
+ time = ram->files[i].start_time;
+ if (ram->files[i].duration == AV_NOPTS_VALUE) {
+ if (ram->files[i].inpoint == AV_NOPTS_VALUE ||
ram->files[i].outpoint == AV_NOPTS_VALUE)
+ break;
+ ram->files[i].duration = ram->files[i].outpoint -
ram->files[i].inpoint;
+ }
+ time += ram->files[i].duration;
+ }
+ if (i == ram->nb_files)
+ avf->duration = time;
+
+ ram->stream_match_mode = avf->nb_streams ? MATCH_EXACT_ID :
+ MATCH_ONE_TO_ONE;
+ if ((ret = open_file(avf, 0)) < 0)
+ goto fail;
+ return 0;
+
+fail:
+ ram_read_close(avf);
+ return ret;
+}
+
+/* Returns true if the packet dts is greater or equal to the specified
outpoint. */
+static int packet_after_outpoint(RamContext *ram, AVPacket *pkt)
+{
+ if (ram->cur_file->outpoint != AV_NOPTS_VALUE && pkt->dts !=
AV_NOPTS_VALUE) {
+ return av_compare_ts(pkt->dts,
ram->avf->streams[pkt->stream_index]->time_base,
+ ram->cur_file->outpoint, AV_TIME_BASE_Q) >= 0;
+ }
+ return 0;
+}
+
+static int ram_read_packet(AVFormatContext *avf, AVPacket *pkt)
+{
+ RamContext *ram = avf->priv_data;
+ int ret;
+ int64_t delta;
+ RamStream *cs;
+ AVStream *st;
+
+ if (ram->eof)
+ return AVERROR_EOF;
+
+ if (!ram->avf)
+ return AVERROR(EIO);
+
+ while (1) {
+ ret = av_read_frame(ram->avf, pkt);
+ if (ret < 0 || packet_after_outpoint(ram, pkt)) {
+ if (ret == 0)
+ av_packet_unref(pkt);
+ if ((ret = open_next_file(avf)) < 0)
+ return ret;
+ continue;
+ }
+ if (ret < 0)
+ return ret;
+ if ((ret = match_streams(avf)) < 0) {
+ av_packet_unref(pkt);
+ return ret;
+ }
+ cs = &ram->cur_file->streams[pkt->stream_index];
+ if (cs->out_stream_index < 0) {
+ av_packet_unref(pkt);
+ continue;
+ }
+ pkt->stream_index = cs->out_stream_index;
+ break;
+ }
+
+ st = ram->avf->streams[pkt->stream_index];
+ av_log(avf, AV_LOG_DEBUG, "file:%d stream:%d pts:%s pts_time:%s dts:%s
dts_time:%s",
+ (unsigned)(ram->cur_file - ram->files), pkt->stream_index,
+ av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
+ av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
+
+ delta = av_rescale_q(ram->cur_file->start_time -
ram->cur_file->file_inpoint,
+ AV_TIME_BASE_Q,
+ ram->avf->streams[pkt->stream_index]->time_base);
+ if (pkt->pts != AV_NOPTS_VALUE)
+ pkt->pts += delta;
+ if (pkt->dts != AV_NOPTS_VALUE)
+ pkt->dts += delta;
+ av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n",
+ av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base),
+ av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base));
+ if (ram->cur_file->metadata) {
+ uint8_t* metadata;
+ int metadata_len;
+ char* packed_metadata =
av_packet_pack_dictionary(ram->cur_file->metadata, &metadata_len);
+ if (!packed_metadata)
+ return AVERROR(ENOMEM);
+ if (!(metadata = av_packet_new_side_data(pkt,
AV_PKT_DATA_STRINGS_METADATA, metadata_len))) {
+ av_freep(&packed_metadata);
+ return AVERROR(ENOMEM);
+ }
+ memcpy(metadata, packed_metadata, metadata_len);
+ av_freep(&packed_metadata);
+ }
+ return ret;
+}
+
+AVInputFormat ff_ram_demuxer = {
+ .name = "ram",
+ .long_name = NULL_IF_CONFIG_SMALL("RAM (Real media playlist)"),
+ .priv_data_size = sizeof(RamContext),
+ .read_probe = ram_probe,
+ .read_header = ram_read_header,
+ .read_packet = ram_read_packet,
+ .read_close = ram_read_close,
+ .extensions = "ram",
+};
--
2.6.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
