[FFmpeg-cvslog] Vivo demuxer

Daniel Verkamp git at videolan.org
Wed Nov 28 21:17:17 CET 2012


ffmpeg | branch: master | Daniel Verkamp <daniel at drv.nu> | Wed Dec 21 02:20:04 2011 +0000| [a0958949ebe115e5dd661c9292c29a8ab7958c22] | committer: Paul B Mahol

Vivo demuxer

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0958949ebe115e5dd661c9292c29a8ab7958c22
---

 doc/general.texi         |    1 +
 libavformat/Makefile     |    1 +
 libavformat/allformats.c |    1 +
 libavformat/version.h    |    2 +-
 libavformat/vivo.c       |  311 ++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 315 insertions(+), 1 deletion(-)

diff --git a/doc/general.texi b/doc/general.texi
index 0e10d30..66a06ab 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -377,6 +377,7 @@ library:
     @tab Tiertex .seq files used in the DOS CD-ROM version of the game Flashback.
 @item True Audio                @tab   @tab X
 @item VC-1 test bitstream       @tab X @tab X
+ at item Vivo                      @tab   @tab X
 @item WAV                       @tab X @tab X
 @item WavPack                   @tab X @tab X
 @item WebM                      @tab X @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index f0d2105..489fad6 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -353,6 +353,7 @@ OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o
 OBJS-$(CONFIG_VC1_DEMUXER)               += rawdec.o
 OBJS-$(CONFIG_VC1T_DEMUXER)              += vc1test.o
 OBJS-$(CONFIG_VC1T_MUXER)                += vc1testenc.o
+OBJS-$(CONFIG_VIVO_DEMUXER)              += vivo.o
 OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.o
 OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.o voc.o
 OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.o voc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6c721c4..8468846 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -251,6 +251,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (TTY, tty);
     REGISTER_DEMUXER  (VC1, vc1);
     REGISTER_MUXDEMUX (VC1T, vc1t);
+    REGISTER_DEMUXER  (VIVO, vivo);
     REGISTER_DEMUXER  (VMD, vmd);
     REGISTER_MUXDEMUX (VOC, voc);
     REGISTER_DEMUXER  (VQF, vqf);
