[FFmpeg-devel] [PATCH 2/2] Ensoniq Paris Audio File demuxer

[Michael Niedermayer]

On Wed, Nov 28, 2012 at 02:09:02AM +0000, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
>  doc/general.texi         |   1 +
>  libavformat/Makefile     |   1 +
>  libavformat/allformats.c |   1 +
>  libavformat/epafdec.c    | 120 +++++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 123 insertions(+)
>  create mode 100644 libavformat/epafdec.c
> 
> diff --git a/doc/general.texi b/doc/general.texi
> index 0e10d30..d421e45 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -199,6 +199,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.
> + at 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
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 463ce32..7d7207a 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -94,6 +94,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
>  OBJS-$(CONFIG_FFM_DEMUXER)               += ffmdec.o
>  OBJS-$(CONFIG_FFM_MUXER)                 += ffmenc.o
>  OBJS-$(CONFIG_FFMETADATA_DEMUXER)        += ffmetadec.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 6c721c4..df1dc70 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -97,6 +97,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);
> diff --git a/libavformat/epafdec.c b/libavformat/epafdec.c
> new file mode 100644
> index 0000000..0b2fedc
> --- /dev/null
> +++ b/libavformat/epafdec.c
> @@ -0,0 +1,120 @@
> +/*
> + * 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"
> +
> +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 unsigned int get_long(AVFormatContext *s, int le)
> +{
> +    unsigned v = le ? avio_rl32(s->pb) : avio_rb32(s->pb);
> +    return v;
> +}
> +
> +static int epaf_read_header(AVFormatContext *s)
> +{
> +    AVStream *st;
> +    int le;
> +
> +    avio_skip(s->pb, 4);
> +    if (avio_rb32(s->pb)) {
> +        av_log(s, AV_LOG_ERROR, "unknown version\n");
> +        return AVERROR_INVALIDDATA;
> +    }
> +
> +    le = avio_rl32(s->pb);
> +    if (le && le != 1) {
> +        av_log(s, AV_LOG_ERROR, "invalid byte order\n");
> +        return AVERROR_INVALIDDATA;
> +    }
> +
> +    st = avformat_new_stream(s, NULL);
> +    if (!st)
> +        return AVERROR(ENOMEM);
> +
> +    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
> +    st->codec->sample_rate = get_long(s, le);
> +    if (!st->codec->sample_rate)
> +        return AVERROR_INVALIDDATA;
> +
> +    switch (get_long(s, le)) {
> +    case 0:
> +        st->codec->codec_id  = le ? AV_CODEC_ID_PCM_S16LE : AV_CODEC_ID_PCM_S16BE;
> +        break;
> +    case 1:
> +        st->codec->codec_id  = AV_CODEC_ID_PCM_S24PARIS;
> +        break;
> +    case 2:
> +        st->codec->codec_id  = AV_CODEC_ID_PCM_S8;
> +        break;
> +    }
> +
> +    st->codec->channels = get_long(s, le);
> +    if (!st->codec->channels)
> +        return AVERROR_INVALIDDATA;
> +

> +    if (!(st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id))) {
> +        st->codec->block_align = 32 * st->codec->channels;
> +        st->codec->bit_rate = st->codec->sample_rate * st->codec->channels * 128 / 5;

the multiplications can overflow

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The greatest way to live with honor in this world is to be what we pretend
to be. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121203/615de5c3/attachment.asc>