Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

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

5 files changed, 366 insertions, 2 deletions

diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index 314bc82c35..673dbf2d8f 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -75,7 +75,7 @@ FATE_AAC_ENCODE += fate-aac-aref-encode
 fate-aac-aref-encode: $(AREF)
 fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 512k
 fate-aac-aref-encode: CMP = stddev
-fate-aac-aref-encode: REF = ./tests/data/acodec.ref.wav
+fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav
 fate-aac-aref-encode: CMP_SHIFT = -4096
 fate-aac-aref-encode: CMP_TARGET = 1862
 fate-aac-aref-encode: SIZE_TOLERANCE = 2464
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak
index 5a5169d624..9e4884de9a 100644
--- a/tests/fate/ac3.mak
+++ b/tests/fate/ac3.mak
@@ -46,5 +46,12 @@ fate-eac3-encode: CMP_TARGET = 514.02
 fate-eac3-encode: SIZE_TOLERANCE = 488
 fate-eac3-encode: FUZZ = 3
 
+FATE_AC3 += fate-ac3-fixed-encode
+fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav
+fate-ac3-fixed-encode: SRC = tests/data/asynth-44100-2.wav
+fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3
+fate-ac3-fixed-encode: CMP = oneline
+fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1
+
 FATE_SAMPLES_AVCONV += $(FATE_AC3)
 fate-ac3: $(FATE_AC3)
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
new file mode 100644
index 0000000000..58e742bb7d
--- /dev/null
+++ b/tests/fate/acodec.mak
@@ -0,0 +1,69 @@
+fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
+fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
+fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep
+fate-acodec-%: CMP_UNIT = 2
+
+FATE_ACODEC_PCM = alaw mulaw                                            \
+                  s8 u8                                                 \
+                  s16be s16le                                           \
+                  s24be s24le                                           \
+                  s32be s32le                                           \
+                  f32be f32le                                           \
+                  f64be f64le
+
+FATE_ACODEC += $(FATE_ACODEC_PCM:%=fate-acodec-pcm-%)
+
+fate-acodec-pcm-%: FMT = wav
+fate-acodec-pcm-%: CODEC = pcm_$(@:fate-acodec-pcm-%=%)
+
+fate-acodec-pcm-s8:   FMT = mov
+fate-acodec-pcm-s%be: FMT = mov
+fate-acodec-pcm-f%be: FMT = au
+
+FATE_ACODEC_ADPCM = adx ima_qt ima_wav ms swf yamaha
+FATE_ACODEC += $(FATE_ACODEC_ADPCM:%=fate-acodec-adpcm-%)
+
+fate-acodec-adpcm-%: CODEC = adpcm_$(@:fate-acodec-adpcm-%=%)
+
+fate-acodec-adpcm-adx:     FMT = adx
+fate-acodec-adpcm-ima_qt:  FMT = aiff
+fate-acodec-adpcm-ima_wav: FMT = wav
+fate-acodec-adpcm-ms:      FMT = wav
+fate-acodec-adpcm-swf:     FMT = flv
+fate-acodec-adpcm-yamaha:  FMT = wav
+
+FATE_ACODEC += fate-acodec-mp2
+fate-acodec-mp2: FMT = mp2
+fate-acodec-mp2: CMP_SHIFT = -1924
+
+FATE_ACODEC += fate-acodec-alac
+fate-acodec-alac: FMT = mov
+fate-acodec-alac: CODEC = alac -compression_level 1
+
+FATE_ACODEC += fate-acodec-flac
+fate-acodec-flac: FMT = flac
+fate-acodec-flac: CODEC = flac -compression_level 2
+
+FATE_ACODEC += fate-acodec-g723_1
+fate-acodec-g723_1: FMT = g723_1
+fate-acodec-g723_1: CODEC = g723_1
+fate-acodec-g723_1: ENCOPTS = -b:a 6.3k -ac 1 -ar 8000
+#fate-acodec-g723_1: DECOPTS = -ac 2 -ar 44100
+
+FATE_ACODEC += fate-acodec-ra144
+fate-acodec-ra144: FMT = rm
+fate-acodec-ra144: CODEC = real_144
+fate-acodec-ra144: ENCOPTS = -ac 1
+fate-acodec-ra144: DECOPTS = -ac 2
+fate-acodec-ra144: CMP_SHIFT = -640
+
+FATE_ACODEC += fate-acodec-roqaudio
+fate-acodec-roqaudio: FMT = roq
+fate-acodec-roqaudio: CODEC = roq_dpcm
+fate-acodec-roqaudio: ENCOPTS = -ar 22050
+fate-acodec-roqaudio: DECOPTS = -ar 44100
+
+$(FATE_ACODEC): tests/data/asynth-44100-2.wav
+
+FATE_AVCONV += $(FATE_ACODEC)
+fate-acodec: $(FATE_ACODEC)
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index d741faddb2..120c50e72e 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -38,7 +38,7 @@ FATE_SAMPLES_AUDIO += fate-nellymoser-aref-encode
 fate-nellymoser-aref-encode: $(AREF)
 fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser
 fate-nellymoser-aref-encode: CMP = stddev
-fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav
+fate-nellymoser-aref-encode: REF = ./tests/data/asynth-16000-1.wav
 fate-nellymoser-aref-encode: CMP_SHIFT = -244
 fate-nellymoser-aref-encode: CMP_TARGET = 9612
 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
new file mode 100644
index 0000000000..5d8366ca2a
--- /dev/null
+++ b/tests/fate/vcodec.mak
@@ -0,0 +1,288 @@
+fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
+fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
+fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
+fate-vsynth%: FMT = avi
+fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"
+fate-vsynth%: CMP_UNIT = 1
+
+FATE_VCODEC += amv
+
+FATE_VCODEC += asv1
+fate-vsynth%-asv1:               ENCOPTS = -qscale 10
+
+FATE_VCODEC += asv2
+fate-vsynth%-asv2:               ENCOPTS = -qscale 10
+
+FATE_VCODEC += cljr
+
+FATE_VCODEC += dnxhd-720p
+fate-vsynth%-dnxhd-720p:         ENCOPTS = -s hd720 -b 90M              \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-720p:         FMT     = dnxhd
+
+FATE_VCODEC += dnxhd-720p-rd
+fate-vsynth%-dnxhd-720p-rd:      ENCOPTS = -s hd720 -b 90M -threads 4 -mbd rd \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-720p-rd:      FMT     = dnxhd
+
+FATE_VCODEC += dnxhd-720p-10bit
+fate-vsynth%-dnxhd-720p-10bit:   ENCOPTS = -s hd720 -b 90M              \
+                                           -pix_fmt yuv422p10 -frames 5
+fate-vsynth%-dnxhd-720p-10bit:   FMT     = dnxhd
+
+FATE_VCODEC += dnxhd-1080i
+fate-vsynth%-dnxhd-1080i:        ENCOPTS = -s hd1080 -b 120M -flags +ildct \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-1080i:        FMT     = mov
+
+FATE_VCODEC += dv
+fate-vsynth%-dv:                 CODEC   = dvvideo
+fate-vsynth%-dv:                 ENCOPTS = -dct int -s pal
+fate-vsynth%-dv:                 FMT     = dv
+
+FATE_VCODEC += dv-411
+fate-vsynth%-dv-411:             CODEC   = dvvideo
+fate-vsynth%-dv-411:             ENCOPTS = -dct int -s pal -pix_fmt yuv411p \
+                                           -sws_flags area
+fate-vsynth%-dv-411:             DECOPTS = -sws_flags area
+fate-vsynth%-dv-411:             FMT     = dv
+
+FATE_VCODEC += dv-50
+fate-vsynth%-dv-50:              CODEC   = dvvideo
+fate-vsynth%-dv-50:              ENCOPTS = -dct int -s pal -pix_fmt yuv422p \
+                                           -sws_flags neighbor
+fate-vsynth%-dv-50:              DECOPTS = -sws_flags neighbor
+fate-vsynth%-dv-50:              FMT     = dv
+
+FATE_VCODEC += ffv1
+fate-vsynth%-ffv1:               ENCOPTS = -strict -2
+
+FATE_VCODEC += ffvhuff
+
+FATE_VCODEC += flashsv
+fate-vsynth%-flashsv:            ENCOPTS = -sws_flags neighbor+full_chroma_int
+fate-vsynth%-flashsv:            DECOPTS = -sws_flags area
+fate-vsynth%-flashsv:            FMT     = flv
+
+FATE_VCODEC += flashsv2
+fate-vsynth%-flashsv2:           ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0
+fate-vsynth%-flashsv2:           DECOPTS = -sws_flags area
+fate-vsynth%-flashsv2:           FMT     = flv
+
+FATE_VCODEC += flv
+fate-vsynth%-flv:                ENCOPTS = -qscale 10
+fate-vsynth%-flv:                FMT     = flv
+
+FATE_VCODEC += h261
+fate-vsynth%-h261:               ENCOPTS = -qscale 11
+
+FATE_VCODEC += h263
+fate-vsynth%-h263:               ENCOPTS = -qscale 10
+
+FATE_VCODEC += h263p
+fate-vsynth%-h263p:              ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300
+
+FATE_VCODEC += huffyuv
+fate-vsynth%-huffyuv:            ENCOPTS = -pix_fmt yuv422p -sws_flags neighbor
+fate-vsynth%-huffyuv:            DECOPTS = -strict -2 -sws_flags neighbor
+
+FATE_VCODEC += jpegls
+fate-vsynth%-jpegls:             ENCOPTS = -sws_flags neighbor+full_chroma_int
+fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
+
+FATE_VCODEC += j2k
+fate-vsynth%-j2k:                ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
+fate-vsynth%-j2k:                DECINOPTS = -vcodec j2k -strict experimental
+
+FATE_VCODEC += ljpeg
+fate-vsynth%-ljpeg:              ENCOPTS = -strict -1
+
+FATE_VCODEC += mjpeg
+fate-vsynth%-mjpeg:              ENCOPTS = -qscale 9 -pix_fmt yuvj420p
+
+FATE_VCODEC += mpeg1
+fate-vsynth%-mpeg1:              FMT     = mpeg1video
+fate-vsynth%-mpeg1:              CODEC   = mpeg1video
+fate-vsynth%-mpeg1:              ENCOPTS = -qscale 10
+
+FATE_VCODEC += mpeg1b
+fate-vsynth%-mpeg1b:             CODEC   = mpeg1video
+fate-vsynth%-mpeg1b:             ENCOPTS = -qscale 8 -bf 3 -ps 200
+fate-vsynth%-mpeg1b:             FMT     = mpeg1video
+
+FATE_MPEG2 = mpeg2                                                      \
+             mpeg2-422                                                  \
+             mpeg2-idct-int                                             \
+             mpeg2-ilace                                                \
+             mpeg2-ivlc-qprd                                            \
+             mpeg2-thread                                               \
+             mpeg2-thread-ivlc
+
+FATE_VCODEC += $(FATE_MPEG2)
+
+$(FATE_MPEG2:%=fate-vsynth\%-%): FMT    = mpeg2video
+$(FATE_MPEG2:%=fate-vsynth\%-%): CODEC  = mpeg2video
+
+fate-vsynth%-mpeg2:              ENCOPTS = -qscale 10
+fate-vsynth%-mpeg2-422:          ENCOPTS = -vb 1000k                    \
+                                           -bf 2                        \
+                                           -trellis 1                   \
+                                           -flags +mv0+ildct+ilme       \
+                                           -mpv_flags +qp_rd            \
+                                           -intra_vlc 1                 \
+                                           -mbd rd                      \
+                                           -pix_fmt yuv422p
+fate-vsynth%-mpeg2-idct-int:     ENCOPTS = -qscale 10 -idct int -dct int
+fate-vsynth%-mpeg2-ilace:        ENCOPTS = -qscale 10 -flags +ildct+ilme
+fate-vsynth%-mpeg2-ivlc-qprd:    ENCOPTS = -vb 500k                     \
+                                           -bf 2                        \
+                                           -trellis 1                   \
+                                           -flags +mv0                  \
+                                           -mpv_flags +qp_rd            \
+                                           -intra_vlc 1                 \
+                                           -cmp 2 -subcmp 2             \
+                                           -mbd rd
+fate-vsynth%-mpeg2-thread:       ENCOPTS = -qscale 10 -bf 2 -flags +ildct+ilme \
+                                           -threads 2 -slices 2
+fate-vsynth%-mpeg2-thread-ivlc:  ENCOPTS = -qscale 10 -bf 2 -flags +ildct+ilme \
+                                           -intra_vlc 1 -threads 2 -slices 2
+
+FATE_VCODEC += mpeg4
+fate-vsynth%-mpeg4:              ENCOPTS = -qscale 10 -flags +mv4 -mbd bits
+fate-vsynth%-mpeg4:              FMT     = mp4
+
+FATE_VCODEC += mpeg4-rc
+fate-vsynth%-mpeg4-rc:           ENCOPTS = -b 400k -bf 2
+
+FATE_VCODEC += mpeg4-adv
+fate-vsynth%-mpeg4-adv:          ENCOPTS = -qscale 9 -flags +mv4+aic       \
+                                           -data_partitioning 1 -trellis 1 \
+                                           -mbd bits -ps 200
+
+FATE_VCODEC += mpeg4-qprd
+fate-vsynth%-mpeg4-qprd:         ENCOPTS = -b 450k -bf 2 -trellis 1          \
+                                           -flags +mv4+mv0 -mpv_flags +qp_rd \
+                                           -cmp 2 -subcmp 2 -mbd rd
+
+FATE_VCODEC += mpeg4-adap
+fate-vsynth%-mpeg4-adap:         ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \
+                                           -trellis 1 -cmp 1 -subcmp 2   \
+                                           -mbd rd -scplx_mask 0.3
+
+FATE_VCODEC += mpeg4-qpel
+fate-vsynth%-mpeg4-qpel:         ENCOPTS = -qscale 7 -flags +mv4+qpel -mbd 2 \
+                                           -bf 2 -cmp 1 -subcmp 2
+
+FATE_VCODEC += mpeg4-thread
+fate-vsynth%-mpeg4-thread:       ENCOPTS = -b 500k -flags +mv4+aic         \
+                                           -data_partitioning 1 -trellis 1 \
+                                           -mbd bits -ps 200 -bf 2         \
+                                           -threads 2 -slices 2
+
+FATE_VCODEC += mpeg4-error
+fate-vsynth%-mpeg4-error:        ENCOPTS = -qscale 7 -flags +mv4+aic    \
+                                           -data_partitioning 1 -mbd rd \
+                                           -ps 250 -error 10
+
+FATE_VCODEC += mpeg4-nr
+fate-vsynth%-mpeg4-nr:           ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200
+
+FATE_VCODEC += msmpeg4
+fate-vsynth%-msmpeg4:            ENCOPTS = -qscale 10
+
+FATE_VCODEC += msmpeg4v2
+fate-vsynth%-msmpeg4v2:          ENCOPTS = -qscale 10
+
+FATE_VCODEC += mpng
+fate-vsynth%-mpng:               CODEC   = png
+
+FATE_VCODEC += msvideo1
+
+FATE_VCODEC += prores
+fate-vsynth%-prores:             FMT     = mov
+
+FATE_VCODEC += prores_kostya
+fate-vsynth%-prores_kostya:             ENCOPTS = -profile hq
+fate-vsynth%-prores_kostya:             FMT     = mov
+
+FATE_VCODEC += qtrle
+fate-vsynth%-qtrle:              FMT     = mov
+
+FATE_VCODEC += qtrlegray
+fate-vsynth%-qtrlegray:          CODEC   = qtrle
+fate-vsynth%-qtrlegray:          ENCOPTS = -pix_fmt gray
+fate-vsynth%-qtrlegray:          FMT     = mov
+
+FATE_VCODEC += rgb
+fate-vsynth%-rgb:                CODEC   = rawvideo
+fate-vsynth%-rgb:                ENCOPTS = -pix_fmt bgr24
+
+FATE_VCODEC += roqvideo
+fate-vsynth%-roqvideo:           CODEC   = roqvideo
+fate-vsynth%-roqvideo:           ENCOPTS = -frames 5
+fate-vsynth%-roqvideo:           RAWDECOPTS = -r 30
+fate-vsynth%-roqvideo:           FMT     = roq
+
+FATE_VCODEC += rv10
+fate-vsynth%-rv10:               ENCOPTS = -qscale 10
+fate-vsynth%-rv10:               FMT     = rm
+
+FATE_VCODEC += rv20
+fate-vsynth%-rv20:               ENCOPTS = -qscale 10
+fate-vsynth%-rv20:               FMT     = rm
+
+FATE_VCODEC += snow
+fate-vsynth%-snow:               ENCOPTS = -strict -2 -qscale 2 -flags +qpel \
+                                           -me_method iter -dia_size 2       \
+                                           -cmp 12 -subcmp 12 -s 128x64
+
+FATE_VCODEC += snow-ll
+fate-vsynth%-snow-ll:            ENCOPTS = -strict -2 -qscale .001 -pred 1 \
+                                           -flags +mv4+qpel
+
+FATE_VCODEC += svq1
+fate-vsynth%-svq1:               ENCOPTS = -qscale 3 -pix_fmt yuv410p
+fate-vsynth%-svq1:               FMT     = mov
+
+FATE_VCODEC += r210
+
+FATE_VCODEC += v210
+
+FATE_VCODEC += v308
+
+FATE_VCODEC += v408
+fate-vsynth%-v408:               ENCOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-v408:               DECOPTS = -sws_flags neighbor+bitexact
+
+FATE_VCODEC += avui
+fate-vsynth%-avui:               ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact
+fate-vsynth%-avui:               DECOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-avui:               FMT     = mov
+
+FATE_VCODEC += wmv1
+fate-vsynth%-wmv1:               ENCOPTS = -qscale 10
+
+FATE_VCODEC += wmv2
+fate-vsynth%-wmv2:               ENCOPTS = -qscale 10
+
+FATE_VCODEC += yuv
+fate-vsynth%-yuv:                CODEC = rawvideo
+
+FATE_VCODEC += yuv4
+
+FATE_VCODEC += y41p
+
+FATE_VCODEC += zlib
+
+
+FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%)
+FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%)
+
+$(FATE_VSYNTH1): tests/data/vsynth1.yuv
+$(FATE_VSYNTH2): tests/data/vsynth2.yuv
+
+FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH2)
+
+fate-vsynth1: $(FATE_VSYNTH1)
+fate-vsynth2: $(FATE_VSYNTH2)
+fate-vcodec:  fate-vsynth1 fate-vsynth2