X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fwav.c;h=f4b2d615c2e2b4167e60a8b7b70abea02b5da326;hb=5af41508310b856b1e5ca605e50e956bf81eeef9;hp=f71dd55bc74c4cce137209dc2b1ebd907f44121b;hpb=80783dc2c2c611750cf2ff9d3027f283f8a2dc5b;p=ffmpeg diff --git a/libavformat/wav.c b/libavformat/wav.c index f71dd55bc74..f4b2d615c2e 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -1,211 +1,102 @@ -/* - * WAV encoder and decoder - * Copyright (c) 2001, 2002 Fabrice Bellard. +/* + * WAV muxer and demuxer + * Copyright (c) 2001, 2002 Fabrice Bellard * - * This library is free software; you can redistribute it and/or + * Sony Wave64 demuxer + * RF64 demuxer + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" -#include "avi.h" - -const CodecTag codec_wav_tags[] = { - { CODEC_ID_MP2, 0x50 }, - { CODEC_ID_MP3, 0x55 }, - { CODEC_ID_AC3, 0x2000 }, - { CODEC_ID_PCM_S16LE, 0x01 }, - { CODEC_ID_PCM_U8, 0x01 }, /* must come after s16le in this list */ - { CODEC_ID_PCM_ALAW, 0x06 }, - { CODEC_ID_PCM_MULAW, 0x07 }, - { CODEC_ID_ADPCM_MS, 0x02 }, - { CODEC_ID_ADPCM_IMA_WAV, 0x11 }, - { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */ - { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */ - { CODEC_ID_WMAV1, 0x160 }, - { CODEC_ID_WMAV2, 0x161 }, - { 0, 0 }, -}; - -/* WAVEFORMATEX header */ -/* returns the size or -1 on error */ -int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) -{ - int bps, blkalign, bytespersec; - int hdrsize = 18; - - if(!enc->codec_tag) - enc->codec_tag = codec_get_tag(codec_wav_tags, enc->codec_id); - if(!enc->codec_tag) - return -1; - - put_le16(pb, enc->codec_tag); - put_le16(pb, enc->channels); - put_le32(pb, enc->sample_rate); - if (enc->codec_id == CODEC_ID_PCM_U8 || - enc->codec_id == CODEC_ID_PCM_ALAW || - enc->codec_id == CODEC_ID_PCM_MULAW) { - bps = 8; - } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { - bps = 0; - } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS) { - bps = 4; - } else { - bps = 16; - } - - if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { - blkalign = 1; - //blkalign = 144 * enc->bit_rate/enc->sample_rate; - } else if (enc->block_align != 0) { /* specified by the codec */ - blkalign = enc->block_align; - } else - blkalign = enc->channels*bps >> 3; - if (enc->codec_id == CODEC_ID_PCM_U8 || - enc->codec_id == CODEC_ID_PCM_S16LE) { - bytespersec = enc->sample_rate * blkalign; - } else { - bytespersec = enc->bit_rate / 8; - } - put_le32(pb, bytespersec); /* bytes per second */ - put_le16(pb, blkalign); /* block align */ - put_le16(pb, bps); /* bits per sample */ - if (enc->codec_id == CODEC_ID_MP3) { - put_le16(pb, 12); /* wav_extra_size */ - hdrsize += 12; - put_le16(pb, 1); /* wID */ - put_le32(pb, 2); /* fdwFlags */ - put_le16(pb, 1152); /* nBlockSize */ - put_le16(pb, 1); /* nFramesPerBlock */ - put_le16(pb, 1393); /* nCodecDelay */ - } else if (enc->codec_id == CODEC_ID_MP2) { - put_le16(pb, 22); /* wav_extra_size */ - hdrsize += 22; - put_le16(pb, 2); /* fwHeadLayer */ - put_le32(pb, enc->bit_rate); /* dwHeadBitrate */ - put_le16(pb, enc->channels == 2 ? 1 : 8); /* fwHeadMode */ - put_le16(pb, 0); /* fwHeadModeExt */ - put_le16(pb, 1); /* wHeadEmphasis */ - put_le16(pb, 16); /* fwHeadFlags */ - put_le32(pb, 0); /* dwPTSLow */ - put_le32(pb, 0); /* dwPTSHigh */ - } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { - put_le16(pb, 2); /* wav_extra_size */ - put_le16(pb, ((enc->block_align - 4 * enc->channels) / (4 * enc->channels)) * 8 + 1); /* wSamplesPerBlock */ - } else - put_le16(pb, 0); /* wav_extra_size */ - - return hdrsize; -} - -/* We could be given one of the three possible structures here: - * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure - * is an expansion of the previous one with the fields added - * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and - * WAVEFORMATEX adds 'WORD cbSize' and basically makes itself - * an openended structure. - */ -void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size) -{ - int id; - - id = get_le16(pb); - codec->codec_type = CODEC_TYPE_AUDIO; - codec->codec_tag = id; - codec->channels = get_le16(pb); - codec->sample_rate = get_le32(pb); - codec->bit_rate = get_le32(pb) * 8; - codec->block_align = get_le16(pb); - if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */ - codec->bits_per_sample = 8; - }else - codec->bits_per_sample = get_le16(pb); - codec->codec_id = wav_codec_get_id(id, codec->bits_per_sample); - - if (size > 16) { /* We're obviously dealing with WAVEFORMATEX */ - codec->extradata_size = get_le16(pb); - if (codec->extradata_size > 0) { - if (codec->extradata_size > size - 18) - codec->extradata_size = size - 18; - codec->extradata = av_mallocz(codec->extradata_size); - get_buffer(pb, codec->extradata, codec->extradata_size); - } else - codec->extradata_size = 0; - - /* It is possible for the chunk to contain garbage at the end */ - if (size - codec->extradata_size - 18 > 0) - url_fskip(pb, size - codec->extradata_size - 18); - } -} - - -int wav_codec_get_id(unsigned int tag, int bps) -{ - int id; - id = codec_get_id(codec_wav_tags, tag); - if (id <= 0) - return id; - /* handle specific u8 codec */ - if (id == CODEC_ID_PCM_S16LE && bps == 8) - id = CODEC_ID_PCM_U8; - return id; -} +#include "raw.h" +#include "riff.h" typedef struct { - offset_t data; + int64_t data; + int64_t data_end; + int64_t minpts; + int64_t maxpts; + int last_duration; + int w64; } WAVContext; +#if CONFIG_WAV_MUXER static int wav_write_header(AVFormatContext *s) { WAVContext *wav = s->priv_data; - ByteIOContext *pb = &s->pb; - offset_t fmt; + ByteIOContext *pb = s->pb; + 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 = ff_start_tag(pb, "fact"); + put_le32(pb, 0); + ff_end_tag(pb, fact); + } + + av_set_pts_info(s->streams[0], 64, 1, s->streams[0]->codec->sample_rate); + wav->maxpts = wav->last_duration = 0; + wav->minpts = INT64_MAX; /* data header */ - wav->data = start_tag(pb, "data"); - + wav->data = ff_start_tag(pb, "data"); + put_flush_packet(pb); return 0; } -static int wav_write_packet(AVFormatContext *s, int stream_index_ptr, - uint8_t *buf, int size, int force_pts) +static int wav_write_packet(AVFormatContext *s, AVPacket *pkt) { - ByteIOContext *pb = &s->pb; - put_buffer(pb, buf, size); + 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->last_duration = pkt->duration; + } else + av_log(s, AV_LOG_ERROR, "wav_write_packet: NOPTS\n"); return 0; } 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); + if (!url_is_streamed(s->pb)) { + ff_end_tag(pb, wav->data); /* update file size */ file_size = url_ftell(pb); @@ -214,28 +105,54 @@ static int wav_write_trailer(AVFormatContext *s) url_fseek(pb, file_size, SEEK_SET); put_flush_packet(pb); + + if(s->streams[0]->codec->codec_tag != 0x01) { + /* Update num_samps in fact chunk */ + int number_of_samples; + number_of_samples = av_rescale(wav->maxpts - wav->minpts + wav->last_duration, + s->streams[0]->codec->sample_rate * (int64_t)s->streams[0]->time_base.num, + s->streams[0]->time_base.den); + url_fseek(pb, wav->data-12, SEEK_SET); + put_le32(pb, number_of_samples); + url_fseek(pb, file_size, SEEK_SET); + put_flush_packet(pb); + } } return 0; } +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; } @@ -244,103 +161,252 @@ static int wav_probe(AVProbeData *p) /* 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') - return AVPROBE_SCORE_MAX; - 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; + ByteIOContext *pb = s->pb; AVStream *st; + WAVContext *wav = s->priv_data; /* 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) return -1; st = av_new_stream(s, 0); if (!st) - return AVERROR_NOMEM; + return AVERROR(ENOMEM); + + 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); - get_wav_header(pb, &st->codec, size); - 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; + int ret, size; + int64_t left; + AVStream *st; + WAVContext *wav = s->priv_data; - if (url_feof(&s->pb)) - return -EIO; - if (av_new_packet(pkt, MAX_SIZE)) - return -EIO; - pkt->stream_index = 0; + st = s->streams[0]; + + 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; + } - ret = get_buffer(&s->pb, pkt->data, pkt->size); + size = MAX_SIZE; + if (st->codec->block_align > 1) { + if (size < st->codec->block_align) + 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) - av_free_packet(pkt); - /* note: we need to modify the packet size here to handle the last - packet */ - pkt->size = ret; + return ret; + pkt->stream_index = 0; + return ret; } -static int wav_read_close(AVFormatContext *s) +static int wav_read_seek(AVFormatContext *s, + int stream_index, int64_t timestamp, int flags) { - return 0; + AVStream *st; + + st = s->streams[0]; + switch (st->codec->codec_id) { + case CODEC_ID_MP2: + case CODEC_ID_MP3: + case CODEC_ID_AC3: + case CODEC_ID_DTS: + /* use generic seeking with dynamically generated indexes */ + return -1; + default: + break; + } + return pcm_read_seek(s, stream_index, timestamp, flags); } -static AVInputFormat wav_iformat = { +AVInputFormat wav_demuxer = { "wav", - "wav format", - 0, + NULL_IF_CONFIG_SMALL("WAV format"), + sizeof(WAVContext), wav_probe, wav_read_header, wav_read_packet, - wav_read_close, + NULL, + wav_read_seek, + .flags= AVFMT_GENERIC_INDEX, + .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, }; +#endif /* CONFIG_WAV_DEMUXER */ -static AVOutputFormat wav_oformat = { - "wav", - "wav format", - "audio/x-wav", - "wav", - sizeof(WAVContext), - CODEC_ID_PCM_S16LE, - CODEC_ID_NONE, - wav_write_header, - wav_write_packet, - wav_write_trailer, -}; -int wav_init(void) +#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) { - av_register_input_format(&wav_iformat); - av_register_output_format(&wav_oformat); + 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), + 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 /* CONFIG_W64_DEMUXER */