From fd9147f11456a7e39a998d7270684922a2a46e6d Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 23 Dec 2012 15:03:08 -0500 Subject: au: cosmetics: pretty-print and remove pointless comments --- libavformat/au.c | 96 +++++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 50 deletions(-) (limited to 'libavformat/au.c') diff --git a/libavformat/au.c b/libavformat/au.c index 4c5af34133..d88ccfc5e2 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -32,24 +32,22 @@ #include "avio_internal.h" #include "pcm.h" -/* The libavcodec codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_au_tags[] = { - { AV_CODEC_ID_PCM_MULAW, 1 }, - { AV_CODEC_ID_PCM_S8, 2 }, - { AV_CODEC_ID_PCM_S16BE, 3 }, - { AV_CODEC_ID_PCM_S24BE, 4 }, - { AV_CODEC_ID_PCM_S32BE, 5 }, - { AV_CODEC_ID_PCM_F32BE, 6 }, - { AV_CODEC_ID_PCM_F64BE, 7 }, - { AV_CODEC_ID_PCM_ALAW, 27 }, - { AV_CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_PCM_MULAW, 1 }, + { AV_CODEC_ID_PCM_S8, 2 }, + { AV_CODEC_ID_PCM_S16BE, 3 }, + { AV_CODEC_ID_PCM_S24BE, 4 }, + { AV_CODEC_ID_PCM_S32BE, 5 }, + { AV_CODEC_ID_PCM_F32BE, 6 }, + { AV_CODEC_ID_PCM_F64BE, 7 }, + { AV_CODEC_ID_PCM_ALAW, 27 }, + { AV_CODEC_ID_NONE, 0 }, }; #if CONFIG_AU_DEMUXER static int au_probe(AVProbeData *p) { - /* check file header */ if (p->buf[0] == '.' && p->buf[1] == 's' && p->buf[2] == 'n' && p->buf[3] == 'd') return AVPROBE_SCORE_MAX; @@ -59,7 +57,6 @@ static int au_probe(AVProbeData *p) #define BLOCK_SIZE 1024 -/* au input */ static int au_read_header(AVFormatContext *s) { int size; @@ -70,15 +67,14 @@ static int au_read_header(AVFormatContext *s) enum AVCodecID codec; AVStream *st; - /* check ".snd" header */ tag = avio_rl32(pb); if (tag != MKTAG('.', 's', 'n', 'd')) return -1; size = avio_rb32(pb); /* header size */ - avio_rb32(pb); /* data size */ + avio_rb32(pb); /* data size */ - id = avio_rb32(pb); - rate = avio_rb32(pb); + id = avio_rb32(pb); + rate = avio_rb32(pb); channels = avio_rb32(pb); if (size > 24) { @@ -109,25 +105,24 @@ static int au_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - /* now we are ready: build format streams */ st = avformat_new_stream(s, NULL); if (!st) return -1; - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_tag = id; - st->codec->codec_id = codec; - st->codec->channels = channels; + 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->bit_rate = channels * rate * bps; st->codec->block_align = channels * bps >> 3; st->start_time = 0; avpriv_set_pts_info(st, 64, 1, rate); + return 0; } -static int au_read_packet(AVFormatContext *s, - AVPacket *pkt) +static int au_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret; @@ -135,6 +130,7 @@ static int au_read_packet(AVFormatContext *s, s->streams[0]->codec->block_align); if (ret < 0) return ret; + pkt->stream_index = 0; pkt->duration = ret / s->streams[0]->codec->block_align; @@ -142,14 +138,15 @@ static int au_read_packet(AVFormatContext *s, } 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_seek = ff_pcm_read_seek, - .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 }, + .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_seek = ff_pcm_read_seek, + .codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 }, }; + #endif /* CONFIG_AU_DEMUXER */ #if CONFIG_AU_MUXER @@ -162,14 +159,16 @@ AVInputFormat ff_au_demuxer = { /* AUDIO_FILE header */ static int put_au_header(AVIOContext *pb, AVCodecContext *enc) { - if(!enc->codec_tag) + if (!enc->codec_tag) return -1; - ffio_wfourcc(pb, ".snd"); /* magic number */ - avio_wb32(pb, 24); /* header size */ - avio_wb32(pb, AU_UNKNOWN_SIZE); /* data size */ - avio_wb32(pb, (uint32_t)enc->codec_tag); /* codec ID */ + + ffio_wfourcc(pb, ".snd"); /* magic number */ + avio_wb32(pb, 24); /* 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); + return 0; } @@ -179,10 +178,8 @@ static int au_write_header(AVFormatContext *s) s->priv_data = NULL; - /* format header */ - if (put_au_header(pb, s->streams[0]->codec) < 0) { + if (put_au_header(pb, s->streams[0]->codec) < 0) return -1; - } avio_flush(pb); @@ -195,13 +192,11 @@ static int au_write_trailer(AVFormatContext *s) 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 - 24)); avio_seek(pb, file_size, SEEK_SET); - avio_flush(pb); } @@ -209,15 +204,16 @@ static int au_write_trailer(AVFormatContext *s) } AVOutputFormat ff_au_muxer = { - .name = "au", - .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), - .mime_type = "audio/basic", - .extensions = "au", - .audio_codec = AV_CODEC_ID_PCM_S16BE, - .video_codec = AV_CODEC_ID_NONE, - .write_header = au_write_header, - .write_packet = ff_raw_write_packet, - .write_trailer = au_write_trailer, - .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 }, + .name = "au", + .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), + .mime_type = "audio/basic", + .extensions = "au", + .audio_codec = AV_CODEC_ID_PCM_S16BE, + .video_codec = AV_CODEC_ID_NONE, + .write_header = au_write_header, + .write_packet = ff_raw_write_packet, + .write_trailer = au_write_trailer, + .codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 }, }; + #endif /* CONFIG_AU_MUXER */ -- cgit v1.2.3