diff --git a/libavformat/version.h b/libavformat/version.h
index 10391b3..cc212c7 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 54
-#define LIBAVFORMAT_VERSION_MINOR 38
+#define LIBAVFORMAT_VERSION_MINOR 39
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavformat/vivo.c b/libavformat/vivo.c
new file mode 100644
index 0000000..e3487f6
--- /dev/null
+++ b/libavformat/vivo.c
@@ -0,0 +1,311 @@
+/*
+ * Vivo stream demuxer
+ * Copyright (c) 2009 Daniel Verkamp <daniel at drv.nu>
+ *
+ * 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
+ * @brief Vivo stream demuxer
+ * @author Daniel Verkamp <daniel at drv.nu>
+ * @sa http://wiki.multimedia.cx/index.php?title=Vivo
+ */
+
+#include "libavutil/parseutils.h"
+#include "avformat.h"
+#include "internal.h"
+
+typedef struct VivoContext {
+    int version;
+
+    int type;
+    int sequence;
+    int length;
+
+    uint8_t  text[1024 + 1];
+} VivoContext;
+
+static int vivo_probe(AVProbeData *p)
+{
+    const unsigned char *buf = p->buf;
+    unsigned c, length = 0;
+
+    // stream must start with packet of type 0 and sequence number 0
+    if (*buf++ != 0)
+        return 0;
+
+    // read at most 2 bytes of coded length
+    c = *buf++;
+    length = c & 0x7F;
+    if (c & 0x80) {
+        c = *buf++;
+        length = (length << 7) | (c & 0x7F);
+    }
+    if (c & 0x80 || length > 1024 || length < 21)
+        return 0;
+
+    if (memcmp(buf, "\r\nVersion:Vivo/", 15))
+        return 0;
+    buf += 15;
+
+    if (*buf < '0' && *buf > '2')
+        return 0;
+
+    return AVPROBE_SCORE_MAX;
+}
+
+static int vivo_get_packet_header(AVFormatContext *s)
+{
+    VivoContext *vivo = s->priv_data;
+    AVIOContext *pb = s->pb;
+    unsigned c, get_length = 0;
+
+    if (url_feof(pb))
+        return AVERROR_EOF;
+
+    c = avio_r8(pb);
+    if (c == 0x82) {
+        get_length = 1;
+        c = avio_r8(pb);
+    }
+
+    vivo->type     = c >> 4;
+    vivo->sequence = c & 0xF;
+
+    switch (vivo->type) {
+    case 0:   get_length =   1; break;
+    case 1: vivo->length = 128; break;
+    case 2:   get_length =   1; break;
+    case 3: vivo->length =  40; break;
+    case 4: vivo->length =  24; break;
+    default:
+        av_log(s, AV_LOG_ERROR, "unknown packet type %d\n", vivo->type);
+        return AVERROR_INVALIDDATA;
+    }
+
+    if (get_length) {
+        c = avio_r8(pb);
+        vivo->length = c & 0x7F;
+        if (c & 0x80) {
+            c = avio_r8(pb);
+            vivo->length = (vivo->length << 7) | (c & 0x7F);
+
+            if (c & 0x80) {
+                av_log(s, AV_LOG_ERROR, "coded length is more than two bytes\n");
+                return AVERROR_INVALIDDATA;
+            }
+        }
+    }
+
+    return 0;
+}
+
+static int vivo_read_header(AVFormatContext *s)
+{
+    VivoContext *vivo = s->priv_data;
+    AVRational fps = { 1, 25};
+    AVStream *ast, *vst;
+    unsigned char *line, *line_end, *key, *value;
+    long value_int;
+    int ret, value_used;
+    int64_t duration = 0;
+    char *end_value;
+
+    vst = avformat_new_stream(s, NULL);
+    ast = avformat_new_stream(s, NULL);
+    if (!ast || !vst)
+        return AVERROR(ENOMEM);
+
+    ast->codec->sample_rate = 8000;
+
+    while (1) {
+        if ((ret = vivo_get_packet_header(s)) < 0)
+            return ret;
+
+        // done reading all text header packets?
+        if (vivo->sequence || vivo->type)
+            break;
+
+        if (vivo->length <= 1024) {
+            avio_read(s->pb, vivo->text, vivo->length);
+            vivo->text[vivo->length] = 0;
+        } else {
+            av_log(s, AV_LOG_WARNING, "too big header, skipping\n");
+            avio_skip(s->pb, vivo->length);
+            continue;
+        }
+
+        line = vivo->text;
+        while (*line) {
+            line_end = strstr(line, "\r\n");
+            if (!line_end)
+                break;
+
+            *line_end = 0;
+            key = line;
+            line = line_end + 2; // skip \r\n
+
+            if (line_end == key) // skip blank lines
+                continue;
+
+            value = strchr(key, ':');
+            if (!value) {
+                av_log(s, AV_LOG_WARNING, "missing colon in key:value pair '%s'\n",
+                       value);
+                continue;
+            }
+
+            *value++ = 0;
+
+            av_log(s, AV_LOG_DEBUG, "header: '%s' = '%s'\n", key, value);
+
+            value_int = strtol(value, &end_value, 10);
+            value_used = 0;
+            if (*end_value == 0) { // valid integer
+                av_log(s, AV_LOG_DEBUG, "got a valid integer (%ld)\n", value_int);
+                value_used = 1;
+                if (!strcmp(key, "Duration")) {
+                    duration = value_int;
+                } else if (!strcmp(key, "Width")) {
+                    vst->codec->width = value_int;
+                } else if (!strcmp(key, "Height")) {
+                    vst->codec->height = value_int;
+                } else if (!strcmp(key, "TimeUnitNumerator")) {
+                    fps.num = value_int / 1000;
+                } else if (!strcmp(key, "TimeUnitDenominator")) {
+                    fps.den = value_int;
+                } else if (!strcmp(key, "SamplingFrequency")) {
+                    ast->codec->sample_rate = value_int;
+                } else if (!strcmp(key, "NominalBitrate")) {
+                } else if (!strcmp(key, "Length")) {
+                    // size of file
+                } else {
+                    value_used = 0;
+                }
+            }
+
+            if (!strcmp(key, "Version")) {
+                if (sscanf(value, "Vivo/%d.", &vivo->version) != 1)
+                    return AVERROR_INVALIDDATA;
+                value_used = 1;
+            } else if (!strcmp(key, "FPS")) {
+                AVRational tmp;
+
+                value_used = 1;
+                if (!av_parse_ratio(&tmp, value, 10000, AV_LOG_WARNING, s))
+                    fps = av_inv_q(tmp);
+            }
+
+            if (!value_used)
+                av_dict_set(&s->metadata, key, value, 0);
+        }
+    }
+
+    avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
+    avpriv_set_pts_info(vst, 64, fps.num, fps.den);
+    if (duration)
+        s->duration = av_rescale(duration, 1000, 1);
+
+    vst->start_time        = 0;
+    vst->codec->codec_tag  = 0;
+    vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+
+    if (vivo->version == 1) {
+        vst->codec->codec_id = CODEC_ID_H263;
+        ast->codec->codec_id = CODEC_ID_G723_1;
+        ast->codec->bits_per_coded_sample = 8;
+    }
+
+    ast->start_time        = 0;
+    ast->codec->codec_tag  = 0;
+    ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    ast->codec->channels = 1;
+
+    return 0;
+}
+
+static int vivo_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    VivoContext *vivo = s->priv_data;
+    AVIOContext *pb = s->pb;
+    unsigned old_sequence = vivo->sequence, old_type = vivo->type;
+    int stream_index, ret = 0;
+
+restart:
+
+    if (url_feof(pb))
+        return AVERROR_EOF;
+
+    switch (vivo->type) {
+    case 0:
+        avio_skip(pb, vivo->length);
+        if ((ret = vivo_get_packet_header(s)) < 0)
+            return ret;
+        goto restart;
+    case 1:
+    case 2: // video
+        stream_index = 0;
+        break;
+    case 3:
+    case 4: // audio
+        stream_index = 1;
+        break;
+    default:
+        av_log(s, AV_LOG_ERROR, "unknown packet type %d\n", vivo->type);
+        return AVERROR_INVALIDDATA;
+    }
+
+    if ((ret = av_get_packet(pb, pkt, vivo->length)) < 0)
+        goto fail;
+
+    // get next packet header
+    if ((ret = vivo_get_packet_header(s)) < 0)
+        goto fail;
+
+    while (vivo->sequence == old_sequence &&
+           (((vivo->type - 1) >> 1) == ((old_type - 1) >> 1))) {
+        if (url_feof(pb)) {
+            ret = AVERROR_EOF;
+            break;
+        }
+
+        if ((ret = av_append_packet(pb, pkt, vivo->length)) < 0)
+            break;
+
+        // get next packet header
+        if ((ret = vivo_get_packet_header(s)) < 0)
+            break;
+    }
+
+    pkt->stream_index = stream_index;
+
+fail:
+    if (ret < 0)
+        av_free_packet(pkt);
+    return ret;
+}
+
+AVInputFormat ff_vivo_demuxer = {
+    .name           = "vivo",
+    .long_name      = NULL_IF_CONFIG_SMALL("Vivo"),
+    .priv_data_size = sizeof(VivoContext),
+    .read_probe     = vivo_probe,
+    .read_header    = vivo_read_header,
+    .read_packet    = vivo_read_packet,
+    .extensions     = "viv",
+};



More information about the ffmpeg-cvslog mailing list