PVF demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>

6 files changed, 91 insertions, 1 deletions

diff --git a/Changelog b/Changelog
index 6ebd07d131..31981d2a2c 100644
--- a/Changelog
+++ b/Changelog
@@ -32,6 +32,7 @@ version <next>:
 - ADPCM IMA Dialogic decoder
 - BRSTM demuxer
 - animated GIF decoder and demuxer
+- PVF demuxer
 
 
 version 1.0:
diff --git a/doc/general.texi b/doc/general.texi
index 9a5dfcdf33..56981064d2 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -286,6 +286,7 @@ library:
     @tab NUT Open Container Format
 @item Ogg                       @tab X @tab X
 @item Playstation Portable PMP  @tab   @tab X
+@item Portable Voice Format     @tab   @tab X
 @item TechnoTrend PVA           @tab   @tab X
     @tab Used by TechnoTrend DVB PCI boards.
 @item QCP                       @tab   @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index bc4e076823..19378b37cf 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -268,6 +268,7 @@ OBJS-$(CONFIG_PCM_U8_DEMUXER)            += pcmdec.o pcm.o
 OBJS-$(CONFIG_PCM_U8_MUXER)              += pcmenc.o rawenc.o
 OBJS-$(CONFIG_PMP_DEMUXER)               += pmpdec.o
 OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o
+OBJS-$(CONFIG_PVF_DEMUXER)               += pvfdec.o pcm.o
 OBJS-$(CONFIG_QCP_DEMUXER)               += qcp.o
 OBJS-$(CONFIG_R3D_DEMUXER)               += r3d.o
 OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += rawvideodec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 2c32cc28fd..2987b8a85b 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -204,6 +204,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (PMP, pmp);
     REGISTER_MUXER    (PSP, psp);
     REGISTER_DEMUXER  (PVA, pva);
+    REGISTER_DEMUXER  (PVF, pvf);
     REGISTER_DEMUXER  (QCP, qcp);
     REGISTER_DEMUXER  (R3D, r3d);
     REGISTER_MUXDEMUX (RAWVIDEO, rawvideo);
diff --git a/libavformat/pvfdec.c b/libavformat/pvfdec.c
new file mode 100644
index 0000000000..9d18256688
--- /dev/null
+++ b/libavformat/pvfdec.c
@@ -0,0 +1,86 @@
+/*
+ * PVF demuxer
+ * Copyright (c) 2012 Paul B Mahol
+ *
+ * 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 "avformat.h"
+#include "internal.h"
+#include "pcm.h"
+
+static int pvf_probe(AVProbeData *p)
+{
+    if (!memcmp(p->buf, "PVF1\n", 5))
+        return AVPROBE_SCORE_MAX;
+    return 0;
+}
+
+static int pvf_read_header(AVFormatContext *s)
+{
+    char buffer[32];
+    AVStream *st;
+    int bps, channels, sample_rate;
+
+    avio_skip(s->pb, 5);
+    ff_get_line(s->pb, (char *)&buffer, 32);
+    if (sscanf(buffer, "%d %d %d",
+               &channels,
+               &sample_rate,
+               &bps) != 3)
+        return AVERROR_INVALIDDATA;
+
+    if (channels <= 0 || bps <= 0 || sample_rate <= 0)
+        return AVERROR_INVALIDDATA;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
+    st->codec->channels    = channels;
+    st->codec->sample_rate = sample_rate;
+    st->codec->codec_id    = ff_get_pcm_codec_id(bps, 0, 1, 0xFFFF);
+    st->codec->bits_per_coded_sample = bps;
+    st->codec->block_align = bps * st->codec->channels / 8;
+
+    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+    return 0;
+}
+
+static int pvf_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int ret;
+
+    ret = av_get_packet(s->pb, pkt, 1024 * s->streams[0]->codec->block_align);
+    pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
+    pkt->stream_index = 0;
+
+    return ret;
+}
+
+AVInputFormat ff_pvf_demuxer = {
+    .name           = "pvf",
+    .long_name      = NULL_IF_CONFIG_SMALL("PVF (Portable Voice Format)"),
+    .read_probe     = pvf_probe,
+    .read_header    = pvf_read_header,
+    .read_packet    = pvf_read_packet,
+    .read_seek      = ff_pcm_read_seek,
+    .extensions     = "pvf",
+    .flags          = AVFMT_GENERIC_INDEX,
+};
diff --git a/libavformat/version.h b/libavformat/version.h
index 4bea059735..d82b948b52 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 41
+#define LIBAVFORMAT_VERSION_MINOR 42
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \