[FFmpeg-devel] [PATCH] w64 muxer
Stefano Sabatini
stefasab at gmail.com
Sun Dec 30 11:36:37 CET 2012
On date Friday 2012-12-28 16:48:55 +0000, Paul B Mahol encoded:
> Signed-off-by: Paul B Mahol <onemda at gmail.com>
> ---
> doc/general.texi | 2 +-
> libavformat/Makefile | 3 +-
> libavformat/allformats.c | 2 +-
> libavformat/w64.c | 33 ++++++++++++++++++++
> libavformat/w64.h | 27 ++++++++++++++++
> libavformat/wavdec.c | 27 +++++-----------
> libavformat/wavenc.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++
> 7 files changed, 153 insertions(+), 22 deletions(-)
> create mode 100644 libavformat/w64.c
> create mode 100644 libavformat/w64.h
>
> diff --git a/doc/general.texi b/doc/general.texi
> index 5dc1954..0f56ba3 100644
> --- a/doc/general.texi
> +++ b/doc/general.texi
> @@ -374,7 +374,7 @@ library:
> @item Sony OpenMG (OMA) @tab X @tab X
> @tab Audio format used in Sony Sonic Stage and Sony Vegas.
> @item Sony PlayStation STR @tab @tab X
> - at item Sony Wave64 (W64) @tab @tab X
> + at item Sony Wave64 (W64) @tab X @tab X
> @item SoX native format @tab X @tab X
> @item SUN AU format @tab X @tab X
> @item Text files @tab @tab X
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 587fa42..bee24cc 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -366,7 +366,8 @@ OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
> OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o
> OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o
> OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o
> -OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o pcm.o
> +OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o
> +OBJS-$(CONFIG_W64_MUXER) += wavenc.o w64.o
> OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o
> OBJS-$(CONFIG_WAV_MUXER) += wavenc.o
> OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 6b4c27b..838cd43 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -264,7 +264,7 @@ void av_register_all(void)
> REGISTER_DEMUXER (VOBSUB, vobsub);
> REGISTER_MUXDEMUX (VOC, voc);
> REGISTER_DEMUXER (VQF, vqf);
> - REGISTER_DEMUXER (W64, w64);
> + REGISTER_MUXDEMUX (W64, w64);
> REGISTER_MUXDEMUX (WAV, wav);
> REGISTER_DEMUXER (WC3, wc3);
> REGISTER_MUXER (WEBM, webm);
> diff --git a/libavformat/w64.c b/libavformat/w64.c
> new file mode 100644
> index 0000000..697d542
> --- /dev/null
> +++ b/libavformat/w64.c
> @@ -0,0 +1,33 @@
> +/*
> + * Copyright (c) 2009 Daniel Verkamp
> + *
> + * 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 <stdint.h>
> +
> +const uint8_t ff_guid_riff[16] = { 'r', 'i', 'f', 'f',
> + 0x2E, 0x91, 0xCF, 0x11, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 };
> +
> +const uint8_t ff_guid_wave[16] = { 'w', 'a', 'v', 'e',
> + 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
> +
> +const uint8_t ff_guid_fmt [16] = { 'f', 'm', 't', ' ',
> + 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
> +
> +const uint8_t ff_guid_data[16] = { 'd', 'a', 't', 'a',
> + 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
> diff --git a/libavformat/w64.h b/libavformat/w64.h
> new file mode 100644
> index 0000000..3d0d459
> --- /dev/null
> +++ b/libavformat/w64.h
> @@ -0,0 +1,27 @@
> +/*
> + * 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_W64_H
> +#define AVFORMAT_W64_H
> +
> +extern const uint8_t ff_guid_riff[16];
> +extern const uint8_t ff_guid_wave[16];
> +extern const uint8_t ff_guid_fmt [16];
> +extern const uint8_t ff_guid_data[16];
> +
> +#endif /* AVFORMAT_W64_H */
> diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
> index 62bf263..21682e2 100644
> --- a/libavformat/wavdec.c
> +++ b/libavformat/wavdec.c
> @@ -33,6 +33,7 @@
> #include "avio_internal.h"
> #include "pcm.h"
> #include "riff.h"
> +#include "w64.h"
> #include "avio.h"
> #include "metadata.h"
>
> @@ -396,9 +397,6 @@ static int64_t find_guid(AVIOContext *pb, const uint8_t guid1[16])
> return -1;
> }
>
> -static const uint8_t guid_data[16] = { 'd', 'a', 't', 'a',
> - 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
> -
> #define MAX_SIZE 4096
>
> static int wav_read_packet(AVFormatContext *s,
> @@ -455,7 +453,7 @@ smv_out:
> left= INT_MAX;
> if (left <= 0){
> if (CONFIG_W64_DEMUXER && wav->w64)
> - left = find_guid(s->pb, guid_data) - 24;
> + left = find_guid(s->pb, ff_guid_data) - 24;
> else
> left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
> if (left < 0) {
> @@ -541,21 +539,12 @@ AVInputFormat ff_wav_demuxer = {
>
>
> #if CONFIG_W64_DEMUXER
> -static const uint8_t guid_riff[16] = { 'r', 'i', 'f', 'f',
> - 0x2E, 0x91, 0xCF, 0x11, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 };
> -
> -static const uint8_t guid_wave[16] = { 'w', 'a', 'v', 'e',
> - 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
> -
> -static const uint8_t guid_fmt [16] = { 'f', 'm', 't', ' ',
> - 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A };
> -
> static int w64_probe(AVProbeData *p)
> {
> if (p->buf_size <= 40)
> return 0;
> - if (!memcmp(p->buf, guid_riff, 16) &&
> - !memcmp(p->buf + 24, guid_wave, 16))
> + if (!memcmp(p->buf, ff_guid_riff, 16) &&
> + !memcmp(p->buf + 24, ff_guid_wave, 16))
> return AVPROBE_SCORE_MAX;
> else
> return 0;
> @@ -571,19 +560,19 @@ static int w64_read_header(AVFormatContext *s)
> int ret;
>
> avio_read(pb, guid, 16);
> - if (memcmp(guid, guid_riff, 16))
> + if (memcmp(guid, ff_guid_riff, 16))
> return -1;
>
> if (avio_rl64(pb) < 16 + 8 + 16 + 8 + 16 + 8) /* riff + wave + fmt + sizes */
> return -1;
>
> avio_read(pb, guid, 16);
> - if (memcmp(guid, guid_wave, 16)) {
> + if (memcmp(guid, ff_guid_wave, 16)) {
> av_log(s, AV_LOG_ERROR, "could not find wave guid\n");
> return -1;
> }
>
> - size = find_guid(pb, guid_fmt);
> + size = find_guid(pb, ff_guid_fmt);
> if (size < 0) {
> av_log(s, AV_LOG_ERROR, "could not find fmt guid\n");
> return -1;
> @@ -604,7 +593,7 @@ static int w64_read_header(AVFormatContext *s)
>
> avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
>
> - size = find_guid(pb, guid_data);
> + size = find_guid(pb, ff_guid_data);
> if (size < 0) {
> av_log(s, AV_LOG_ERROR, "could not find data guid\n");
> return -1;
> diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
> index 5a4b085..e5f5492 100644
> --- a/libavformat/wavenc.c
> +++ b/libavformat/wavenc.c
> @@ -43,6 +43,7 @@ typedef struct WAVMuxContext {
> int write_bext;
> } WAVMuxContext;
>
> +#if CONFIG_WAV_MUXER
> static inline void bwf_write_bext_string(AVFormatContext *s, const char *key, int maxlen)
> {
> AVDictionaryEntry *tag;
> @@ -218,3 +219,83 @@ AVOutputFormat ff_wav_muxer = {
> .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
> .priv_class = &wav_muxer_class,
> };
> +#endif /* CONFIG_WAV_MUXER */
> +
> +#if CONFIG_W64_MUXER
> +#include "w64.h"
> +
> +static int64_t start_guid(AVIOContext *pb, const uint8_t *guid)
> +{
> + int64_t pos = avio_tell(pb);
> +
> + avio_write(pb, guid, 16);
> + avio_wl64(pb, INT64_MAX);
> + return pos;
> +}
nit:
static void start_guid(AVIOContext *pb, const uint8_t *guid, int64_t *start);
since the return is usually used to return a code
> +
> +static void end_guid(AVIOContext *pb, int64_t start)
> +{
> + int64_t end, pos = avio_tell(pb);
> +
> + end = FFALIGN(pos, 8);
> + ffio_fill(pb, 0, end - pos);
> + avio_seek(pb, start + 16, SEEK_SET);
> + avio_wl64(pb, end - start);
> + avio_seek(pb, end, SEEK_SET);
> +}
> +
> +static int w64_write_header(AVFormatContext *s)
> +{
> + WAVMuxContext *wav = s->priv_data;
> + AVIOContext *pb = s->pb;
> + int64_t start;
> +
> + avio_write(pb, ff_guid_riff, sizeof(ff_guid_riff));
> + avio_wl64(pb, -1);
> + avio_write(pb, ff_guid_wave, sizeof(ff_guid_wave));
> + start = start_guid(pb, ff_guid_fmt);
> + if (ff_put_wav_header(pb, s->streams[0]->codec) < 0) {
> + av_log(s, AV_LOG_ERROR, "%s codec not supported in WAVE format\n",
> + s->streams[0]->codec->codec ? s->streams[0]->codec->codec->name : "NONE");
> + return AVERROR(EINVAL);
> + }
nit: here you could propagate the function error code
[...]
I couldn't spot any evident mistake and LGTM, thanks.
--
FFmpeg = Fierce & Frightening Mega Programmable Empowered God
More information about the ffmpeg-devel
mailing list