From 00ed7f5958d026cb4786919f4b3e46f14fe608bf Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 22 Oct 2012 14:40:32 +0200 Subject: lavu: remove disabled FF_API_AV_FIFO_PEEK cruft --- libavutil/fifo.h | 11 ----------- libavutil/version.h | 3 --- 2 files changed, 14 deletions(-) diff --git a/libavutil/fifo.h b/libavutil/fifo.h index e670175a76..ea30f5d2bd 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -128,15 +128,4 @@ static inline uint8_t *av_fifo_peek2(const AVFifoBuffer *f, int offs) return ptr; } -#if FF_API_AV_FIFO_PEEK -/** - * @deprecated Use av_fifo_peek2() instead. - */ -attribute_deprecated -static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs) -{ - return *av_fifo_peek2(f, offs); -} -#endif - #endif /* AVUTIL_FIFO_H */ diff --git a/libavutil/version.h b/libavutil/version.h index b781751043..ae7fa7abeb 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -61,9 +61,6 @@ * @{ */ -#ifndef FF_API_AV_FIFO_PEEK -#define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) -#endif #ifndef FF_API_PIX_FMT #define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 53) #endif -- cgit v1.2.3 From 8f4c414df6b81c3ee3f12de1504ae7ccb5f8053a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 22 Oct 2012 14:35:13 +0200 Subject: Improve wording and spelling of av_log_missing_feature messages. --- libavcodec/aacdec.c | 4 ++-- libavcodec/aacsbr.c | 4 ++-- libavcodec/eac3dec.c | 2 +- libavcodec/flacdec.c | 2 +- libavcodec/flashsv.c | 2 +- libavcodec/proresdec.c | 2 +- libavcodec/wmalosslessdec.c | 4 ++-- libavcodec/wmavoice.c | 2 +- libavformat/oggparseskeleton.c | 2 +- libavformat/spdifdec.c | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 4a6d3905f4..b7caecb39b 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2663,7 +2663,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // numPrograms if (get_bits(gb, 4)) { // numPrograms av_log_missing_feature(latmctx->aac_ctx.avctx, - "multiple programs", 1); + "Multiple programs", 1); return AVERROR_PATCHWELCOME; } @@ -2672,7 +2672,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // for each layer (which there is only on in DVB) if (get_bits(gb, 3)) { // numLayer av_log_missing_feature(latmctx->aac_ctx.avctx, - "multiple layers", 1); + "Multiple layers", 1); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 5eca1151ff..b1c4e73ffc 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -922,14 +922,14 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, #if 1 *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps, *num_bits_left); #else - av_log_missing_feature(ac->avctx, "Parametric Stereo is", 0); + av_log_missing_feature(ac->avctx, "Parametric Stereo", 0); skip_bits_long(gb, *num_bits_left); // bs_fill_bits *num_bits_left = 0; #endif } break; default: - av_log_missing_feature(ac->avctx, "Reserved SBR extensions are", 1); + av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1); skip_bits_long(gb, *num_bits_left); // bs_fill_bits *num_bits_left = 0; break; diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 626698839d..639e061f5a 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -321,7 +321,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) rates in bit allocation. The best assumption would be that it is handled like AC-3 DolbyNet, but we cannot be sure until we have a sample which utilizes this feature. */ - av_log_missing_feature(s->avctx, "Reduced sampling rates", 1); + av_log_missing_feature(s->avctx, "Reduced sampling rate", 1); return AVERROR_PATCHWELCOME; } skip_bits(gbc, 5); // skip bitstream id diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index b39feb679b..a1fdc357e0 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -371,7 +371,7 @@ static inline int decode_subframe(FLACContext *s, int channel) bps -= wasted; } if (bps > 32) { - av_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); + av_log_missing_feature(s->avctx, "Decorrelated bit depth > 32", 0); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 6052ecdf82..a155befa9e 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -264,7 +264,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_PATCHWELCOME; } if (get_bits1(&gb)) { - av_log_missing_feature(avctx, "custom palette", 1); + av_log_missing_feature(avctx, "Custom palette", 1); return AVERROR_PATCHWELCOME; } } diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c index 47a5820cf2..bbf747fa35 100644 --- a/libavcodec/proresdec.c +++ b/libavcodec/proresdec.c @@ -171,7 +171,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, ctx->alpha_info = buf[17] & 0xf; if (ctx->alpha_info) - av_log_missing_feature(avctx, "alpha channel", 0); + av_log_missing_feature(avctx, "Alpha channel", 0); ctx->qmat_changed = 0; ptr = buf + 20; diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 2d8754f14f..bd930135a2 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -189,7 +189,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_S16P; else if (s->bits_per_sample == 24) { avctx->sample_fmt = AV_SAMPLE_FMT_S32P; - av_log_missing_feature(avctx, "bit-depth higher than 16", 0); + av_log_missing_feature(avctx, "Bit-depth higher than 16", 0); return AVERROR_PATCHWELCOME; } else { av_log(avctx, AV_LOG_ERROR, "Unknown bit-depth: %d\n", @@ -885,7 +885,7 @@ static int decode_subframe(WmallDecodeCtx *s) s->do_arith_coding = get_bits1(&s->gb); if (s->do_arith_coding) { - av_log_missing_feature(s->avctx, "arithmetic coding", 1); + av_log_missing_feature(s->avctx, "Arithmetic coding", 1); return AVERROR_PATCHWELCOME; } s->do_ac_filter = get_bits1(&s->gb); diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 2ed79a6302..63caad2440 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1762,7 +1762,7 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr) * are really WMAPro-in-WMAVoice-superframes. I've never seen those in * the wild yet. */ if (!get_bits1(gb)) { - av_log_missing_feature(ctx, "WMAPro-in-WMAVoice support", 1); + av_log_missing_feature(ctx, "WMAPro-in-WMAVoice", 1); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/oggparseskeleton.c b/libavformat/oggparseskeleton.c index 2cc63d413b..2de067d84e 100644 --- a/libavformat/oggparseskeleton.c +++ b/libavformat/oggparseskeleton.c @@ -76,7 +76,7 @@ static int skeleton_header(AVFormatContext *s, int idx) start_granule = AV_RL64(buf+36); if (os->start_granule != OGG_NOGRANULE_VALUE) { av_log_missing_feature(s, - "multiple fisbone for the same stream", 0); + "Multiple fisbone for the same stream", 0); return 1; } if (target_idx >= 0 && start_granule != OGG_NOGRANULE_VALUE) { diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index cecf101009..6d37c94f75 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -92,7 +92,7 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, default: if (s) { /* be silent during a probe */ av_log(s, AV_LOG_WARNING, "Data type 0x%04x", data_type); - av_log_missing_feature(s, " in IEC 61937 is", 1); + av_log_missing_feature(s, " in IEC 61937", 1); } return AVERROR_PATCHWELCOME; } @@ -213,7 +213,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = codec_id; } else if (codec_id != s->streams[0]->codec->codec_id) { - av_log_missing_feature(s, "codec change in IEC 61937", 0); + av_log_missing_feature(s, "Codec change in IEC 61937", 0); return AVERROR_PATCHWELCOME; } -- cgit v1.2.3 From e273a1a54291440289bf6fb56874e92891e87dbb Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 19 Oct 2012 16:26:15 +0200 Subject: fate: Add dependencies for WMA and WavPack tests --- tests/fate/wavpack.mak | 2 +- tests/fate/wma.mak | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index b615c9edd3..afc84d0fd2 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -86,5 +86,5 @@ fate-wavpack-falsestereo: CMD = md5 -i $(SAMPLES)/wavpack/special/false_stereo.w FATE_WAVPACK += fate-wavpack-matroskamode fate-wavpack-matroskamode: CMD = md5 -i $(SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -FATE_SAMPLES_AVCONV += $(FATE_WAVPACK) +FATE_SAMPLES_AVCONV-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK) fate-wavpack: $(FATE_WAVPACK) diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index 78562ec189..b9a856ca7c 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -1,54 +1,54 @@ -FATE_WMAPRO += fate-wmapro-2ch +FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-2ch fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm -FATE_WMAPRO += fate-wmapro-5.1 +FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-5.1 fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm -FATE_WMAPRO += fate-wmapro-ism +FATE_WMAPRO-$(call DEMDEC, MOV, WMAPRO) += fate-wmapro-ism fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm -$(FATE_WMAPRO): CMP = oneoff +$(FATE_WMAPRO-yes): CMP = oneoff -FATE_SAMPLES_AVCONV += $(FATE_WMAPRO) -fate-wmapro: $(FATE_WMAPRO) +FATE_SAMPLES_AVCONV += $(FATE_WMAPRO-yes) +fate-wmapro: $(FATE_WMAPRO-yes) -FATE_WMAVOICE += fate-wmavoice-7k +FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-7k fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm fate-wmavoice-7k: FUZZ = 3 -FATE_WMAVOICE += fate-wmavoice-11k +FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-11k fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm fate-wmavoice-11k: FUZZ = 3 -FATE_WMAVOICE += fate-wmavoice-19k +FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-19k fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm fate-wmavoice-19k: FUZZ = 3 -$(FATE_WMAVOICE): CMP = stddev +$(FATE_WMAVOICE-yes): CMP = stddev -FATE_SAMPLES_AVCONV += $(FATE_WMAVOICE) -fate-wmavoice: $(FATE_WMAVOICE) +FATE_SAMPLES_AVCONV += $(FATE_WMAVOICE-yes) +fate-wmavoice: $(FATE_WMAVOICE-yes) -FATE_WMA_ENCODE += fate-wmav1-encode +FATE_WMA_ENCODE-$(call ENCDEC, WMAV1, ASF) += fate-wmav1-encode fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav1 -b:a 128k fate-wmav1-encode: CMP_SHIFT = -8192 fate-wmav1-encode: CMP_TARGET = 291.06 fate-wmav1-encode: SIZE_TOLERANCE = 4632 -FATE_WMA_ENCODE += fate-wmav2-encode +FATE_WMA_ENCODE-$(call ENCDEC, WMAV2, ASF) += fate-wmav2-encode fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav2 -b:a 128k fate-wmav2-encode: CMP_SHIFT = -8192 fate-wmav2-encode: CMP_TARGET = 258.32 fate-wmav2-encode: SIZE_TOLERANCE = 4632 -$(FATE_WMA_ENCODE): CMP = stddev -$(FATE_WMA_ENCODE): REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav +$(FATE_WMA_ENCODE-yes): CMP = stddev +$(FATE_WMA_ENCODE-yes): REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -FATE_SAMPLES_AVCONV += $(FATE_WMA_ENCODE) -fate-wma-encode: $(FATE_WMA_ENCODE) +FATE_SAMPLES_AVCONV += $(FATE_WMA_ENCODE-yes) +fate-wma-encode: $(FATE_WMA_ENCODE-yes) -- cgit v1.2.3 From 8b8899ac3233b4f7af83ded0dc032fad8902d714 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 20 Oct 2012 21:58:43 +0200 Subject: fate: Declare avcodec/avformat deps in the respective Makefile snippets --- tests/Makefile | 3 --- tests/fate/libavcodec.mak | 1 + tests/fate/libavformat.mak | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 93eb54801b..b7fb7403d5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -92,9 +92,6 @@ include $(SRC_PATH)/tests/fate/wma.mak FATE_AVCONV += $(FATE_AVCONV-yes) FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV) -FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) -FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) - FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes) FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV) FATE_SAMPLES += $(FATE_SAMPLES-yes) diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 765a1b8489..e7831bb083 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -13,4 +13,5 @@ fate-rangecoder: CMD = run libavcodec/rangecoder-test fate-rangecoder: CMP = null fate-rangecoder: REF = /dev/null +FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) fate-libavcodec: $(FATE_LIBAVCODEC) diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 9e5a9f05b0..b6eda42a63 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -2,4 +2,5 @@ FATE_LIBAVFORMAT += fate-url fate-url: libavformat/url-test$(EXESUF) fate-url: CMD = run libavformat/url-test +FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) fate-libavformat: $(FATE_LIBAVFORMAT) -- cgit v1.2.3