@@ -35,6 +35,7 @@ version <next>:

 - PVF demuxer

 - subtitles filter

 - IRCAM muxer/demuxer

+- Paris Audio File demuxer

 version 1.0:

@@ -201,6 +201,7 @@ library:

 @item Electronic Arts cdata  @tab    @tab X

 @item Electronic Arts Multimedia  @tab    @tab X

     @tab Used in various EA games; files have extensions like WVE and UV2.

+@item Ensoniq Paris Audio File  @tab   @tab X

 @item FFM (FFserver live feed)  @tab X @tab X

 @item Flash (SWF)               @tab X @tab X

 @item Flash 9 (AVM2)            @tab X @tab X

@@ -115,6 +115,7 @@ OBJS-$(CONFIG_EA_CDATA_DEMUXER)          += eacdata.o

 OBJS-$(CONFIG_EA_DEMUXER)                += electronicarts.o

 OBJS-$(CONFIG_EAC3_DEMUXER)              += ac3dec.o rawdec.o

 OBJS-$(CONFIG_EAC3_MUXER)                += rawenc.o

+OBJS-$(CONFIG_EPAF_DEMUXER)              += epafdec.o pcm.o

 OBJS-$(CONFIG_FFM_DEMUXER)               += ffmdec.o

 OBJS-$(CONFIG_FFM_MUXER)                 += ffmenc.o

 OBJS-$(CONFIG_FFMETADATA_DEMUXER)        += ffmetadec.o

@@ -98,6 +98,7 @@ void av_register_all(void)

     REGISTER_DEMUXER  (EA, ea);

     REGISTER_DEMUXER  (EA_CDATA, ea_cdata);

     REGISTER_MUXDEMUX (EAC3, eac3);

+    REGISTER_DEMUXER  (EPAF, epaf);

     REGISTER_MUXER    (F4V, f4v);

     REGISTER_MUXDEMUX (FFM, ffm);

     REGISTER_MUXDEMUX (FFMETADATA, ffmetadata);

new file mode 100644

@@ -0,0 +1,104 @@

+/*

+ * Ensoniq Paris Audio File 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 "libavutil/intreadwrite.h"

+#include "avformat.h"

+#include "internal.h"

+#include "pcm.h"

+

+static int epaf_probe(AVProbeData *p)

+{

+    if (((AV_RL32(p->buf) == MKTAG('f','a','p',' ') &&

+          AV_RL32(p->buf + 8) == 1) ||

+         (AV_RL32(p->buf) == MKTAG(' ','p','a','f') &&

+          AV_RN32(p->buf + 8) == 0)) &&

+       !AV_RN32(p->buf +  4) && AV_RN32(p->buf + 12) &&

+        AV_RN32(p->buf + 20))

+        return AVPROBE_SCORE_MAX / 4 * 3;

+    return 0;

+}

+

+static int epaf_read_header(AVFormatContext *s)

+{

+    int le, sample_rate, codec, channels;

+    AVStream *st;

+

+    avio_skip(s->pb, 4);

+    if (avio_rl32(s->pb))

+        return AVERROR_INVALIDDATA;

+

+    le = avio_rl32(s->pb);

+    if (le && le != 1)

+        return AVERROR_INVALIDDATA;

+

+    if (le) {

+        sample_rate = avio_rl32(s->pb);

+        codec       = avio_rl32(s->pb);

+        channels    = avio_rl32(s->pb);

+    } else {

+        sample_rate = avio_rb32(s->pb);

+        codec       = avio_rb32(s->pb);

+        channels    = avio_rb32(s->pb);

+    }

+

+    if (!channels || !sample_rate)

+        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;

+    switch (codec) {

+    case 0:

+        st->codec->codec_id = le ? AV_CODEC_ID_PCM_S16LE : AV_CODEC_ID_PCM_S16BE;

+        break;

+    case 2:

+        st->codec->codec_id = AV_CODEC_ID_PCM_S8;

+        break;

+    case 1:

+        av_log_missing_feature(s, "24-bit Paris PCM format", 1);

+    default:

+        return AVERROR_INVALIDDATA;

+    }

+

+    st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id);

+    st->codec->block_align = st->codec->bits_per_coded_sample * st->codec->channels / 8;

+

+    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);

+

+    if (avio_skip(s->pb, 2024) < 0)

+        return AVERROR_INVALIDDATA;

+    return 0;

+}

+

+AVInputFormat ff_epaf_demuxer = {

+    .name           = "epaf",

+    .long_name      = NULL_IF_CONFIG_SMALL("Ensoniq Paris Audio File"),

+    .read_probe     = epaf_probe,

+    .read_header    = epaf_read_header,

+    .read_packet    = ff_pcm_read_packet,

+    .read_seek      = ff_pcm_read_seek,

+    .extensions     = "paf,fap",

+    .flags          = AVFMT_GENERIC_INDEX,

+};

@@ -30,7 +30,7 @@

 #include "libavutil/avutil.h"

 #define LIBAVFORMAT_VERSION_MAJOR 54

-#define LIBAVFORMAT_VERSION_MINOR 45

+#define LIBAVFORMAT_VERSION_MINOR 46

 #define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \