/*
* WAV muxer and demuxer
- * Copyright (c) 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2001, 2002 Fabrice Bellard
+ *
+ * Sony Wave64 demuxer
+ * RF64 demuxer
+ * Copyright (c) 2009 Daniel Verkamp
*
* This file is part of FFmpeg.
*
#include "riff.h"
typedef struct {
- offset_t data;
- offset_t data_end;
+ int64_t data;
+ int64_t data_end;
int64_t minpts;
int64_t maxpts;
int last_duration;
+ int w64;
} WAVContext;
-#ifdef CONFIG_MUXERS
+#if CONFIG_WAV_MUXER
static int wav_write_header(AVFormatContext *s)
{
WAVContext *wav = s->priv_data;
ByteIOContext *pb = s->pb;
- offset_t fmt, fact;
+ int64_t fmt, fact;
put_tag(pb, "RIFF");
put_le32(pb, 0); /* file length */
put_tag(pb, "WAVE");
/* format header */
- fmt = start_tag(pb, "fmt ");
- if (put_wav_header(pb, s->streams[0]->codec) < 0) {
+ fmt = ff_start_tag(pb, "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");
av_free(wav);
return -1;
}
- end_tag(pb, fmt);
+ ff_end_tag(pb, fmt);
- if(s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
- && !url_is_streamed(s->pb)) {
- fact = start_tag(pb, "fact");
+ if (s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
+ && !url_is_streamed(s->pb)) {
+ fact = ff_start_tag(pb, "fact");
put_le32(pb, 0);
- end_tag(pb, fact);
+ ff_end_tag(pb, fact);
}
av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate);
wav->minpts = INT64_MAX;
/* data header */
- wav->data = start_tag(pb, "data");
+ wav->data = ff_start_tag(pb, "data");
put_flush_packet(pb);
static int wav_write_packet(AVFormatContext *s, AVPacket *pkt)
{
- ByteIOContext *pb = s->pb;
- WAVContext *wav = s->priv_data;
+ ByteIOContext *pb = s->pb;
+ WAVContext *wav = s->priv_data;
put_buffer(pb, pkt->data, pkt->size);
if(pkt->pts != AV_NOPTS_VALUE) {
- wav->minpts = FFMIN(wav->minpts, pkt->pts);
- wav->maxpts = FFMAX(wav->maxpts, pkt->pts);
+ wav->minpts = FFMIN(wav->minpts, pkt->pts);
+ wav->maxpts = FFMAX(wav->maxpts, pkt->pts);
wav->last_duration = pkt->duration;
} else
av_log(s, AV_LOG_ERROR, "wav_write_packet: NOPTS\n");
static int wav_write_trailer(AVFormatContext *s)
{
- ByteIOContext *pb = s->pb;
- WAVContext *wav = s->priv_data;
- offset_t file_size;
+ ByteIOContext *pb = s->pb;
+ WAVContext *wav = s->priv_data;
+ int64_t file_size;
if (!url_is_streamed(s->pb)) {
- end_tag(pb, wav->data);
+ ff_end_tag(pb, wav->data);
/* update file size */
file_size = url_ftell(pb);
}
return 0;
}
-#endif //CONFIG_MUXERS
+AVOutputFormat wav_muxer = {
+ "wav",
+ NULL_IF_CONFIG_SMALL("WAV format"),
+ "audio/x-wav",
+ "wav",
+ sizeof(WAVContext),
+ CODEC_ID_PCM_S16LE,
+ CODEC_ID_NONE,
+ wav_write_header,
+ wav_write_packet,
+ wav_write_trailer,
+ .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
+};
+#endif /* CONFIG_WAV_MUXER */
+
+
+#if CONFIG_WAV_DEMUXER
/* return the size of the found tag */
-/* XXX: > 2GB ? */
-static int find_tag(ByteIOContext *pb, uint32_t tag1)
+static int64_t find_tag(ByteIOContext *pb, uint32_t tag1)
{
unsigned int tag;
- int size;
+ int64_t size;
- for(;;) {
+ for (;;) {
if (url_feof(pb))
return -1;
- tag = get_le32(pb);
+ tag = get_le32(pb);
size = get_le32(pb);
if (tag == tag1)
break;
url_fseek(pb, size, SEEK_CUR);
}
- if (size < 0)
- size = 0x7fffffff;
return size;
}
/* check file header */
if (p->buf_size <= 32)
return 0;
- if (p->buf[0] == 'R' && p->buf[1] == 'I' &&
- p->buf[2] == 'F' && p->buf[3] == 'F' &&
- p->buf[8] == 'W' && p->buf[9] == 'A' &&
- p->buf[10] == 'V' && p->buf[11] == 'E')
- /*
- Since ACT demuxer has standard WAV header at top of it's own,
- returning score is decreased to avoid probe conflict
- between ACT and WAV.
- */
- return AVPROBE_SCORE_MAX - 1;
- else
- return 0;
+ if (!memcmp(p->buf + 8, "WAVE", 4)) {
+ if (!memcmp(p->buf, "RIFF", 4))
+ /*
+ Since ACT demuxer has standard WAV header at top of it's own,
+ returning score is decreased to avoid probe conflict
+ between ACT and WAV.
+ */
+ return AVPROBE_SCORE_MAX - 1;
+ else if (!memcmp(p->buf, "RF64", 4) &&
+ !memcmp(p->buf + 12, "ds64", 4))
+ return AVPROBE_SCORE_MAX;
+ }
+ return 0;
}
/* wav input */
static int wav_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
- int size;
+ int64_t size, av_uninit(data_size);
+ int rf64;
unsigned int tag;
ByteIOContext *pb = s->pb;
AVStream *st;
/* check RIFF header */
tag = get_le32(pb);
- if (tag != MKTAG('R', 'I', 'F', 'F'))
+ rf64 = tag == MKTAG('R', 'F', '6', '4');
+ if (!rf64 && tag != MKTAG('R', 'I', 'F', 'F'))
return -1;
get_le32(pb); /* file size */
tag = get_le32(pb);
if (tag != MKTAG('W', 'A', 'V', 'E'))
return -1;
+ if (rf64) {
+ if (get_le32(pb) != MKTAG('d', 's', '6', '4'))
+ return -1;
+ size = get_le32(pb);
+ if (size < 16)
+ return -1;
+ get_le64(pb); /* RIFF size */
+ data_size = get_le64(pb);
+ url_fskip(pb, size - 16); /* skip rest of ds64 chunk */
+ }
+
/* parse fmt header */
size = find_tag(pb, MKTAG('f', 'm', 't', ' '));
if (size < 0)
if (!st)
return AVERROR(ENOMEM);
- get_wav_header(pb, st->codec, size);
+ ff_get_wav_header(pb, st->codec, size);
st->need_parsing = AVSTREAM_PARSE_FULL;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
+ if (rf64)
+ size = data_size;
if (size < 0)
return -1;
wav->data_end= url_ftell(pb) + size;
return 0;
}
+/** Find chunk with w64 GUID by skipping over other chunks
+ * @return the size of the found chunk
+ */
+static int64_t find_guid(ByteIOContext *pb, const uint8_t guid1[16])
+{
+ uint8_t guid[16];
+ int64_t size;
+
+ while (!url_feof(pb)) {
+ get_buffer(pb, guid, 16);
+ size = get_le64(pb);
+ if (size <= 24)
+ return -1;
+ if (!memcmp(guid, guid1, 16))
+ return size;
+ url_fskip(pb, FFALIGN(size, INT64_C(8)) - 24);
+ }
+ 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,
AVPacket *pkt)
{
- int ret, size, left;
+ int ret, size;
+ int64_t left;
AVStream *st;
WAVContext *wav = s->priv_data;
- if (url_feof(s->pb))
- return AVERROR(EIO);
st = s->streams[0];
- left= wav->data_end - url_ftell(s->pb);
- if(left <= 0){
- left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
- if (left < 0) {
- return AVERROR(EIO);
- }
+ left = wav->data_end - url_ftell(s->pb);
+ if (left <= 0){
+ if (CONFIG_W64_DEMUXER && wav->w64)
+ left = find_guid(s->pb, guid_data) - 24;
+ else
+ left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
+ if (left < 0)
+ return AVERROR_EOF;
wav->data_end= url_ftell(s->pb) + left;
}
size = st->codec->block_align;
size = (size / st->codec->block_align) * st->codec->block_align;
}
- size= FFMIN(size, left);
- ret= av_get_packet(s->pb, pkt, size);
- if (ret <= 0)
- return AVERROR(EIO);
+ size = FFMIN(size, left);
+ ret = av_get_packet(s->pb, pkt, size);
+ if (ret < 0)
+ return ret;
pkt->stream_index = 0;
- /* note: we need to modify the packet size here to handle the last
- packet */
- pkt->size = ret;
return ret;
}
-static int wav_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
static int wav_read_seek(AVFormatContext *s,
int stream_index, int64_t timestamp, int flags)
{
AVStream *st;
st = s->streams[0];
- switch(st->codec->codec_id) {
+ switch (st->codec->codec_id) {
case CODEC_ID_MP2:
case CODEC_ID_MP3:
case CODEC_ID_AC3:
return pcm_read_seek(s, stream_index, timestamp, flags);
}
-#ifdef CONFIG_WAV_DEMUXER
AVInputFormat wav_demuxer = {
"wav",
NULL_IF_CONFIG_SMALL("WAV format"),
wav_probe,
wav_read_header,
wav_read_packet,
- wav_read_close,
+ NULL,
wav_read_seek,
.flags= AVFMT_GENERIC_INDEX,
- .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
+ .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0},
};
-#endif
-#ifdef CONFIG_WAV_MUXER
-AVOutputFormat wav_muxer = {
- "wav",
- NULL_IF_CONFIG_SMALL("WAV format"),
- "audio/x-wav",
- "wav",
+#endif /* CONFIG_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))
+ return AVPROBE_SCORE_MAX;
+ else
+ return 0;
+}
+
+static int w64_read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+ int64_t size;
+ ByteIOContext *pb = s->pb;
+ WAVContext *wav = s->priv_data;
+ AVStream *st;
+ uint8_t guid[16];
+
+ get_buffer(pb, guid, 16);
+ if (memcmp(guid, guid_riff, 16))
+ return -1;
+
+ if (get_le64(pb) < 16 + 8 + 16 + 8 + 16 + 8) /* riff + wave + fmt + sizes */
+ return -1;
+
+ get_buffer(pb, guid, 16);
+ if (memcmp(guid, guid_wave, 16)) {
+ av_log(s, AV_LOG_ERROR, "could not find wave guid\n");
+ return -1;
+ }
+
+ size = find_guid(pb, guid_fmt);
+ if (size < 0) {
+ av_log(s, AV_LOG_ERROR, "could not find fmt guid\n");
+ return -1;
+ }
+
+ st = av_new_stream(s, 0);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ /* subtract chunk header size - normal wav file doesn't count it */
+ ff_get_wav_header(pb, st->codec, size - 24);
+ url_fskip(pb, FFALIGN(size, INT64_C(8)) - size);
+
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+
+ av_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+ size = find_guid(pb, guid_data);
+ if (size < 0) {
+ av_log(s, AV_LOG_ERROR, "could not find data guid\n");
+ return -1;
+ }
+ wav->data_end = url_ftell(pb) + size - 24;
+ wav->w64 = 1;
+
+ return 0;
+}
+
+AVInputFormat w64_demuxer = {
+ "w64",
+ NULL_IF_CONFIG_SMALL("Sony Wave64 format"),
sizeof(WAVContext),
- CODEC_ID_PCM_S16LE,
- CODEC_ID_NONE,
- wav_write_header,
- wav_write_packet,
- wav_write_trailer,
- .codec_tag= (const AVCodecTag*[]){codec_wav_tags, 0},
+ w64_probe,
+ w64_read_header,
+ wav_read_packet,
+ NULL,
+ wav_read_seek,
+ .flags = AVFMT_GENERIC_INDEX,
+ .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
};
-#endif
+#endif /* CONFIG_W64_DEMUXER */
projects / ffmpeg / blobdiff