From 81c7c817a43c5d8fc9a09910ecd159cf8dcdb8be Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 9 Dec 2012 13:35:21 +0100 Subject: [PATCH 1/3] cosmetics: Use consistent names for multiple inclusion guards. --- libavcodec/gsmdec_data.h | 6 +++--- libavcodec/options_table.h | 6 +++--- libavformat/options_table.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h index 61715c8858..2f3a2d29af 100644 --- a/libavcodec/gsmdec_data.h +++ b/libavcodec/gsmdec_data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_GSMDEC_DATA -#define AVCODEC_GSMDEC_DATA +#ifndef AVCODEC_GSMDEC_DATA_H +#define AVCODEC_GSMDEC_DATA_H #include #include "avcodec.h" @@ -41,4 +41,4 @@ typedef struct GSMContext { extern const uint16_t ff_gsm_long_term_gain_tab[4]; extern const int16_t ff_gsm_dequant_tab[64][8]; -#endif /* AVCODEC_GSMDEC_DATA */ +#endif /* AVCODEC_GSMDEC_DATA_H */ diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 624239e72e..ddbc00c13d 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_OPTIONS_TABLE -#define AVCODEC_OPTIONS_TABLE +#ifndef AVCODEC_OPTIONS_TABLE_H +#define AVCODEC_OPTIONS_TABLE_H #include #include @@ -413,4 +413,4 @@ static const AVOption options[]={ #undef DEFAULT #undef OFFSET -#endif // AVCODEC_OPTIONS_TABLE +#endif /* AVCODEC_OPTIONS_TABLE_H */ diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 4beee5db24..d1e2a0ce6c 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_OPTIONS_TABLE -#define AVFORMAT_OPTIONS_TABLE +#ifndef AVFORMAT_OPTIONS_TABLE_H +#define AVFORMAT_OPTIONS_TABLE_H #include @@ -65,4 +65,4 @@ static const AVOption options[]={ #undef DEFAULT #undef OFFSET -#endif // AVFORMAT_OPTIONS_TABLE +#endif /* AVFORMAT_OPTIONS_TABLE_H */ From 4d6c96fd69bc0e7eb7e8d23c55e1066ac53863a6 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 16 Dec 2012 23:19:39 +0100 Subject: [PATCH 2/3] fate: Move RALF test into lossless audio group --- tests/fate/lossless-audio.mak | 3 +++ tests/fate/real.mak | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 4808686481..0794241c46 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -7,6 +7,9 @@ fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-p FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RALF) += fate-ralf +fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le + FATE_SAMPLES_AVCONV-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 6063cf34e0..f3866b6f25 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -12,9 +12,6 @@ fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RALF) += fate-ralf -fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le - FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV30) += fate-rv30 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an From c35f0e8495e34c2082dcde805e9323c9f6a4cb0a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 12 Dec 2012 16:55:35 +0100 Subject: [PATCH 3/3] au: Reorder code so that both muxer and demuxer are under #ifdefs This reduces code size when either piece has been disabled. --- libavformat/au.c | 126 +++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/libavformat/au.c b/libavformat/au.c index f4ca09493e..331c423fcc 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -32,9 +32,6 @@ #include "avio_internal.h" #include "pcm.h" -/* if we don't know the size in advance */ -#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) - /* 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 }, @@ -48,63 +45,7 @@ static const AVCodecTag codec_au_tags[] = { { 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, 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; -} - -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 - 24)); - 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) { @@ -187,7 +128,6 @@ static int au_read_packet(AVFormatContext *s, return 0; } -#if CONFIG_AU_DEMUXER AVInputFormat ff_au_demuxer = { .name = "au", .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), @@ -197,9 +137,69 @@ AVInputFormat ff_au_demuxer = { .read_seek = ff_pcm_read_seek, .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 }, }; -#endif +#endif /* CONFIG_AU_DEMUXER */ #if CONFIG_AU_MUXER + +/* if we don't know the size in advance */ +#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) + +/* 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, 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; +} + +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 - 24)); + 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"), @@ -212,4 +212,4 @@ AVOutputFormat ff_au_muxer = { .write_trailer = au_write_trailer, .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 }, }; -#endif //CONFIG_AU_MUXER +#endif /* CONFIG_AU_MUXER */