Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: split off vqf/twinvq FATE tests into their own file
  fate: split off mpc FATE tests into their own file
  fate: split off libavcodec FATE tests into their own file
  fate: split off Microsoft codec FATE tests into their own file
  fate: group all VP* codec FATE tests together in one file
  swscale: prevent invalid writes in packed_16bpc_bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>

9 files changed, 64 insertions, 52 deletions

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 7de6fbfe37..401666b525 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -243,9 +243,10 @@ static int packed_16bpc_bswap(SwsContext *c, const uint8_t *src[],
     int dststr = dstStride[0] >> 1;
     uint16_t       *dstPtr =       (uint16_t *) dst[0];
     const uint16_t *srcPtr = (const uint16_t *) src[0];
+    int min_stride         = FFMIN(srcstr, dststr);
 
     for (i = 0; i < srcSliceH; i++) {
-        for (j = 0; j < srcstr; j++) {
+        for (j = 0; j < min_stride; j++) {
             dstPtr[j] = av_bswap16(srcPtr[j]);
         }
         srcPtr += srcstr;
diff --git a/tests/Makefile b/tests/Makefile
index 6ac49283a0..04a29968a7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -54,18 +54,22 @@ include $(SRC_PATH)/tests/fate/fft.mak
 include $(SRC_PATH)/tests/fate/h264.mak
 include $(SRC_PATH)/tests/fate/image.mak
 include $(SRC_PATH)/tests/fate/indeo.mak
+include $(SRC_PATH)/tests/fate/libavcodec.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/mapchan.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
+include $(SRC_PATH)/tests/fate/microsoft.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
+include $(SRC_PATH)/tests/fate/mpc.mak
 include $(SRC_PATH)/tests/fate/prores.mak
 include $(SRC_PATH)/tests/fate/qtrle.mak
 include $(SRC_PATH)/tests/fate/real.mak
 include $(SRC_PATH)/tests/fate/screen.mak
 include $(SRC_PATH)/tests/fate/utvideo.mak
 include $(SRC_PATH)/tests/fate/vorbis.mak
-include $(SRC_PATH)/tests/fate/vp8.mak
+include $(SRC_PATH)/tests/fate/vpx.mak
+include $(SRC_PATH)/tests/fate/vqf.mak
 include $(SRC_PATH)/tests/fate/wma.mak
 
 FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
diff --git a/tests/fate.mak b/tests/fate.mak
index dc047940b1..e9b8e5deb9 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -90,10 +90,6 @@ FATE_TESTS += fate-ea-tgv-ima-ea-sead
 fate-ea-tgv-ima-ea-sead: CMD = framecrc  -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24
 FATE_TESTS += fate-ea-tqi-adpcm
 fate-ea-tqi-adpcm: CMD = framecrc  -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26
-FATE_TESTS += fate-ea-vp60
-fate-ea-vp60: CMD = framecrc  -i $(SAMPLES)/ea-vp6/g36.vp6
-FATE_TESTS += fate-ea-vp61
-fate-ea-vp61: CMD = framecrc  -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 FATE_TESTS += fate-feeble-dxa
 fate-feeble-dxa: CMD = framecrc  -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24
 FATE_TESTS += fate-film-cvid-pcm-stereo-8bit
@@ -142,14 +138,6 @@ FATE_TESTS += fate-mimic
 fate-mimic: CMD = framecrc  -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -vsync 0
 FATE_TESTS += fate-motionpixels
 fate-motionpixels: CMD = framecrc  -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
-FATE_TESTS += fate-mpc7-demux
-fate-mpc7-demux: CMD = crc  -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
-FATE_TESTS += fate-mpc8-demux
-fate-mpc8-demux: CMD = crc  -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
-FATE_TESTS += fate-msvideo1-16bit
-fate-msvideo1-16bit: CMD = framecrc  -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
-FATE_TESTS += fate-msvideo1-8bit
-fate-msvideo1-8bit: CMD = framecrc  -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
 FATE_TESTS += fate-mtv
 fate-mtv: CMD = framecrc  -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -acodec copy -pix_fmt rgb24
 FATE_TESTS += fate-mxf-demux
@@ -248,22 +236,12 @@ FATE_TESTS += fate-ulti
 fate-ulti: CMD = framecrc  -i $(SAMPLES)/ulti/hit12w.avi -an
 FATE_TESTS += fate-v210
 fate-v210: CMD = framecrc  -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an
-FATE_TESTS += fate-vc1
-fate-vc1: CMD = framecrc  -i $(SAMPLES)/vc1/SA00040.vc1
 FATE_TESTS += fate-vcr1
 fate-vcr1: CMD = framecrc  -i $(SAMPLES)/vcr1/VCR1test.avi -an
 FATE_TESTS += fate-video-xl
 fate-video-xl: CMD = framecrc  -i $(SAMPLES)/vixl/pig-vixl.avi
-FATE_TESTS += fate-vp5
-fate-vp5: CMD = framecrc  -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
-FATE_TESTS += fate-vp6a
-fate-vp6a: CMD = framecrc  -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
-FATE_TESTS += fate-vp6f
-fate-vp6f: CMD = framecrc  -i $(SAMPLES)/flash-vp6/clip1024.flv
 FATE_TESTS += fate-vqa-cc
 fate-vqa-cc: CMD = framecrc  -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24
-FATE_TESTS += fate-vqf-demux
-fate-vqf-demux: CMD = md5  -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
 FATE_TESTS += fate-w64
 fate-w64: CMD = crc  -i $(SAMPLES)/w64/w64-pcm16.w64
 FATE_TESTS += fate-wc3movie-xan
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
new file mode 100644
index 0000000000..083f6e8b04
--- /dev/null
+++ b/tests/fate/libavcodec.mak
@@ -0,0 +1,3 @@
+FATE_TESTS += fate-iirfilter
+fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
+fate-iirfilter: CMD = run libavcodec/iirfilter-test
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
new file mode 100644
index 0000000000..c6c1c62e6f
--- /dev/null
+++ b/tests/fate/microsoft.mak
@@ -0,0 +1,18 @@
+FATE_TESTS += fate-msmpeg4v1
+fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an
+
+FATE_TESTS += fate-msvideo1-16bit
+fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
+
+FATE_TESTS += fate-msvideo1-8bit
+fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
+
+FATE_TESTS += fate-wmv8-drm
+# discard last packet to avoid fails due to overread of VC-1 decoder
+fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162
+
+FATE_TESTS += fate-wmv8-drm-nodec
+fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
+
+FATE_TESTS += fate-vc1
+fate-vc1: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak
new file mode 100644
index 0000000000..d7f8c47c19
--- /dev/null
+++ b/tests/fate/mpc.mak
@@ -0,0 +1,11 @@
+FATE_TESTS += fate-mpc7-demux
+fate-mpc7-demux: CMD = crc  -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
+
+FATE_TESTS += fate-mpc8-demux
+fate-mpc8-demux: CMD = crc  -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
+
+FATE_TESTS += fate-musepack7
+fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
+fate-musepack7: CMP = oneoff
+fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm
+fate-musepack7: FUZZ = 1
diff --git a/tests/fate/vp8.mak b/tests/fate/vpx.mak
index be8f50aaf8..66e9ced3f4 100644
--- a/tests/fate/vp8.mak
+++ b/tests/fate/vpx.mak
@@ -1,3 +1,21 @@
+FATE_TESTS += fate-ea-vp60
+fate-ea-vp60: CMD = framecrc  -i $(SAMPLES)/ea-vp6/g36.vp6
+
+FATE_TESTS += fate-ea-vp61
+fate-ea-vp61: CMD = framecrc  -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
+
+FATE_TESTS += fate-vp3
+fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
+
+FATE_TESTS += fate-vp5
+fate-vp5: CMD = framecrc  -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
+
+FATE_TESTS += fate-vp6a
+fate-vp6a: CMD = framecrc  -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
+
+FATE_TESTS += fate-vp6f
+fate-vp6f: CMD = framecrc  -i $(SAMPLES)/flash-vp6/clip1024.flv
+
 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
 
 define FATE_VP8_SUITE
diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
new file mode 100644
index 0000000000..6860fadbb2
--- /dev/null
+++ b/tests/fate/vqf.mak
@@ -0,0 +1,7 @@
+FATE_TESTS += fate-twinvq
+fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf
+fate-twinvq: CMP = oneoff
+fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
+
+FATE_TESTS += fate-vqf-demux
+fate-vqf-demux: CMD = md5  -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
diff --git a/tests/fate2.mak b/tests/fate2.mak
index e78a8a3231..e925278d9b 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -1,8 +1,3 @@
-FATE_TESTS += fate-twinvq
-fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf
-fate-twinvq: CMP = oneoff
-fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
-
 FATE_TESTS += fate-mpeg2-field-enc
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
 
@@ -53,19 +48,9 @@ FATE_TESTS += fate-g722enc
 fate-g722enc: tests/data/asynth-16000-1.sw
 fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
 
-FATE_TESTS += fate-msmpeg4v1
-fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an
-
 FATE_TESTS += fate-ansi
 fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
 
-FATE_TESTS += fate-wmv8-drm
-# discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162
-
-FATE_TESTS += fate-wmv8-drm-nodec
-fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
-
 FATE_TESTS += fate-binkaudio-dct
 fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
 fate-binkaudio-dct: CMP = oneoff
@@ -84,9 +69,6 @@ fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
 FATE_TESTS += fate-txd-16bpp
 fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
 
-FATE_TESTS += fate-vp3
-fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
-
 FATE_TESTS += fate-ws_snd
 fate-ws_snd: CMD = md5  -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
 
@@ -96,16 +78,6 @@ fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 FATE_TESTS += fate-mjpegb
 fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an
 
-FATE_TESTS += fate-musepack7
-fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
-fate-musepack7: CMP = oneoff
-fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm
-fate-musepack7: FUZZ = 1
-
-FATE_TESTS += fate-iirfilter
-fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
-fate-iirfilter: CMD = run libavcodec/iirfilter-test
-
 FATE_TESTS += fate-v410dec
 fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le