[FFmpeg-devel] [PATCH] SoX native format muxer and demuxer
Daniel Verkamp
daniel
Thu May 28 03:49:33 CEST 2009
On Wed, May 27, 2009 at 9:44 PM, Daniel Verkamp <daniel at drv.nu> wrote:
> On Wed, May 27, 2009 at 8:41 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
>> uOn Wed, May 27, 2009 at 07:25:13PM -0400, Daniel Verkamp wrote:
>>> On Wed, May 27, 2009 at 6:29 PM, Daniel Verkamp <daniel at drv.nu> wrote:
>>> > Hi,
>>> >
>>> > Attached is a patch to add a muxer and demuxer for the (very simple)
>>> > SoX native format.
>>> >
>>> > This requires my previous "get/put_{le,be}_{float,double}" patch.
>>> >
>>>
>>> New patch that uses av_int2dbl etc. instead of get_le_double etc.
>>>
>>> Please ignore the original patch. :)
>> [...]
>>> +#define SOX_TAG_LE MKTAG('.', 'S', 'o', 'X')
>>> +#define SOX_TAG_BE MKTAG('X', 'o', 'S', '.')
>>
>> these seem a little redundant relative to each other
>>
>
> Right, cleaned up.
>
>> [...]
>>> +static int sox_read_header(AVFormatContext *s,
>>> + ? ? ? ? ? ? ? ? ? ? ? ? ? AVFormatParameters *ap)
>>> +{
>>> + ? ?ByteIOContext *pb = s->pb;
>>> + ? ?unsigned magic, header_size, comment_size, le;
>>> + ? ?double sample_rate, sample_rate_frac;
>>> + ? ?AVStream *st;
>>> +
>>> + ? ?magic = get_le32(pb);
>>> + ? ?if (magic == SOX_TAG_LE) {
>>> + ? ? ? ?le = 1;
>>> + ? ?} else if (magic == SOX_TAG_BE) {
>>> + ? ? ? ?le = 0;
>>> + ? ?} else
>>> + ? ? ? ?return -1;
>>
>> le = (get_le32(pb) == SOX_TAG_LE);
>>
>
> This doesn't check for an invalid tag, but I guess if the user forces
> the wrong format, he's asking for it...
>
>>
>>> +
>>> + ? ?st = av_new_stream(s, 0);
>>> + ? ?if (!st)
>>> + ? ? ? ?return AVERROR(ENOMEM);
>>> +
>>> + ? ?st->codec->codec_type = CODEC_TYPE_AUDIO;
>>> +
>>> + ? ?if (le) {
>>> + ? ? ? ?st->codec->codec_id = CODEC_ID_PCM_S32LE;
>>> + ? ? ? ?header_size ? ? ? ? = get_le32(pb);
>>> + ? ? ? ?url_fskip(pb, 8); /* sample count */
>>> + ? ? ? ?sample_rate ? ? ? ? = av_int2dbl(get_le64(pb));
>>> + ? ? ? ?st->codec->channels = get_le32(pb);
>>> + ? ? ? ?comment_size ? ? ? ?= get_le32(pb);
>>> + ? ?} else {
>>> + ? ? ? ?st->codec->codec_id = CODEC_ID_PCM_S32BE;
>>> + ? ? ? ?header_size ? ? ? ? = get_be32(pb);
>>> + ? ? ? ?url_fskip(pb, 8); /* sample count */
>>> + ? ? ? ?sample_rate ? ? ? ? = av_int2dbl(get_be64(pb));
>>> + ? ? ? ?st->codec->channels = get_be32(pb);
>>> + ? ? ? ?comment_size ? ? ? ?= get_be32(pb);
>>> + ? ?}
>>> +
>>> + ? ?if (sample_rate <= 0 || sample_rate > INT_MAX) {
>>> + ? ? ? ?av_log(s, AV_LOG_ERROR, "invalid sample rate (%f)\n", sample_rate);
>>> + ? ? ? ?return -1;
>>> + ? ?}
>>> +
>>> + ? ?sample_rate_frac = sample_rate - floor(sample_rate);
>>> + ? ?if (sample_rate_frac)
>>> + ? ? ? ?av_log(s, AV_LOG_WARNING,
>>> + ? ? ? ? ? ? ? "truncating fractional part of sample rate (%f)\n",
>>> + ? ? ? ? ? ? ? sample_rate_frac);
>>> +
>>> + ? ?if (((header_size + 4) & 7) || header_size < SOX_FIXED_HDR + comment_size
>>
>>> + ? ? ? ?|| (st->codec->channels > 65535)) /* Reserve top 16 bits */ {
>>
>> superflous ()
>>
>
> Cleaned up (this line was lifted from the SoX code ;).
>
>>
>>> + ? ? ? ?av_log(s, AV_LOG_ERROR, "invalid header\n");
>>> + ? ? ? ?return -1;
>>> + ? ?}
>>> +
>>> + ? ?if (comment_size) {
>>> + ? ? ? ?char *comment= av_mallocz(comment_size + FF_INPUT_BUFFER_PADDING_SIZE);
>>
>> possible integer overflow
>>
>
> Hopefully fixed - if for some reason there is a file that has such a
> huge comment_size coded, the new patch should at least skip it
> properly.
>
Actually, with a comment size that large, header size could not be
properly coded in the bits available, and the file would be invalid
anyway, so here's a better check.
Thanks,
-- Daniel Verkamp
-------------- next part --------------
>From 64b89687c7530650cc20c4dd6126521b721b8d45 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel at drv.nu>
Date: Wed, 27 May 2009 21:40:31 -0400
Subject: [PATCH] SoX native format muxer and demuxer
---
Changelog | 1 +
doc/general.texi | 1 +
libavformat/Makefile | 2 +
libavformat/allformats.c | 1 +
libavformat/sox.h | 29 +++++++++
libavformat/soxdec.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++
libavformat/soxenc.c | 128 +++++++++++++++++++++++++++++++++++++++
7 files changed, 312 insertions(+), 0 deletions(-)
create mode 100644 libavformat/sox.h
create mode 100644 libavformat/soxdec.c
create mode 100644 libavformat/soxenc.c
diff --git a/Changelog b/Changelog
index 13055ed..0d7152b 100644
--- a/Changelog
+++ b/Changelog
@@ -21,6 +21,7 @@ version <next>:
- V210 decoder and encoder
- remaining GPL parts in AC-3 decoder converted to LGPL
- QCP demuxer
+- SoX native format muxer and demuxer
diff --git a/doc/general.texi b/doc/general.texi
index 292b8af..63c3b19 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -209,6 +209,7 @@ library:
@item Sony OpenMG (OMA) @tab @tab X
@tab Audio format used in Sony Sonic Stage and Sony Vegas.
@item Sony PlayStation STR @tab @tab X
+ at item SoX native format @tab X @tab X
@item SUN AU format @tab X @tab X
@item THP @tab @tab X
@tab Used on the Nintendo GameCube.
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0e35318..09db41e 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -204,6 +204,8 @@ OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o
OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o
OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o
+OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o
+OBJS-$(CONFIG_SOX_MUXER) += soxenc.o
OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o
OBJS-$(CONFIG_SWF_MUXER) += swfenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 822682b..ad47631 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -177,6 +177,7 @@ void av_register_all(void)
REGISTER_DEMUXER (SIFF, siff);
REGISTER_DEMUXER (SMACKER, smacker);
REGISTER_DEMUXER (SOL, sol);
+ REGISTER_MUXDEMUX (SOX, sox);
REGISTER_DEMUXER (STR, str);
REGISTER_MUXDEMUX (SWF, swf);
REGISTER_MUXER (TG2, tg2);
diff --git a/libavformat/sox.h b/libavformat/sox.h
new file mode 100644
index 0000000..f4a12e9
--- /dev/null
+++ b/libavformat/sox.h
@@ -0,0 +1,29 @@
+/*
+ * SoX native format common data
+ * 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
+ */
+
+#ifndef AVFORMAT_SOX_H
+#define AVFORMAT_SOX_H
+
+#define SOX_FIXED_HDR (4 + 8 + 8 + 4 + 4) /**< Size of fixed header without magic */
+
+#define SOX_TAG MKTAG('.', 'S', 'o', 'X')
+
+#endif /* AVFORMAT_SOX_H */
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
new file mode 100644
index 0000000..00f8b42
--- /dev/null
+++ b/libavformat/soxdec.c
@@ -0,0 +1,150 @@
+/*
+ * SoX native format demuxer
+ * Copyright (c) 2009 Daniel Verkamp <daniel at drv.nu>
+ *
+ * Based on libSoX sox-fmt.c
+ * Copyright (c) 2008 robs at users.sourceforge.net
+ *
+ * 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
+ */
+
+/**
+ * SoX native format demuxer
+ * @file libavformat/soxdec.c
+ * @author Daniel Verkamp
+ * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "raw.h"
+#include "sox.h"
+
+static int sox_probe(AVProbeData *p)
+{
+ if (AV_RL32(p->buf) == SOX_TAG || AV_RB32(p->buf) == SOX_TAG)
+ return AVPROBE_SCORE_MAX;
+ return 0;
+}
+
+static int sox_read_header(AVFormatContext *s,
+ AVFormatParameters *ap)
+{
+ ByteIOContext *pb = s->pb;
+ unsigned header_size, comment_size, le;
+ double sample_rate, sample_rate_frac;
+ AVStream *st;
+
+ le = (get_le32(pb) == SOX_TAG);
+
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+
+ if (le) {
+ st->codec->codec_id = CODEC_ID_PCM_S32LE;
+ header_size = get_le32(pb);
+ url_fskip(pb, 8); /* sample count */
+ sample_rate = av_int2dbl(get_le64(pb));
+ st->codec->channels = get_le32(pb);
+ comment_size = get_le32(pb);
+ } else {
+ st->codec->codec_id = CODEC_ID_PCM_S32BE;
+ header_size = get_be32(pb);
+ url_fskip(pb, 8); /* sample count */
+ sample_rate = av_int2dbl(get_be64(pb));
+ st->codec->channels = get_be32(pb);
+ comment_size = get_be32(pb);
+ }
+
+ if (comment_size >= 0xFFFFFFDFU) {
+ av_log(s, AV_LOG_ERROR, "invalid comment size (%u)\n", comment_size);
+ return -1;
+ }
+
+ if (sample_rate <= 0 || sample_rate > INT_MAX) {
+ av_log(s, AV_LOG_ERROR, "invalid sample rate (%f)\n", sample_rate);
+ return -1;
+ }
+
+ sample_rate_frac = sample_rate - floor(sample_rate);
+ if (sample_rate_frac)
+ av_log(s, AV_LOG_WARNING,
+ "truncating fractional part of sample rate (%f)\n",
+ sample_rate_frac);
+
+ if ((header_size + 4) & 7 || header_size < SOX_FIXED_HDR + comment_size
+ || st->codec->channels > 65535) /* Reserve top 16 bits */ {
+ av_log(s, AV_LOG_ERROR, "invalid header\n");
+ return -1;
+ }
+
+ if (comment_size) {
+ char *comment = av_mallocz(comment_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (get_buffer(pb, comment, comment_size) != comment_size) {
+ av_freep(&comment);
+ return AVERROR_IO;
+ }
+ av_metadata_set(&s->metadata, "comment", comment);
+ av_freep(&comment);
+ }
+
+ url_fskip(pb, header_size - SOX_FIXED_HDR - comment_size);
+
+ st->codec->sample_rate = sample_rate;
+ st->codec->sample_fmt = SAMPLE_FMT_S32;
+ st->codec->bits_per_coded_sample = 32;
+ st->codec->bit_rate = st->codec->sample_rate *
+ st->codec->bits_per_coded_sample *
+ st->codec->channels;
+
+ av_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+ return 0;
+}
+
+#define MAX_SIZE 4096
+
+static int sox_read_packet(AVFormatContext *s,
+ AVPacket *pkt)
+{
+ int ret;
+
+ if (url_feof(s->pb))
+ return AVERROR_EOF;
+
+ ret = av_get_packet(s->pb, pkt, MAX_SIZE);
+ if (ret < 0)
+ return AVERROR(EIO);
+ pkt->stream_index = 0;
+ pkt->size = ret;
+
+ return 0;
+}
+
+AVInputFormat sox_demuxer = {
+ "sox",
+ NULL_IF_CONFIG_SMALL("SoX native format"),
+ 0,
+ sox_probe,
+ sox_read_header,
+ sox_read_packet,
+ NULL,
+ pcm_read_seek,
+};
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
new file mode 100644
index 0000000..b062c86
--- /dev/null
+++ b/libavformat/soxenc.c
@@ -0,0 +1,128 @@
+/*
+ * SoX native format muxer
+ * Copyright (c) 2009 Daniel Verkamp <daniel at drv.nu>
+ *
+ * Based on libSoX sox-fmt.c
+ * Copyright (c) 2008 robs at users.sourceforge.net
+ *
+ * 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
+ */
+
+/**
+ * SoX native format muxer
+ * @file libavformat/soxenc.c
+ * @author Daniel Verkamp
+ * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
+ */
+
+#include "libavutil/intreadwrite.h"
+#include "avformat.h"
+#include "sox.h"
+
+typedef struct {
+ int64_t header_size;
+} SoXContext;
+
+static int sox_write_header(AVFormatContext *s)
+{
+ SoXContext *sox = s->priv_data;
+ ByteIOContext *pb = s->pb;
+ AVCodecContext *enc = s->streams[0]->codec;
+ AVMetadataTag *comment;
+ size_t comment_len = 0, comment_size, pad;
+
+ comment = av_metadata_get(s->metadata, "comment", NULL, 0);
+ if (comment)
+ comment_len = strlen(comment->value);
+ comment_size = (comment_len + 7) & ~7;
+
+ sox->header_size = SOX_FIXED_HDR + comment_size;
+
+ if (enc->codec_id == CODEC_ID_PCM_S32LE) {
+ put_tag(pb, ".SoX");
+ put_le32(pb, sox->header_size);
+ put_le64(pb, 0); /* number of samples */
+ put_le64(pb, av_dbl2int(enc->sample_rate));
+ put_le32(pb, enc->channels);
+ put_le32(pb, comment_size);
+ } else if (enc->codec_id == CODEC_ID_PCM_S32BE) {
+ put_tag(pb, "XoS.");
+ put_be32(pb, sox->header_size);
+ put_be64(pb, 0); /* number of samples */
+ put_be64(pb, av_dbl2int(enc->sample_rate));
+ put_be32(pb, enc->channels);
+ put_be32(pb, comment_size);
+ } else {
+ av_log(s, AV_LOG_ERROR, "invalid codec; use pcm_s32le or pcm_s32be\n");
+ return -1;
+ }
+
+ if (comment_len)
+ put_buffer(pb, comment->value, comment_len);
+
+ for (pad = comment_size - comment_len; pad; pad--)
+ put_byte(pb, 0);
+
+ put_flush_packet(pb);
+
+ return 0;
+}
+
+static int sox_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ ByteIOContext *pb = s->pb;
+ put_buffer(pb, pkt->data, pkt->size);
+ return 0;
+}
+
+static int sox_write_trailer(AVFormatContext *s)
+{
+ SoXContext *sox = s->priv_data;
+ ByteIOContext *pb = s->pb;
+ AVCodecContext *enc = s->streams[0]->codec;
+ int64_t file_size;
+
+ if (!url_is_streamed(s->pb)) {
+ int64_t num_samples;
+ /* update number of samples */
+ file_size = url_ftell(pb);
+ num_samples = (file_size - sox->header_size - 4) >> 2LL;
+ url_fseek(pb, 8, SEEK_SET);
+ if (enc->codec_id == CODEC_ID_PCM_S32LE) {
+ put_le64(pb, num_samples);
+ } else
+ put_be64(pb, num_samples);
+ url_fseek(pb, file_size, SEEK_SET);
+
+ put_flush_packet(pb);
+ }
+
+ return 0;
+}
+
+AVOutputFormat sox_muxer = {
+ "sox",
+ NULL_IF_CONFIG_SMALL("SoX native format"),
+ NULL,
+ "sox",
+ sizeof(SoXContext),
+ CODEC_ID_PCM_S32LE,
+ CODEC_ID_NONE,
+ sox_write_header,
+ sox_write_packet,
+ sox_write_trailer,
+};
--
1.6.3.1
More information about the ffmpeg-devel
mailing list