/*
- * WAV encoder and decoder
- * Copyright (c) 2001, 2002 Fabrice Bellard.
+ * WAV muxer and demuxer
+ * Copyright (c) 2001, 2002 Fabrice Bellard
*
* This file is part of FFmpeg.
*
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "allformats.h"
+#include "raw.h"
#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;
} 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;
+ ByteIOContext *pb = s->pb;
+ int64_t fmt, fact;
put_tag(pb, "RIFF");
put_le32(pb, 0); /* file length */
/* format header */
fmt = start_tag(pb, "fmt ");
if (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);
+ if(s->streams[0]->codec->codec_tag != 0x01 /* hence for all other than PCM */
+ && !url_is_streamed(s->pb)) {
+ fact = start_tag(pb, "fact");
+ put_le32(pb, 0);
+ 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");
static int wav_write_packet(AVFormatContext *s, AVPacket *pkt)
{
- ByteIOContext *pb = &s->pb;
+ 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;
+ ByteIOContext *pb = s->pb;
WAVContext *wav = s->priv_data;
- offset_t file_size;
+ int64_t file_size;
- if (!url_is_streamed(&s->pb)) {
+ if (!url_is_streamed(s->pb)) {
end_tag(pb, wav->data);
/* update file size */
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;
}
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_WAV_MUXER */
/* return the size of the found tag */
/* XXX: > 2GB ? */
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;
+ /*
+ 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;
}
{
int size;
unsigned int tag;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
WAVContext *wav = s->priv_data;
return -1;
st = av_new_stream(s, 0);
if (!st)
- return AVERROR_NOMEM;
+ return AVERROR(ENOMEM);
get_wav_header(pb, st->codec, size);
- st->need_parsing = 1;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
AVStream *st;
WAVContext *wav = s->priv_data;
- if (url_feof(&s->pb))
- return AVERROR_IO;
+ if (url_feof(s->pb))
+ return AVERROR(EIO);
st = s->streams[0];
- left= wav->data_end - url_ftell(&s->pb);
+ left= wav->data_end - url_ftell(s->pb);
if(left <= 0){
- left = find_tag(&(s->pb), MKTAG('d', 'a', 't', 'a'));
+ left = find_tag(s->pb, MKTAG('d', 'a', 't', 'a'));
if (left < 0) {
- return AVERROR_IO;
+ return AVERROR(EIO);
}
- wav->data_end= url_ftell(&s->pb) + left;
+ wav->data_end= url_ftell(s->pb) + left;
}
size = MAX_SIZE;
size = (size / st->codec->block_align) * st->codec->block_align;
}
size= FFMIN(size, left);
- if (av_new_packet(pkt, size))
- return AVERROR_IO;
+ ret= av_get_packet(s->pb, pkt, size);
+ if (ret <= 0)
+ return AVERROR(EIO);
pkt->stream_index = 0;
- ret = get_buffer(&s->pb, pkt->data, 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;
}
-static int wav_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
static int wav_read_seek(AVFormatContext *s,
int stream_index, int64_t timestamp, int flags)
{
return pcm_read_seek(s, stream_index, timestamp, flags);
}
-#ifdef CONFIG_WAV_DEMUXER
+#if CONFIG_WAV_DEMUXER
AVInputFormat wav_demuxer = {
"wav",
- "wav format",
+ 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 []){codec_wav_tags, 0},
};
#endif
-#ifdef CONFIG_WAV_MUXER
+#if CONFIG_WAV_MUXER
AVOutputFormat wav_muxer = {
"wav",
- "wav format",
+ NULL_IF_CONFIG_SMALL("WAV format"),
"audio/x-wav",
"wav",
sizeof(WAVContext),
wav_write_header,
wav_write_packet,
wav_write_trailer,
+ .codec_tag= (const AVCodecTag* const []){codec_wav_tags, 0},
};
#endif