#include "internal.h"
#include "avio_internal.h"
#include "pcm.h"
-#include "riff.h"
/* if we don't know the size in advance */
#define AU_UNKNOWN_SIZE ((uint32_t)(~0))
{ AV_CODEC_ID_NONE, 0 },
};
-#if CONFIG_AU_MUXER
-/* AUDIO_FILE header */
-static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
-{
- if(!enc->codec_tag)
- return -1;
- ffio_wfourcc(pb, ".snd"); /* magic number */
- avio_wb32(pb, AU_HEADER_SIZE); /* header size */
- avio_wb32(pb, AU_UNKNOWN_SIZE); /* data size */
- avio_wb32(pb, (uint32_t)enc->codec_tag); /* codec ID */
- avio_wb32(pb, enc->sample_rate);
- avio_wb32(pb, (uint32_t)enc->channels);
- avio_wb64(pb, 0); /* annotation field */
- return 0;
-}
-
-static int au_write_header(AVFormatContext *s)
-{
- AVIOContext *pb = s->pb;
-
- s->priv_data = NULL;
-
- /* format header */
- if (put_au_header(pb, s->streams[0]->codec) < 0) {
- return -1;
- }
-
- avio_flush(pb);
-
- return 0;
-}
-
-static int au_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
- AVIOContext *pb = s->pb;
- avio_write(pb, pkt->data, pkt->size);
- return 0;
-}
-
-static int au_write_trailer(AVFormatContext *s)
-{
- AVIOContext *pb = s->pb;
- int64_t file_size;
-
- if (s->pb->seekable) {
-
- /* update file size */
- file_size = avio_tell(pb);
- avio_seek(pb, 8, SEEK_SET);
- avio_wb32(pb, (uint32_t)(file_size - AU_HEADER_SIZE));
- avio_seek(pb, file_size, SEEK_SET);
-
- avio_flush(pb);
- }
-
- return 0;
-}
-#endif /* CONFIG_AU_MUXER */
+#if CONFIG_AU_DEMUXER
static int au_probe(AVProbeData *p)
{
/* check ".snd" header */
tag = avio_rl32(pb);
if (tag != MKTAG('.', 's', 'n', 'd'))
- return -1;
+ return AVERROR_INVALIDDATA;
size = avio_rb32(pb); /* header size */
data_size = avio_rb32(pb); /* data size in bytes */
/* now we are ready: build format streams */
st = avformat_new_stream(s, NULL);
if (!st)
- return -1;
+ return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->codec_tag = id;
st->codec->codec_id = codec;
st->codec->channels = channels;
st->codec->sample_rate = rate;
+ st->codec->block_align = FFMAX(bps * st->codec->channels / 8, 1);
if (data_size != AU_UNKNOWN_SIZE)
st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * (int64_t)bps);
avpriv_set_pts_info(st, 64, 1, rate);
return 0;
}
-#define BLOCK_SIZE 1024
-
-static int au_read_packet(AVFormatContext *s,
- AVPacket *pkt)
-{
- int ret;
- int bpcs = av_get_bits_per_sample(s->streams[0]->codec->codec_id);
-
- if (!bpcs)
- return AVERROR(EINVAL);
- ret= av_get_packet(s->pb, pkt, BLOCK_SIZE *
- s->streams[0]->codec->channels *
- bpcs >> 3);
- if (ret < 0)
- return ret;
- pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
- pkt->stream_index = 0;
- return 0;
-}
-
-#if CONFIG_AU_DEMUXER
AVInputFormat ff_au_demuxer = {
.name = "au",
.long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
.read_probe = au_probe,
.read_header = au_read_header,
- .read_packet = au_read_packet,
+ .read_packet = ff_pcm_read_packet,
.read_seek = ff_pcm_read_seek,
.codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
};
-#endif
+#endif /* CONFIG_AU_DEMUXER */
#if CONFIG_AU_MUXER
+
+/* AUDIO_FILE header */
+static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
+{
+ if(!enc->codec_tag)
+ return -1;
+ ffio_wfourcc(pb, ".snd"); /* magic number */
+ avio_wb32(pb, AU_HEADER_SIZE); /* header size */
+ avio_wb32(pb, AU_UNKNOWN_SIZE); /* data size */
+ avio_wb32(pb, (uint32_t)enc->codec_tag); /* codec ID */
+ avio_wb32(pb, enc->sample_rate);
+ avio_wb32(pb, (uint32_t)enc->channels);
+ avio_wb64(pb, 0); /* annotation field */
+ return 0;
+}
+
+static int au_write_header(AVFormatContext *s)
+{
+ AVIOContext *pb = s->pb;
+
+ /* format header */
+ if (put_au_header(pb, s->streams[0]->codec) < 0) {
+ return AVERROR(EINVAL);
+ }
+
+ avio_flush(pb);
+
+ return 0;
+}
+
+static int au_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ AVIOContext *pb = s->pb;
+ avio_write(pb, pkt->data, pkt->size);
+ return 0;
+}
+
+static int au_write_trailer(AVFormatContext *s)
+{
+ AVIOContext *pb = s->pb;
+ int64_t file_size;
+
+ if (s->pb->seekable) {
+
+ /* update file size */
+ file_size = avio_tell(pb);
+ avio_seek(pb, 8, SEEK_SET);
+ avio_wb32(pb, (uint32_t)(file_size - AU_HEADER_SIZE));
+ avio_seek(pb, file_size, SEEK_SET);
+
+ avio_flush(pb);
+ }
+
+ return 0;
+}
+
AVOutputFormat ff_au_muxer = {
.name = "au",
.long_name = NULL_IF_CONFIG_SMALL("Sun AU"),
.write_trailer = au_write_trailer,
.codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
};
-#endif //CONFIG_AU_MUXER
+#endif /* CONFIG_AU_MUXER */