Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 13:00:27 +0000 (15:00 +0200)
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
  fate: Declare avcodec/avformat deps in the respective Makefile snippets
  fate: Add dependencies for WMA and WavPack tests
  Improve wording and spelling of av_log_missing_feature messages.
  lavu: remove disabled FF_API_AV_FIFO_PEEK cruft

Conflicts:
libavcodec/aacsbr.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
libavcodec/aacdec.c
libavcodec/aacsbr.c
libavcodec/eac3dec.c
libavcodec/flacdec.c
libavcodec/flashsv.c
libavcodec/proresdec_lgpl.c
libavcodec/wmalosslessdec.c
libavformat/oggparseskeleton.c
libavformat/spdifdec.c
libavutil/fifo.h
libavutil/version.h
tests/Makefile
tests/fate/libavcodec.mak
tests/fate/libavformat.mak
tests/fate/wavpack.mak
tests/fate/wma.mak

index 295243a..f180d78 100644 (file)
@@ -2789,7 +2789,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;
         }
 
@@ -2798,7 +2798,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx,
         // for each layer (which there is only one 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;
         }
 
index aee7ca4..1d15177 100644 (file)
@@ -935,7 +935,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
     default:
         // some files contain 0-padding
         if (bs_extension_id || *num_bits_left > 16 || show_bits(gb, *num_bits_left))
-            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;
index 2bd0619..922bf7a 100644 (file)
@@ -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
index 126fc8d..9921277 100644 (file)
@@ -369,7 +369,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;
     }
 
index 39c5dc8..ee97521 100644 (file)
@@ -266,7 +266,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;
         }
     }
index b5aaa61..d338649 100644 (file)
@@ -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;
index 6ec1fb4..749e41f 100644 (file)
@@ -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);
index d819e0e..f9ad701 100644 (file)
@@ -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) {
index ad138ab..94cfe84 100644 (file)
@@ -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;
     }
 
index ff66c95..849b9a6 100644 (file)
@@ -141,15 +141,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 */
index e0115f7..8e94c6e 100644 (file)
 #ifndef FF_API_FIND_OPT
 #define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
-#ifndef FF_API_AV_FIFO_PEEK
-#define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
 #ifndef FF_API_OLD_AVOPTIONS
 #define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
index 8e22fbf..6fb2edd 100644 (file)
@@ -118,9 +118,6 @@ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
 FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
 FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
 
-FATE-$(CONFIG_AVCODEC)  += $(FATE_LIBAVCODEC)
-FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
-
 FATE_SAMPLES_AVCONV           += $(FATE_SAMPLES_AVCONV-yes)
 FATE_EXTERN-$(CONFIG_FFMPEG)  += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE)
 FATE_EXTERN += $(FATE_EXTERN-yes)
index 765a1b8..e7831bb 100644 (file)
@@ -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)
index 9e5a9f0..b6eda42 100644 (file)
@@ -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)
index b615c9e..afc84d0 100644 (file)
@@ -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)
index 78562ec..b9a856c 100644 (file)
@@ -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)