[FFmpeg-devel] [PATCH 01/13] fate/qt: Fix test requirements

[FFmpeg-devel] [PATCH 01/13] fate/qt: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/qt.mak | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak
index 6e71f6e4d1..42e5fd9107 100644
--- a/tests/fate/qt.mak
+++ b/tests/fate/qt.mak
@@ -1,52 +1,52 @@
-FATE_QT-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps
+FATE_QT-$(call FRAMECRC, MOV, EIGHTBPS, SCALE_FILTER ARESAMPLE_FILTER) += fate-8bps
 fate-8bps: CMD = framecrc -i $(TARGET_SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 -vf scale -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, QDM2) += fate-qdm2
+FATE_QT-$(call ENCDEC, PCM_S16LE QDM2, PCM_S16LE MOV, PIPE_PROTOCOL) += fate-qdm2
 fate-qdm2: CMD = pcm -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov
 fate-qdm2: CMP = oneoff
 fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm
 fate-qdm2: FUZZ = 2
 
-FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono
+FATE_QT-$(call ENCDEC, PCM_S16LE PCM_ALAW, MOV PCM_S16LE) += fate-qt-alaw-mono
 fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
 
-FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo
+FATE_QT-$(call ENCDEC, PCM_S16LE PCM_ALAW, MOV PCM_S16LE) += fate-qt-alaw-stereo
 fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le
 
-FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono
+FATE_QT-$(call ENCDEC, PCM_S16LE ADPCM_IMA_QT, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-ima4-mono
 fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo
+FATE_QT-$(call ENCDEC, PCM_S16LE ADPCM_IMA_QT, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-ima4-stereo
 fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono
+FATE_QT-$(call ENCDEC, PCM_S16LE MACE3, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac3-mono
 fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo
+FATE_QT-$(call ENCDEC, PCM_S16LE MACE3, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac3-stereo
 fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono
+FATE_QT-$(call ENCDEC, PCM_S16LE MACE6, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac6-mono
 fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo
+FATE_QT-$(call ENCDEC, PCM_S16LE MACE6, PCM_S16LE MOV, ARESAMPLE_FILTER) += fate-qt-mac6-stereo
 fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le -af aresample
 
-FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono
+FATE_QT-$(call ENCDEC, PCM_S16LE PCM_MULAW, PCM_S16LE MOV) += fate-qt-ulaw-mono
 fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le
 
-FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo
+FATE_QT-$(call ENCDEC, PCM_S16LE PCM_MULAW, PCM_S16LE MOV) += fate-qt-ulaw-stereo
 fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le
 
-FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw
+FATE_QT-$(call FRAMECRC, MOV, QDRAW, SCALE_FILTER) += fate-quickdraw
 fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 -vf scale
 
-FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza
+FATE_QT-$(call FRAMECRC, MOV, RPZA, SCALE_FILTER) += fate-rpza
 fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 -vf scale
 
-FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1
+FATE_QT-$(call FRAMECRC, MOV, SVQ1) += fate-svq1
 fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10
 
-FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
+FATE_QT-$(call FRAMECRC, MOV, SVQ1) += fate-svq1-headerswap
 fate-svq1-headerswap: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/ct_ending_cut.mov -frames 4
 
 FATE_SVQ3 += fate-svq3-1
@@ -59,7 +59,7 @@ fate-svq3-2: CMD = framecrc -flags +bitexact -ignore_editlist 1 -i $(TARGET_SAMP
 FATE_SVQ3 += fate-svq3-watermark
 fate-svq3-watermark: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_watermark.mov
 
-FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
+FATE_QT-$(call FRAMECRC, MOV, SVQ3, ZLIB) += $(FATE_SVQ3)
 fate-svq3: $(FATE_SVQ3)
 
 FATE_QT += $(FATE_QT-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 02/13] fate/canopus: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/canopus.mak | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/fate/canopus.mak b/tests/fate/canopus.mak
index 3d664ff911..4e50716813 100644
--- a/tests/fate/canopus.mak
+++ b/tests/fate/canopus.mak
@@ -8,7 +8,8 @@ fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.
 FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock
 fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi
 
-FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC)
+FATE_CANOPUS_CLLC   := $(if $(call FRAMECRC, AVI, CLLC), $(FATE_CANOPUS_CLLC))
+FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_CLLC)
 fate-canopus-cllc: $(FATE_CANOPUS_CLLC)
 
 #lossy
@@ -21,7 +22,8 @@ fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi
 FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter
 fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi
 
-FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA)
+FATE_CANOPUS_HQ_HQA := $(if $(call FRAMECRC, AVI, HQ_HQA), $(FATE_CANOPUS_HQ_HQA))
+FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQ_HQA)
 fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA)
 
 FATE_CANOPUS_HQX += fate-canopus-hqx422
@@ -30,5 +32,6 @@ fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix
 FATE_CANOPUS_HQX += fate-canopus-hqx422a
 fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an -vf scale
 
-FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX)
+FATE_CANOPUS_HQX    := $(if $(call FRAMECRC, AVI, HQX, SCALE_FILTER), $(FATE_CANOPUS_HQX))
+FATE_SAMPLES_FFMPEG += $(FATE_CANOPUS_HQX)
 fate-canopus-hqx: $(FATE_CANOPUS_HQX)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 03/13] fate/dnxhd: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/dnxhd.mak | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/fate/dnxhd.mak b/tests/fate/dnxhd.mak
index 59f3f90e91..f261766b53 100644
--- a/tests/fate/dnxhd.mak
+++ b/tests/fate/dnxhd.mak
@@ -1,15 +1,18 @@
-FATE_DNXHD = fate-dnxhd-mbaff     \
-             fate-dnxhr-444       \
-             fate-dnxhr-12bit     \
-             fate-dnxhr-parse     \
+FATE_DNXHD = fate-dnxhr-parse     \
              fate-dnxhr-prefix1   \
              fate-dnxhr-prefix2   \
              fate-dnxhr-prefix3   \
              fate-dnxhr-prefix4   \
              fate-dnxhr-prefix5
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, DNXHD) += $(FATE_DNXHD)
-fate-dnxhd: $(FATE_DNXHD) $(FATE_VCODEC_DNXHD)
+FATE_DNXHD_SCALE := fate-dnxhd-mbaff     \
+                    fate-dnxhr-444       \
+                    fate-dnxhr-12bit     \
+
+FATE_DNXHD-$(call FRAMECRC, MOV, DNXHD) += $(FATE_DNXHD)
+FATE_DNXHD-$(call FRAMECRC, MOV, DNXHD, SCALE_FILTER) += $(FATE_DNXHD_SCALE)
+FATE_SAMPLES_FFMPEG += $(FATE_DNXHD-yes)
+fate-dnxhd: $(FATE_DNXHD-yes) $(FATE_VCODEC_DNXHD)
 
 fate-dnxhd-mbaff: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhd100_cid1260.mov -pix_fmt yuv422p10le -vf scale
 fate-dnxhr-444:   CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhr444_cid1270.mov -pix_fmt yuv444p10le -vf scale
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 04/13] fate/ea: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/ea.mak | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak
index 7667102ce7..2d1ac6e50c 100644
--- a/tests/fate/ea.mak
+++ b/tests/fate/ea.mak
@@ -1,25 +1,23 @@
-FATE_SAMPLES_EA-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata
+FATE_SAMPLES_EA-$(call ENCDEC, PCM_S16LE ADPCM_EA_XAS, PCM_S16LE EA_CDATA, ARESAMPLE_FILTER) += fate-ea-cdata
 fate-ea-cdata: CMD = md5 -i $(TARGET_SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le -af aresample
 
-FATE_SAMPLES_EA-$(call DEMDEC, EA, EACMV) += fate-ea-cmv
+FATE_SAMPLES_EA-$(call FRAMECRC, EA, EACMV, SCALE_FILTER) += fate-ea-cmv
 fate-ea-cmv: CMD = framecrc -i $(TARGET_SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -vf scale
 
-FATE_SAMPLES_EA-$(call DEMDEC, EA, EAMAD) += fate-ea-mad
+FATE_SAMPLES_EA-$(call FRAMECRC, EA, EAMAD) += fate-ea-mad
 fate-ea-mad: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -an
 
-FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq
+FATE_SAMPLES_EA-$(call FRAMECRC, EA, EATGQ) += fate-ea-tgq
 fate-ea-tgq: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgq/v27.tgq -an
 
-FATE_EA_TGV += fate-ea-tgv-1
+FATE_EA_TGV-$(call FRAMECRC, EA, EATGV, SCALE_FILTER) += fate-ea-tgv-1 fate-ea-tgv-2
 fate-ea-tgv-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an -vf scale
-
-FATE_EA_TGV += fate-ea-tgv-2
 fate-ea-tgv-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an -vf scale
 
-FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV)
-fate-ea-tgv: $(FATE_EA_TGV)
+FATE_SAMPLES_EA-yes += $(FATE_EA_TGV-yes)
+fate-ea-tgv: $(FATE_EA_TGV-yes)
 
-FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi
+FATE_SAMPLES_EA-$(call FRAMECRC, EA, EATQI) += fate-ea-tqi
 fate-ea-tqi: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an
 
 FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 05/13] fate/vbn: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/vbn.mak | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/fate/vbn.mak b/tests/fate/vbn.mak
index 044b110ac1..6c3fe82c99 100644
--- a/tests/fate/vbn.mak
+++ b/tests/fate/vbn.mak
@@ -30,7 +30,9 @@ tests/data/raw-rgb24.vbn: TAG = GEN
 tests/data/raw-rgb24.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
 	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgb24.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null
 
-VBN_REFCMP_DEPS = PSNR_FILTER METADATA_FILTER VBN_ENCODER VBN_DECODER IMAGE2_MUXER IMAGE2_DEMUXER PNG_DECODER
+FATE_VBN-$(call ENCDEC2, VBN, WRAPPED_AVFRAME PNG, IMAGE2,        \
+                         PSNR_FILTER METADATA_FILTER SCALE_FILTER \
+                         NULL_MUXER PIPE_PROTOCOL) += $(FATE_VBN)
 
-FATE_SAMPLES_FFMPEG-$(call ALLYES, $(VBN_REFCMP_DEPS)) += $(FATE_VBN)
-fate-vbn: $(FATE_VBN)
+FATE_SAMPLES_FFMPEG += $(FATE_VBN-yes)
+fate-vbn: $(FATE_VBN-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 06/13] fate/vbn, tests/fate-run: Delete intermediate VBN-files after tests

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate-run.sh  | 22 ++++++++++++++++++----
 tests/fate/vbn.mak | 24 ++----------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index a96ff049b0..3c62246c8a 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -393,16 +393,30 @@ cmp_metadata(){
 }
 
 refcmp_metadata_files(){
-    refcmp=$1
-    pixfmt=$2
-    file1=$3
-    file2=$4
+    file1=$1
+    file2=$2
+    refcmp=$3
+    pixfmt=$4
     fuzz=${5:-0.001}
     ffmpeg -auto_conversion_filters $FLAGS -i $file1 $FLAGS -i $file2 $ENC_OPTS \
         -lavfi "[0:v]format=${pixfmt}[v0];[1:v]format=${pixfmt}[v1];[v0][v1]${refcmp},metadata=print:file=-" \
         -f null /dev/null | awk -v ref=${ref} -v fuzz=${fuzz} -f ${base}/refcmp-metadata.awk -
 }
 
+refcmp_metadata_transcode(){
+    srcfile=$1
+    enc_opt=$2
+    enc_fmt=$3
+    enc_ext=$4
+    shift 4
+    encfile="${outdir}/${test}.${enc_ext}"
+    cleanfiles="$cleanfiles $encfile"
+    tsrcfile=$(target_path $srcfile)
+    tencfile=$(target_path $encfile)
+    ffmpeg $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS -y -f $enc_fmt $tencfile || return
+    refcmp_metadata_files $tencfile $tsrcfile "$@"
+}
+
 pixfmt_conversion(){
     conversion="${test#pixfmt-}"
     outdir="tests/data/pixfmt"
diff --git a/tests/fate/vbn.mak b/tests/fate/vbn.mak
index 6c3fe82c99..91ce3c9639 100644
--- a/tests/fate/vbn.mak
+++ b/tests/fate/vbn.mak
@@ -2,34 +2,14 @@ fate-vbn-%: VBN_FILE = tests/data/$(subst fate-vbn-,,$(@)).vbn
 fate-vbn-%: PIX_FMT = rgba
 fate-vbn-raw-rgb24: PIX_FMT = rgb24
 fate-vbn-%: SRC = $(TARGET_SAMPLES)/png1/lena-$(PIX_FMT).png
-fate-vbn-%: CMD = refcmp_metadata_files psnr $(PIX_FMT) $(VBN_FILE) $(SRC)
-
-fate-vbn-dxt1: tests/data/dxt1.vbn
-fate-vbn-dxt5: tests/data/dxt5.vbn
-fate-vbn-raw-rgba: tests/data/raw-rgba.vbn
-fate-vbn-raw-rgb24: tests/data/raw-rgb24.vbn
+fate-vbn-%: ENC_OPTS = -c:v vbn -format $(word 3,$(subst -, ,$(@)))
+fate-vbn-%: CMD = refcmp_metadata_transcode "$(SRC)" "$(ENC_OPTS)" image2 vbn psnr $(PIX_FMT)
 
 FATE_VBN += fate-vbn-dxt1
 FATE_VBN += fate-vbn-dxt5
 FATE_VBN += fate-vbn-raw-rgba
 FATE_VBN += fate-vbn-raw-rgb24
 
-tests/data/dxt1.vbn: TAG = GEN
-tests/data/dxt1.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
-	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format dxt1 $(TARGET_PATH)/$@ -y 2>/dev/null
-
-tests/data/dxt5.vbn: TAG = GEN
-tests/data/dxt5.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
-	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format dxt5 $(TARGET_PATH)/$@ -y 2>/dev/null
-
-tests/data/raw-rgba.vbn: TAG = GEN
-tests/data/raw-rgba.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
-	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgba.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null
-
-tests/data/raw-rgb24.vbn: TAG = GEN
-tests/data/raw-rgb24.vbn: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
-	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin -i $(TARGET_SAMPLES)/png1/lena-rgb24.png -nostdin -c:v vbn -format raw $(TARGET_PATH)/$@ -y 2>/dev/null
-
 FATE_VBN-$(call ENCDEC2, VBN, WRAPPED_AVFRAME PNG, IMAGE2,        \
                          PSNR_FILTER METADATA_FILTER SCALE_FILTER \
                          NULL_MUXER PIPE_PROTOCOL) += $(FATE_VBN)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 07/13] fate/vpx: Remove unnecessary eval

[Andreas Rheinhardt]

Possible since ca96e337169093979d7c763064ad9dae12b3108c
and ef8c93e2f18c624d0c266687e43ab99af7921dd3.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/vpx.mak | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 990d4e5adb..a59971b092 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -85,26 +85,22 @@ fate-vp7: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp7/potter-40.vp7
 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
 
 define FATE_VP8_SUITE
-FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector$(2)-$(1)
-fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
-fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1)
+FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector-$(1)
+fate-vp8-test-vector-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
+fate-vp8-test-vector-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1)
 endef
 
-define FATE_VP8_FULL
-$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
+$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N))))
 
 # FIXME this file contains two frames with identical timestamps,
 # so ffmpeg drops one of them
-FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias$(1)
-fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf
-fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
+FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias
+fate-vp8-sign-bias: CMD = framemd5 -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf
+fate-vp8-sign-bias: REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
 
-FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change$(1)
-fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear
-fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
-endef
-
-$(eval $(call FATE_VP8_FULL))
+FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change
+fate-vp8-size-change: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear
+fate-vp8-size-change: REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
 
 FATE_SAMPLES_AVCONV += $(FATE_VP8-yes)
 fate-vp8: $(FATE_VP8-yes)
@@ -131,7 +127,6 @@ VP9_SIZE_B = 196 198 200 202 208 210 224 226
 VP9_CHROMA_SUBSAMPLE = 422 440 444
 VP9_HIGH_BITDEPTH = 10 12
 
-define FATE_VP9_FULL
 $(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q))))
 $(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP))))
 $(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H))))))
@@ -153,9 +148,7 @@ $(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo))
 $(eval $(call FATE_VP9_SUITE,tiling-pedestrian))
 $(eval $(call FATE_VP9_SUITE,trac3849))
 $(eval $(call FATE_VP9_SUITE,trac4359))
-endef
 
-$(eval $(call FATE_VP9_FULL))
 FATE_VP9-$(CONFIG_IVF_DEMUXER) += fate-vp9-05-resize
 fate-vp9-05-resize: CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf -s 352x288 -sws_flags bitexact+bilinear
 fate-vp9-05-resize: REF = $(SRC_PATH)/tests/ref/fate/vp9-05-resize
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 08/13] tests/Makefile: Add FRAMEMD5 auxiliary function

[Andreas Rheinhardt]

Similar to FRAMECRC for framecrc tests.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/Makefile b/tests/Makefile
index 6e8fc5906e..b4252a991b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -88,6 +88,10 @@ REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \
 
 DEMDEC  = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL)
 ENCMUX  = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER   $(3))
+
+FRAMEMD5 = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3)                  \
+                          PCM_S16LE_ENCODER RAWVIDEO_ENCODER FRAMEMD5_MUXER   \
+                          PIPE_PROTOCOL FILE_PROTOCOL)
 FRAMECRC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3)                  \
                           PCM_S16LE_ENCODER RAWVIDEO_ENCODER FRAMECRC_MUXER   \
                           PIPE_PROTOCOL FILE_PROTOCOL)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 09/13] fate/vpx: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/Makefile     |  2 +-
 tests/fate/vpx.mak | 68 ++++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index b4252a991b..5de9ad4c9f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -245,7 +245,7 @@ $(FATE_FFMPEG) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMP
 $(FATE_FFPROBE) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FFMPEG_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF)
 
 $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF)
-$(FATE_SAMPLES_DUMP_DATA): tools/venc_data_dump$(EXESUF)
+$(FATE_SAMPLES_DUMP_DATA) $(FATE_SAMPLES_DUMP_DATA-yes): tools/venc_data_dump$(EXESUF)
 $(FATE_SAMPLES_SCALE_SLICE): tools/scale_slice_test$(EXESUF)
 
 ifdef SAMPLES
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index a59971b092..dc8e9e04b7 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -4,10 +4,10 @@ fate-truemotion1-15: CMD = framecrc -i $(TARGET_SAMPLES)/duck/phant2-940.duk -pi
 FATE_TRUEMOTION1 += fate-truemotion1-24
 fate-truemotion1-24: CMD = framecrc -i $(TARGET_SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an -vf scale
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1)
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION1, SCALE_FILTER) += $(FATE_TRUEMOTION1)
 fate-truemotion1: $(FATE_TRUEMOTION1)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION2) += fate-truemotion2
 fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi
 
 FATE_TRUEMOTION2RT += fate-truemotion2rt-low
@@ -19,73 +19,75 @@ fate-truemotion2rt-mid: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tr20_mid.avi -a
 FATE_TRUEMOTION2RT += fate-truemotion2rt-high
 fate-truemotion2rt-high: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tr20_high.avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TRUEMOTION2RT) += $(FATE_TRUEMOTION2RT)
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, TRUEMOTION2RT) += $(FATE_TRUEMOTION2RT)
 fate-truemotion2rt: $(FATE_TRUEMOTION2RT)
 
-FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64
+FATE_VP3-$(call FRAMECRC, MATROSKA, THEORA) += fate-theora-coeff-level64
 fate-theora-coeff-level64: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/coeff_level64.mkv
 
-FATE_VP3-$(call DEMDEC, OGG, THEORA) += fate-theora-offset
+FATE_VP3-$(call FRAMECRC, OGG, THEORA) += fate-theora-offset
 fate-theora-offset: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/offset_test.ogv
 
-FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31
+FATE_VP3-$(call FRAMECRC, AVI, VP3) += fate-vp31
 fate-vp31: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/vp31.avi
 
 FATE_SAMPLES_AVCONV += $(FATE_VP3-yes)
 fate-vp3: $(FATE_VP3-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP4) += fate-vp4
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP4) += fate-vp4
 fate-vp4: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp4/KTkvw8dg1J8.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP5) += fate-vp5
 fate-vp5: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi -an
 
-FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp60
+FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp60
 fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6
 
-FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61
+FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp61
 fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 
-FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a
+FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a
 fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov
 
-FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a-skip_alpha
+FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a-skip_alpha
 fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov
 
-FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f
+FATE_VP6-$(call FRAMECRC, FLV, VP6F) += fate-vp6f
 fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv
 
-FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest
 fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" -
 
-FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-video-streams
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams
 fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
 
-FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-audio-streams
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams
 fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
 
-FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-representations
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations
 fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
 
-FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live
 fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -
 
-FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live-bandwidth
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth
 fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -
 
-FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451
+FATE_VP8-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST)
+
+FATE_VP8-$(call FRAMECRC, MATROSKA, VP8) += fate-vp8-2451
 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an
 
 FATE_SAMPLES_AVCONV += $(FATE_VP6-yes)
 fate-vp6: $(FATE_VP6-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP7) += fate-vp7
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, AVI, VP7) += fate-vp7
 fate-vp7: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -an
 
 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
 
 define FATE_VP8_SUITE
-FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector-$(1)
+FATE_VP8-$(call FRAMEMD5, IVF, VP8) += fate-vp8-test-vector-$(1)
 fate-vp8-test-vector-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
 fate-vp8-test-vector-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1)
 endef
@@ -94,11 +96,11 @@ $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N))))
 
 # FIXME this file contains two frames with identical timestamps,
 # so ffmpeg drops one of them
-FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias
+FATE_VP8-$(call FRAMEMD5, IVF, VP8) += fate-vp8-sign-bias
 fate-vp8-sign-bias: CMD = framemd5 -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf
 fate-vp8-sign-bias: REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
 
-FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change
+FATE_VP8-$(call FRAMEMD5, MATROSKA, VP8, SCALE_FILTER) += fate-vp8-size-change
 fate-vp8-size-change: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear
 fate-vp8-size-change: REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
 
@@ -106,13 +108,13 @@ FATE_SAMPLES_AVCONV += $(FATE_VP8-yes)
 fate-vp8: $(FATE_VP8-yes)
 
 define FATE_VP9_SUITE
-FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9$(2)-$(1)
+FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9) += fate-vp9$(2)-$(1)
 fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm
 fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1)
 endef
 
 define FATE_VP9_PROFILE_SUITE
-FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9p$(2)-$(1)
+FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9, $(4)) += fate-vp9p$(2)-$(1)
 fate-vp9p$(2)-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9$(2)-2-$(1).webm $(3)
 fate-vp9p$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9p$(2)-$(1)
 endef
@@ -132,9 +134,9 @@ $(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP))
 $(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H))))))
 $(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H))))))
 $(eval $(call FATE_VP9_SUITE,03-deltaq))
-$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,)))
-$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le -vf scale)))
-$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le -vf scale)))))
+$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,,)))
+$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le -vf scale, SCALE_FILTER)))
+$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le -vf scale, SCALE_FILTER)))))
 $(eval $(call FATE_VP9_SUITE,06-bilinear))
 $(eval $(call FATE_VP9_SUITE,09-lf_deltas))
 $(eval $(call FATE_VP9_SUITE,10-show-existing-frame))
@@ -149,14 +151,14 @@ $(eval $(call FATE_VP9_SUITE,tiling-pedestrian))
 $(eval $(call FATE_VP9_SUITE,trac3849))
 $(eval $(call FATE_VP9_SUITE,trac4359))
 
-FATE_VP9-$(CONFIG_IVF_DEMUXER) += fate-vp9-05-resize
+FATE_VP9-$(FRAMEMD5, IVF, VP9, SCALE_FILTER) += fate-vp9-05-resize
 fate-vp9-05-resize: CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf -s 352x288 -sws_flags bitexact+bilinear
 fate-vp9-05-resize: REF = $(SRC_PATH)/tests/ref/fate/vp9-05-resize
 
 fate-vp9-encparams: CMD = venc_data $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-segmentation-aq-akiyo.webm 0 5
-FATE_SAMPLES_DUMP_DATA += fate-vp9-encparams
+FATE_SAMPLES_DUMP_DATA-$(call DEMDEC, MATROSKA, VP9) += fate-vp9-encparams
 
-FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9-encparams
+FATE_VP9-$(call DEMDEC, MATROSKA, VP9) += fate-vp9-encparams
 
-FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_VP9-yes)
 fate-vp9: $(FATE_VP9-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 10/13] fate/vpx: Move webm-dash-manifest tests to a new file

[Andreas Rheinhardt]

These tests have basically nothing to do with VPX (they do not even
require the decoder).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/Makefile                    |  1 +
 tests/fate/vpx.mak                | 20 --------------------
 tests/fate/webm-dash-manifest.mak | 21 +++++++++++++++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 tests/fate/webm-dash-manifest.mak

diff --git a/tests/Makefile b/tests/Makefile
index 5de9ad4c9f..ea5e939cf5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -219,6 +219,7 @@ include $(SRC_PATH)/tests/fate/vorbis.mak
 include $(SRC_PATH)/tests/fate/vpx.mak
 include $(SRC_PATH)/tests/fate/vqf.mak
 include $(SRC_PATH)/tests/fate/wavpack.mak
+include $(SRC_PATH)/tests/fate/webm-dash-manifest.mak
 include $(SRC_PATH)/tests/fate/wma.mak
 include $(SRC_PATH)/tests/fate/xvid.mak
 
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index dc8e9e04b7..a5c7ab0365 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -55,26 +55,6 @@ fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_
 FATE_VP6-$(call FRAMECRC, FLV, VP6F) += fate-vp6f
 fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv
 
-FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest
-fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" -
-
-FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams
-fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
-
-FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams
-fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
-
-FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations
-fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
-
-FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live
-fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -
-
-FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth
-fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -
-
-FATE_VP8-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST)
-
 FATE_VP8-$(call FRAMECRC, MATROSKA, VP8) += fate-vp8-2451
 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an
 
diff --git a/tests/fate/webm-dash-manifest.mak b/tests/fate/webm-dash-manifest.mak
new file mode 100644
index 0000000000..0000664bb1
--- /dev/null
+++ b/tests/fate/webm-dash-manifest.mak
@@ -0,0 +1,21 @@
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest
+fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" -
+
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-video-streams
+fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-unaligned-audio-streams
+fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-representations
+fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live
+fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -
+
+FATE_WEBM_DASH_MANIFEST += fate-webm-dash-manifest-live-bandwidth
+fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -fflags +bitexact -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -
+
+FATE_WEBM_DASH_MANIFEST-$(call DEMMUX, WEBM_DASH_MANIFEST, WEBM_DASH_MANIFEST, PIPE_PROTOCOL) += $(FATE_WEBM_DASH_MANIFEST)
+fate-webm-dash-manifests: $(FATE_WEBM_DASH_MANIFEST-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_WEBM_DASH_MANIFEST-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 11/13] fate/prores: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/prores.mak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak
index f2c11259dd..9e05b33b9f 100644
--- a/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
@@ -6,9 +6,9 @@ FATE_PRORES = fate-prores-422                                           \
               fate-prores-alpha_skip                                    \
               fate-prores-transparency                                  \
               fate-prores-transparency_skip                             \
-              fate-prores-gray                                          \
+              $(if $(CONFIG_ARESAMPLE_FILTER),fate-prores-gray)         \
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, PRORES, SCALE_FILTER) += $(FATE_PRORES)
 fate-prores: $(FATE_PRORES)
 
 fate-prores-422:       CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le -vf scale
@@ -25,4 +25,4 @@ fate-prores-gray:      CMD = framecrc -flags +bitexact -c:a aac_fixed -i $(TARGE
 FATE_PRORES_METADATA_BSF += fate-prores-metadata
 fate-prores-metadata: CMD = md5 -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -c:v copy -bsf:v prores_metadata=color_primaries=bt470bg:color_trc=bt709:colorspace=smpte170m -bitexact -f mov
 
-FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER PRORES_METADATA_BSF) += $(FATE_PRORES_METADATA_BSF)
+FATE_SAMPLES_FFMPEG-$(call DEMMUX, MOV, MOV, PRORES_METADATA_BSF) += $(FATE_PRORES_METADATA_BSF)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 12/13] fate/gif: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/gif.mak | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak
index a5147c0e38..bf604464aa 100644
--- a/tests/fate/gif.mak
+++ b/tests/fate/gif.mak
@@ -13,18 +13,17 @@ fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_
 FATE_GIF += fate-gif-deal
 fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_fmt bgra -auto_conversion_filters
 
+FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF)
+
 fate-gifenc%: fate-gif-color
 fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@)))
 fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif
 fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT) -sws_flags +accurate_rnd+bitexact -vf scale
 
 FATE_GIF_ENC_PIXFMT = rgb8 bgr8 rgb4_byte bgr4_byte gray pal8
-FATE_GIF_ENC-$(call ENCDEC, GIF, GIF) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%)
+FATE_GIF_ENC-$(call ENCDEC, GIF, FRAMECRC GIF, SCALE_FILTER PIPE_PROTOCOL) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%)
 
-FATE_GIF += $(FATE_GIF_ENC-yes)
 fate-gifenc: $(FATE_GIF_ENC-yes)
 
-FATE_GIF-$(call DEMDEC, GIF, GIF) += $(FATE_GIF)
-
-FATE_SAMPLES_AVCONV += $(FATE_GIF-yes)
-fate-gif: $(FATE_GIF-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_GIF-yes) $(FATE_GIF_ENC-yes)
+fate-gif: $(FATE_GIF-yes) $(FATE_GIF_ENC-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 13/13] fate/gif: Remove nonsense requirement

[Andreas Rheinhardt]

It seems as if it was intended to declare fate-gif-color as prerequisite
of the fate-gifenc% tests. Yet the latter do not need anything from
the former, so this would be unnecessary. Furthermore, given that this
line has no associated recipe, it actually cancels implicit rules for
fate-gifenc% instead of adding a prerequisite.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/gif.mak | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak
index bf604464aa..1eef2a1026 100644
--- a/tests/fate/gif.mak
+++ b/tests/fate/gif.mak
@@ -15,7 +15,6 @@ fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_
 
 FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF)
 
-fate-gifenc%: fate-gif-color
 fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@)))
 fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif
 fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT) -sws_flags +accurate_rnd+bitexact -vf scale
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 14/19] tests/Makefile: Remove unset FATE_TESTS

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index ea5e939cf5..ca228ae897 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -274,10 +274,10 @@ fate:: $(FATE)
 fate-hw: $(FATE_HW-yes)
 FATE += $(FATE_HW-yes)
 
-$(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF)
-$(FATE) $(FATE_TESTS-no): export EXECSUF = $(EXESUF)
-$(FATE) $(FATE_TESTS-no): export HOSTEXECSUF = $(HOSTEXESUF)
-$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS)
+$(FATE): export PROGSUF = $(PROGSSUF)
+$(FATE): export EXECSUF = $(EXESUF)
+$(FATE): export HOSTEXECSUF = $(HOSTEXESUF)
+$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS)
 	@echo "TEST    $(@:fate-%=%)"
 	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)'
 
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 15/19] fate/hevc: Fix test requirements

[Andreas Rheinhardt]

Also replace define/foreach with pattern-specific variable values.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/hevc.mak | 102 +++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 68 deletions(-)

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 3adee59e54..2f16e3a29f 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -1,4 +1,4 @@
-HEVC_SAMPLES =                  \
+HEVC_SAMPLES_8BIT =             \
     AMP_A_Samsung_4             \
     AMP_A_Samsung_6             \
     AMP_B_Samsung_4             \
@@ -158,23 +158,27 @@ HEVC_SAMPLES_422_10BIT =        \
     ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1 \
     IPCM_A_RExt_NEC             \
 
-HEVC_SAMPLES_422_10BIN =        \
-    Main_422_10_A_RExt_Sony_1   \
-
 HEVC_SAMPLES_422_10BIN_LARGE =  \
     Main_422_10_B_RExt_Sony_1   \
 
+HEVC_SAMPLES_422_10BIN =        \
+    Main_422_10_A_RExt_Sony_1   \
+    $(if $(CONFIG_LARGE_TESTS), $(HEVC_SAMPLES_422_10BIN_LARGE))
+
 HEVC_SAMPLES_444_8BIT =         \
     QMATRIX_A_RExt_Sony_1       \
 
+HEVC_SAMPLES_444_12BIT_LARGE =  \
+    SAO_A_RExt_MediaTek_1       \
+
 HEVC_SAMPLES_444_12BIT =        \
     IPCM_B_RExt_NEC             \
     PERSIST_RPARAM_A_RExt_Sony_1\
     PERSIST_RPARAM_A_RExt_Sony_3\
+    $(if $(CONFIG_LARGE_TESTS), $(HEVC_SAMPLES_444_12BIT_LARGE))
 
-HEVC_SAMPLES_444_12BIT_LARGE =  \
-    SAO_A_RExt_MediaTek_1       \
-
+FATE_HEVC_VARS := 8BIT 10BIT 422_10BIT 422_10BIN 444_8BIT 444_12BIT
+$(foreach VAR,$(FATE_HEVC_VARS), $(eval HEVC_TESTS_$(VAR) := $(addprefix fate-hevc-conformance-, $(HEVC_SAMPLES_$(VAR)))))
 
 # equivalent bitstreams
 # AMP_D_Hisilicon_3 -- AMP_D_Hisilicon
@@ -190,103 +194,65 @@ HEVC_SAMPLES_444_12BIT_LARGE =  \
 # PERSIST_RPARAM_A_RExt_Sony_1 (rext)
 
 
-define FATE_HEVC_TEST
-FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p
-endef
-
-define FATE_HEVC_TEST_10BIT
-FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le -vf scale
-endef
-
-define FATE_HEVC_TEST_422_10BIT
-FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv422p10le -vf scale
-endef
-
-define FATE_HEVC_TEST_422_10BIN
-FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le -vf scale
-endef
-
-define FATE_HEVC_TEST_422_10BIN_LARGE
-FATE_HEVC_LARGE += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le -vf scale
-endef
+$(HEVC_TESTS_8BIT): SCALE_OPTS := -pix_fmt yuv420p
+$(HEVC_TESTS_444_8BIT): SCALE_OPTS := -pix_fmt yuv444p
+$(HEVC_TESTS_10BIT): SCALE_OPTS := -pix_fmt yuv420p10le -vf scale
+$(HEVC_TESTS_422_10BIT) $(HEVC_TESTS_422_10BIN): SCALE_OPTS := -pix_fmt yuv422p10le -vf scale
+$(HEVC_TESTS_444_12BIT): SCALE_OPTS := -pix_fmt yuv444p12le -vf scale
+fate-hevc-conformance-%: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(subst fate-hevc-conformance-,,$(@)).bit $(SCALE_OPTS)
+$(HEVC_TESTS_422_10BIN): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(subst fate-hevc-conformance-,,$(@)).bin $(SCALE_OPTS)
 
-define FATE_HEVC_TEST_444_8BIT
-FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p
-endef
-
-define FATE_HEVC_TEST_444_12BIT
-FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le -vf scale
-endef
-
-define FATE_HEVC_TEST_444_12BIT_LARGE
-FATE_HEVC_LARGE += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le -vf scale
-endef
-
-$(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))
-$(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N))))
-$(foreach N,$(HEVC_SAMPLES_422_10BIT),$(eval $(call FATE_HEVC_TEST_422_10BIT,$(N))))
-$(foreach N,$(HEVC_SAMPLES_422_10BIN),$(eval $(call FATE_HEVC_TEST_422_10BIN,$(N))))
-$(foreach N,$(HEVC_SAMPLES_422_10BIN_LARGE),$(eval $(call FATE_HEVC_TEST_422_10BIN_LARGE,$(N))))
-$(foreach N,$(HEVC_SAMPLES_444_8BIT),$(eval $(call FATE_HEVC_TEST_444_8BIT,$(N))))
-$(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N))))
-$(foreach N,$(HEVC_SAMPLES_444_12BIT_LARGE),$(eval $(call FATE_HEVC_TEST_444_12BIT_LARGE,$(N))))
+FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER) += $(HEVC_TESTS_8BIT) $(HEVC_TESTS_444_8BIT)
+FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER) +=         \
+                                                    $(HEVC_TESTS_10BIT)     \
+                                                    $(HEVC_TESTS_422_10BIT) \
+                                                    $(HEVC_TESTS_422_10BIN) \
+                                                    $(HEVC_TESTS_444_12BIT) \
 
 fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync passthrough -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact
-FATE_HEVC_LARGE += fate-hevc-paramchange-yuv420p-yuv420p10
+FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER LARGE_TESTS) += fate-hevc-paramchange-yuv420p-yuv420p10
 
 tests/data/hevc-mp4.mov: TAG = GEN
 tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
 	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \
 	-i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c copy -flags +bitexact $(TARGET_PATH)/$@ -y 2>/dev/null
 
-FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb
+FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_PARSER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb
 fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov
 fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -c:v copy -fflags +bitexact -f hevc
 fate-hevc-bsf-mp4toannexb: CMP = oneline
 fate-hevc-bsf-mp4toannexb: REF = 1873662a3af1848c37e4eb25722c8df9
 
 fate-hevc-skiploopfilter: CMD = framemd5 -skip_loop_filter nokey -i $(TARGET_SAMPLES)/hevc-conformance/SAO_D_Samsung_5.bit -sws_flags bitexact
-FATE_HEVC += fate-hevc-skiploopfilter
-
-FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
-FATE_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_DECODER LARGE_TESTS) += $(FATE_HEVC_LARGE)
+FATE_HEVC-$(call FRAMEMD5, HEVC, HEVC, HEVC_PARSER) += fate-hevc-skiploopfilter
 
 # this sample has two stsd entries and needs to reload extradata
-FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload
-
+FATE_HEVC-$(call FRAMEMD5, MOV, HEVC, SCALE_FILTER) += fate-hevc-extradata-reload
 fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov -sws_flags bitexact
 
 fate-hevc-paired-fields: CMD = probeframes -show_entries frame=interlaced_frame,top_field_first $(TARGET_SAMPLES)/hevc/paired_fields.hevc
 FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-paired-fields
 
 fate-hevc-monochrome-crop: CMD = probeframes -show_entries frame=width,height:stream=width,height $(TARGET_SAMPLES)/hevc/hevc-monochrome.hevc
-FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-monochrome-crop
+FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC) += fate-hevc-monochrome-crop
 
 fate-hevc-hdr10-plus-metadata: CMD = probeframes -show_entries frame=side_data_list $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc
 FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-hdr10-plus-metadata
 
 fate-hevc-hdr-vivid-metadata: CMD = probeframes -show_entries frame=side_data_list $(TARGET_SAMPLES)/hevc/hdr_vivid_h265_sample.hevc
-FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-hdr-vivid-metadata
+FATE_HEVC_FFPROBE-$(call PARSERDEMDEC, HEVC, HEVC, HEVC) += fate-hevc-hdr-vivid-metadata
 
 fate-hevc-dv-rpu: CMD = probeframes -show_entries frame=side_data_list -select_streams 0 -read_intervals "%+\#2" $(TARGET_SAMPLES)/hevc/dv84.mov
-FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-dv-rpu
+FATE_HEVC_FFPROBE-$(call DEMDEC, MOV, HEVC) += fate-hevc-dv-rpu
 
 fate-hevc-two-first-slice: CMD = threads=2 framemd5 -i $(TARGET_SAMPLES)/hevc/two_first_slice.mp4 -sws_flags bitexact -t 00:02.00 -an
-FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-two-first-slice
+FATE_HEVC-$(call FRAMEMD5, MOV, HEVC) += fate-hevc-two-first-slice
 
 fate-hevc-cabac-tudepth: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc/cbf_cr_cb_TUDepth_4_circle.h265 -pix_fmt yuv444p
-FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += fate-hevc-cabac-tudepth
+FATE_HEVC-$(call FRAMECRC, HEVC, HEVC) += fate-hevc-cabac-tudepth
 
 fate-hevc-small422chroma: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc/food.hevc -pix_fmt yuv422p10le -vf scale
-FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += fate-hevc-small422chroma
+FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER) += fate-hevc-small422chroma
 
 FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes)
 FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 16/19] fate/lossless-video: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/lossless-video.mak | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak
index a81c6e9ab0..05a8ba29e1 100644
--- a/tests/fate/lossless-video.mak
+++ b/tests/fate/lossless-video.mak
@@ -1,7 +1,7 @@
 FATE_LAGARITH += fate-lagarith-rgb24
 fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi
 
-FATE_LAGARITH += fate-lagarith-rgb32
+FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH, SCALE_FILTER) += fate-lagarith-rgb32
 fate-lagarith-rgb32: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra -vf scale
 
 FATE_LAGARITH += fate-lagarith-yuy2
@@ -19,31 +19,31 @@ fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/laga
 fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync vfr
 fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync passthrough
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH)
-fate-lagarith: $(FATE_LAGARITH)
+FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH) += $(FATE_LAGARITH)
 
-FATE_LOCO += fate-loco-rgb
-fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi
+FATE_LOSSLESS_VIDEO += $(FATE_LAGARITH-yes)
+fate-lagarith: $(FATE_LAGARITH-yes)
 
-FATE_LOCO += fate-loco-yuy2
+FATE_LOCO-$(call FRAMECRC, AVI, LOCO) += fate-loco-rgb fate-loco-yuy2
+fate-loco-rgb:  CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi
 fate-loco-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-0.avi
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO)
-fate-loco: $(FATE_LOCO)
+FATE_LOSSLESS_VIDEO += $(FATE_LOCO-yes)
+fate-loco: $(FATE_LOCO-yes)
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit
+FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, MSRLE, SCALE_FILTER) += fate-msrle-8bit
 fate-msrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 -vf scale
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSZH) += fate-mszh
+FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, MSZH) += fate-mszh
 fate-mszh: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/mszh-1frame.avi
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble
+FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, VBLE) += fate-vble
 fate-vble: CMD = framecrc -i $(TARGET_SAMPLES)/vble/flowers-partial-2MB.avi
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec
+FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, ZEROCODEC) += fate-zerocodec
 fate-zerocodec: CMD = framecrc -i $(TARGET_SAMPLES)/zerocodec/sample-zeco.avi
 
-FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib
+FATE_LOSSLESS_VIDEO-$(call FRAMECRC, AVI, ZLIB) += fate-zlib
 fate-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/zlib-1frame.avi
 
 FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 17/19] fate/microsoft: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/microsoft.mak | 68 +++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 639757880c..ee1a062425 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -1,7 +1,7 @@
-FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
+FATE_MICROSOFT-$(call FRAMECRC, AVI, MSMPEG4V1) += fate-msmpeg4v1
 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1-pal
+FATE_MICROSOFT-$(call FRAMECRC, ASF, MSS1) += fate-mss1-pal
 fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an
 
 FATE_MSS2 += fate-mss2-pal
@@ -10,80 +10,76 @@ fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv
 FATE_MSS2 += fate-mss2-pals
 fate-mss2-pals: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepals.wmv
 
-FATE_MSS2 += fate-mss2-rgb555
-fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv -pix_fmt rgb555le -vf scale
-
-FATE_MSS2 += fate-mss2-rgb555s
+FATE_MSS2-$(call FRAMECRC, ASF, MSS2, SCALE_FILTER) += fate-mss2-rgb555 fate-mss2-rgb555s
+fate-mss2-rgb555:  CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv  -pix_fmt rgb555le -vf scale
 fate-mss2-rgb555s: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555s.wmv -pix_fmt rgb555le -vf scale
 
 FATE_MSS2 += fate-mss2-wmv
 fate-mss2-wmv: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/msscreencodec.wmv -an -frames 100
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS2) += $(FATE_MSS2)
-fate-mss2: $(FATE_MSS2)
+FATE_MSS2-$(call FRAMECRC, ASF, MSS2) += $(FATE_MSS2)
 
-FATE_MTS2 += fate-mts2-xesc
-fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p
+FATE_MICROSOFT += $(FATE_MSS2-yes)
+fate-mss2: $(FATE_MSS2-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += $(FATE_MTS2)
-fate-mts2: $(FATE_MTS2)
+FATE_MTS2-$(call FRAMECRC, ASF, MTS2) += fate-mts2-xesc
+fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p
 
-FATE_MSVIDEO1 += fate-msvideo1-8bit
-fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -vf scale
+FATE_MICROSOFT += $(FATE_MTS2-yes)
+fate-mts2: $(FATE_MTS2-yes)
 
-FATE_MSVIDEO1 += fate-msvideo1-16bit
+FATE_MSVIDEO1-$(call FRAMECRC, AVI, MSVIDEO1, SCALE_FILTER) += fate-msvideo1-8bit fate-msvideo1-16bit
+fate-msvideo1-8bit:  CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -vf scale
 fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 -vf scale
 
-FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1)
-fate-msvideo1: $(FATE_MSVIDEO1)
+FATE_MICROSOFT += $(FATE_MSVIDEO1-yes)
+fate-msvideo1: $(FATE_MSVIDEO1-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += fate-mts2
+FATE_MICROSOFT-$(call FRAMECRC, ASF, MTS2) += fate-mts2
 fate-mts2: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/ScreenCapture.xesc
 
-FATE_WMV3_DRM += fate-wmv3-drm-dec
+FATE_WMV3_DRM-$(call FRAMECRC, ASF, WMV3) += fate-wmv3-drm-dec fate-wmv3-drm-nodec
 # discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
-
-FATE_WMV3_DRM += fate-wmv3-drm-nodec
+fate-wmv3-drm-dec:   CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
 fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c:a copy -c:v copy
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV3_DRM)
-fate-wmv3-drm: $(FATE_WMV3_DRM)
+FATE_MICROSOFT += $(FATE_WMV3_DRM-yes)
+fate-wmv3-drm: $(FATE_WMV3_DRM-yes)
 
 FATE_MICROSOFT-$(call DEMDEC, ASF, WMV2) += fate-wmv8-x8intra
 fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
 
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040
+FATE_VC1 += fate-vc1_sa00040
 fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1
 
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050
+FATE_VC1 += fate-vc1_sa00050
 fate-vc1_sa00050: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00050.vc1
 
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091
+FATE_VC1 += fate-vc1_sa10091
 fate-vc1_sa10091: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10091.vc1
 
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143
+FATE_VC1 += fate-vc1_sa10143
 fate-vc1_sa10143: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10143.vc1
 
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021
+FATE_VC1 += fate-vc1_sa20021
 fate-vc1_sa20021: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA20021.vc1
 
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_ilaced_twomv
+FATE_VC1 += fate-vc1_ilaced_twomv
 fate-vc1_ilaced_twomv: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vc1/ilaced_twomv.vc1
 
-FATE_VC1-$(CONFIG_VC1T_DEMUXER) += fate-vc1test_smm0005
-fate-vc1test_smm0005: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0005.rcv
+FATE_VC1-$(call FRAMECRC, VC1, VC1, VC1_PARSER EXTRACT_EXTRADATA_BSF) += $(FATE_VC1)
 
-FATE_VC1-$(CONFIG_VC1T_DEMUXER) += fate-vc1test_smm0015
+FATE_VC1-$(call FRAMECRC, VC1T, WMV3) += fate-vc1test_smm0005 fate-vc1test_smm0015
+fate-vc1test_smm0005: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0005.rcv
 fate-vc1test_smm0015: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0015.rcv
 
-FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism
+FATE_VC1-$(call FRAMECRC, MOV, VC1) += fate-vc1-ism
 fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an
 
-FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
+FATE_MICROSOFT += $(FATE_VC1-yes)
 fate-vc1: $(FATE_VC1-yes)
 
-FATE_MICROSOFT-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata
+FATE_MICROSOFT-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL ASF_DEMUXER FRAMECRC_MUXER) += fate-asf-repldata
 fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf -c copy
 
 FATE_MICROSOFT += $(FATE_MICROSOFT-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 18/19] fate/mpeg4: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/mpeg4.mak | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/fate/mpeg4.mak b/tests/fate/mpeg4.mak
index 05c26b9be5..4cec21c547 100644
--- a/tests/fate/mpeg4.mak
+++ b/tests/fate/mpeg4.mak
@@ -3,21 +3,23 @@ MPEG4_RESOLUTION_CHANGE = down-down down-up up-down up-up
 
 fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/resize_$(@:fate-mpeg4-resolution-change-%=%).h263 -sws_flags +bitexact
 
-FATE_MPEG4-$(call DEMDEC, H263, H263) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE))
+FATE_MPEG4-$(call FRAMEMD5, M4V, MPEG4, SCALE_FILTER) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE))
 
 fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi
-FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_UNPACK_BFRAMES_BSF AVI_MUXER) += fate-mpeg4-bsf-unpack-bframes
+FATE_MPEG4-$(call DEMMUX, AVI, AVI, MPEG4_UNPACK_BFRAMES_BSF) += fate-mpeg4-bsf-unpack-bframes
 
 fate-mpeg4-packed: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -vsync cfr
-FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_DECODER) += fate-mpeg4-packed
+FATE_MPEG4-$(call FRAMECRC, AVI, MPEG4) += fate-mpeg4-packed
 
 FATE_MPEG4-$(call ALLYES, FILE_PROTOCOL M4V_DEMUXER MPEG4_DECODER SCALE_FILTER \
                           RAWVIDEO_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) \
                           += fate-mpeg4-simple-studio-profile
 fate-mpeg4-simple-studio-profile: CMD = framecrc -bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/mpeg4_sstp_dpcm.m4v -sws_flags +accurate_rnd+bitexact -pix_fmt yuv422p10le -vf scale
 
-FATE_MPEG4-$(call DEMDEC, M4V, MPEG4) += fate-m4v  fate-m4v-cfr
+FATE_MPEG4-$(call FRAMECRC, M4V, MPEG4) += fate-m4v
 fate-m4v:     CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v
+
+FATE_MPEG4-$(call FRAMECRC, M4V, MPEG4, FPS_FILTER) += fate-m4v-cfr
 fate-m4v-cfr: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v -vf fps=5
 
 FATE_SAMPLES_AVCONV += $(FATE_MPEG4-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 19/19] fate/pixlet: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/pixlet.mak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/fate/pixlet.mak b/tests/fate/pixlet.mak
index 7c4604cc08..524a8797c0 100644
--- a/tests/fate/pixlet.mak
+++ b/tests/fate/pixlet.mak
@@ -1,5 +1,5 @@
-FATE_PIXLET += fate-pixlet-rgb
+FATE_PIXLET-$(call FRAMECRC, MOV, PIXLET, SCALE_FILTER) += fate-pixlet-rgb
 fate-pixlet-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/pixlet/pixlet_rgb.mov -an -pix_fmt yuv420p16le -vf scale
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PIXLET) += $(FATE_PIXLET)
-fate-pixlet: $(FATE_PIXLET)
+FATE_SAMPLES_FFMPEG += $(FATE_PIXLET-yes)
+fate-pixlet: $(FATE_PIXLET-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 20/24] fate/qtrle: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/qtrle.mak | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak
index 3dd0afbd3f..3adefd2009 100644
--- a/tests/fate/qtrle.mak
+++ b/tests/fate/qtrle.mak
@@ -1,23 +1,26 @@
 FATE_QTRLE += fate-qtrle-1bit
 fate-qtrle-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-Monochrome.mov -an
 
-FATE_QTRLE += fate-qtrle-2bit
+FATE_QTRLE_SCALE += fate-qtrle-2bit
 fate-qtrle-2bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an -vf scale
 
-FATE_QTRLE += fate-qtrle-4bit
+FATE_QTRLE_SCALE += fate-qtrle-4bit
 fate-qtrle-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an -vf scale
 
-FATE_QTRLE += fate-qtrle-8bit
+FATE_QTRLE_SCALE += fate-qtrle-8bit
 fate-qtrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an -vf scale
 
-FATE_QTRLE += fate-qtrle-16bit
+FATE_QTRLE_SCALE += fate-qtrle-16bit
 fate-qtrle-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24 -vf scale
 
 FATE_QTRLE += fate-qtrle-24bit
 fate-qtrle-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov
 
-FATE_QTRLE += fate-qtrle-32bit
+FATE_QTRLE_SCALE += fate-qtrle-32bit
 fate-qtrle-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt bgra -vf scale
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE)
-fate-qtrle: $(FATE_QTRLE)
+FATE_QTRLE-$(call FRAMECRC, MOV, QTRLE) += $(FATE_QTRLE)
+FATE_QTRLE-$(call FRAMECRC, MOV, QTRLE, SCALE_FILTER) += $(FATE_QTRLE_SCALE)
+
+FATE_SAMPLES_FFMPEG += $(FATE_QTRLE-yes)
+fate-qtrle: $(FATE_QTRLE-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 21/24] tests/ref: Remove unused reference files

[Andreas Rheinhardt]

Accidentally resurrected in fc49f22c3b735db5aaac5f98e40b7124a2be13b8
and 7711f19eda40a7fd1c8a327f1700ffdd115e1667,
forgotten in 6ebc71847e21a8abaf7ff3d902cb1cf63511e7b4 and
1a6a088f7c7b164042ad16d43d05543ce1bacfa4 or never needed
(filter-aemphasis).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/ref/acodec/adpcm_ima_qt            |    4 -
 tests/ref/fate/acodec-aref               |    4 -
 tests/ref/fate/filter-aemphasis          |  526 ------------
 tests/ref/fate/g729-0                    | 1000 ----------------------
 tests/ref/fate/g729-1                    | 1000 ----------------------
 tests/ref/fate/hapenc-hap-none           |   14 -
 tests/ref/fate/hapenc-hapa-none          |   14 -
 tests/ref/fate/hapenc-hapq-none          |   14 -
 tests/ref/fate/smjpeg                    |  425 ---------
 tests/ref/vsynth/vsynth1-dnxhd_1080i     |    4 -
 tests/ref/vsynth/vsynth1-dv_411          |    4 -
 tests/ref/vsynth/vsynth1-zmbv            |    4 -
 tests/ref/vsynth/vsynth_lena-dnxhd_1080i |    4 -
 tests/ref/vsynth/vsynth_lena-dv_411      |    4 -
 tests/ref/vsynth/vsynth_lena-zmbv        |    4 -
 tests/ref/vsynth1/cljr                   |    4 -
 tests/ref/vsynth1/yuv                    |    4 -
 tests/ref/vsynth_lena/cljr               |    4 -
 tests/ref/vsynth_lena/huffyuv            |    4 -
 tests/ref/vsynth_lena/yuv                |    4 -
 20 files changed, 3045 deletions(-)
 delete mode 100644 tests/ref/acodec/adpcm_ima_qt
 delete mode 100644 tests/ref/fate/acodec-aref
 delete mode 100644 tests/ref/fate/filter-aemphasis
 delete mode 100644 tests/ref/fate/g729-0
 delete mode 100644 tests/ref/fate/g729-1
 delete mode 100644 tests/ref/fate/hapenc-hap-none
 delete mode 100644 tests/ref/fate/hapenc-hapa-none
 delete mode 100644 tests/ref/fate/hapenc-hapq-none
 delete mode 100644 tests/ref/fate/smjpeg
 delete mode 100644 tests/ref/vsynth/vsynth1-dnxhd_1080i
 delete mode 100644 tests/ref/vsynth/vsynth1-dv_411
 delete mode 100644 tests/ref/vsynth/vsynth1-zmbv
 delete mode 100644 tests/ref/vsynth/vsynth_lena-dnxhd_1080i
 delete mode 100644 tests/ref/vsynth/vsynth_lena-dv_411
 delete mode 100644 tests/ref/vsynth/vsynth_lena-zmbv
 delete mode 100644 tests/ref/vsynth1/cljr
 delete mode 100644 tests/ref/vsynth1/yuv
 delete mode 100644 tests/ref/vsynth_lena/cljr
 delete mode 100644 tests/ref/vsynth_lena/huffyuv
 delete mode 100644 tests/ref/vsynth_lena/yuv

diff --git a/tests/ref/acodec/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt
deleted file mode 100644
index a50c30a27c..0000000000
--- a/tests/ref/acodec/adpcm_ima_qt
+++ /dev/null
@@ -1,4 +0,0 @@
-23cbae1182e150ebf28e0abfb9cba127 *./tests/data/acodec/adpcm_qt.aiff
-281252 ./tests/data/acodec/adpcm_qt.aiff
-b0fafd002c38fb70acaddfda1a31ed61 *./tests/data/adpcm_ima_qt.acodec.out.wav
-stddev:  904.76 PSNR: 37.20 MAXDIFF:34029 bytes:  1058560/  1058400
diff --git a/tests/ref/fate/acodec-aref b/tests/ref/fate/acodec-aref
deleted file mode 100644
index d70876d9d9..0000000000
--- a/tests/ref/fate/acodec-aref
+++ /dev/null
@@ -1,4 +0,0 @@
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec.ref.wav
-1058446 ./tests/data/acodec.ref.wav
-ce524631c2ad0a40aaab46e3a80a1176 *./tests/data/acodec-16000-1.ref.wav
-192046 ./tests/data/acodec-16000-1.ref.wav
diff --git a/tests/ref/fate/filter-aemphasis b/tests/ref/fate/filter-aemphasis
deleted file mode 100644
index 143a434972..0000000000
--- a/tests/ref/fate/filter-aemphasis
+++ /dev/null
@@ -1,526 +0,0 @@
-#tb 0: 1/44100
-#media_type 0: audio
-#codec_id 0: pcm_s16le
-#sample_rate 0: 44100
-0,          0,          0,     1024,     4096, 0xb9c5fefd
-0,       1024,       1024,     1024,     4096, 0xb2ae0a90
-0,       2048,       2048,     1024,     4096, 0x97e6e9f3
-0,       3072,       3072,     1024,     4096, 0x5837f26f
-0,       4096,       4096,     1024,     4096, 0x71500376
-0,       5120,       5120,     1024,     4096, 0xb4650378
-0,       6144,       6144,     1024,     4096, 0xd261f5b1
-0,       7168,       7168,     1024,     4096, 0x3038f3fd
-0,       8192,       8192,     1024,     4096, 0x8e1908c6
-0,       9216,       9216,     1024,     4096, 0x1d6bfd33
-0,      10240,      10240,     1024,     4096, 0x7036f23f
-0,      11264,      11264,     1024,     4096, 0xaf73e9a1
-0,      12288,      12288,     1024,     4096, 0x0ba70404
-0,      13312,      13312,     1024,     4096, 0xd34bf249
-0,      14336,      14336,     1024,     4096, 0x0c88fc2b
-0,      15360,      15360,     1024,     4096, 0x55ebf9cf
-0,      16384,      16384,     1024,     4096, 0xc16df0bd
-0,      17408,      17408,     1024,     4096, 0xa635eac5
-0,      18432,      18432,     1024,     4096, 0xb41d059e
-0,      19456,      19456,     1024,     4096, 0xa905f4d3
-0,      20480,      20480,     1024,     4096, 0x2736f1fb
-0,      21504,      21504,     1024,     4096, 0x1a89f007
-0,      22528,      22528,     1024,     4096, 0x81d1fdab
-0,      23552,      23552,     1024,     4096, 0x6156f97d
-0,      24576,      24576,     1024,     4096, 0x1971ec89
-0,      25600,      25600,     1024,     4096, 0xdca1ec4f
-0,      26624,      26624,     1024,     4096, 0x116ffcf5
-0,      27648,      27648,     1024,     4096, 0xc391fdc9
-0,      28672,      28672,     1024,     4096, 0x85e0ef45
-0,      29696,      29696,     1024,     4096, 0x81d3012c
-0,      30720,      30720,     1024,     4096, 0x403ef11b
-0,      31744,      31744,     1024,     4096, 0x3ca6f16d
-0,      32768,      32768,     1024,     4096, 0x6775feb1
-0,      33792,      33792,     1024,     4096, 0xb2ae0a90
-0,      34816,      34816,     1024,     4096, 0x97e6e9f3
-0,      35840,      35840,     1024,     4096, 0x5837f26f
-0,      36864,      36864,     1024,     4096, 0x71500376
-0,      37888,      37888,     1024,     4096, 0xb4650378
-0,      38912,      38912,     1024,     4096, 0xd261f5b1
-0,      39936,      39936,     1024,     4096, 0x3038f3fd
-0,      40960,      40960,     1024,     4096, 0x8e1908c6
-0,      41984,      41984,     1024,     4096, 0x1d6bfd33
-0,      43008,      43008,     1024,     4096, 0x7036f23f
-0,      44032,      44032,     1024,     4096, 0xabb8fbdb
-0,      45056,      45056,     1024,     4096, 0x8980f03f
-0,      46080,      46080,     1024,     4096, 0xc5a0f4ed
-0,      47104,      47104,     1024,     4096, 0x04ac0314
-0,      48128,      48128,     1024,     4096, 0xfdd0dca7
-0,      49152,      49152,     1024,     4096, 0x799bf1fd
-0,      50176,      50176,     1024,     4096, 0xbaa9fdfd
-0,      51200,      51200,     1024,     4096, 0xeb7cf571
-0,      52224,      52224,     1024,     4096, 0xe33b0e5a
-0,      53248,      53248,     1024,     4096, 0x8017f117
-0,      54272,      54272,     1024,     4096, 0x5fccf35b
-0,      55296,      55296,     1024,     4096, 0xbd69f9cb
-0,      56320,      56320,     1024,     4096, 0x4d09f905
-0,      57344,      57344,     1024,     4096, 0xfa53f185
-0,      58368,      58368,     1024,     4096, 0x35b907e4
-0,      59392,      59392,     1024,     4096, 0xf639fedb
-0,      60416,      60416,     1024,     4096, 0x1e58f771
-0,      61440,      61440,     1024,     4096, 0xb13d18d4
-0,      62464,      62464,     1024,     4096, 0xc7930842
-0,      63488,      63488,     1024,     4096, 0x1b4702d4
-0,      64512,      64512,     1024,     4096, 0xad75dd27
-0,      65536,      65536,     1024,     4096, 0x9a1ceb7b
-0,      66560,      66560,     1024,     4096, 0xead809ac
-0,      67584,      67584,     1024,     4096, 0xbdaf1b5a
-0,      68608,      68608,     1024,     4096, 0xa90a00a6
-0,      69632,      69632,     1024,     4096, 0xb39f0d0a
-0,      70656,      70656,     1024,     4096, 0xbaf60950
-0,      71680,      71680,     1024,     4096, 0x57d3eb53
-0,      72704,      72704,     1024,     4096, 0x8a77f7ff
-0,      73728,      73728,     1024,     4096, 0xd2bfe3b9
-0,      74752,      74752,     1024,     4096, 0xd4c5e287
-0,      75776,      75776,     1024,     4096, 0x8b940480
-0,      76800,      76800,     1024,     4096, 0x63a9134e
-0,      77824,      77824,     1024,     4096, 0x2215ee4d
-0,      78848,      78848,     1024,     4096, 0x8777f743
-0,      79872,      79872,     1024,     4096, 0x633e05ac
-0,      80896,      80896,     1024,     4096, 0x3b1ee685
-0,      81920,      81920,     1024,     4096, 0x57d30238
-0,      82944,      82944,     1024,     4096, 0xfb241180
-0,      83968,      83968,     1024,     4096, 0x733aea25
-0,      84992,      84992,     1024,     4096, 0x1677ea57
-0,      86016,      86016,     1024,     4096, 0xdf5fd6d7
-0,      87040,      87040,     1024,     4096, 0x36520bca
-0,      88064,      88064,     1024,     4096, 0x1e860a06
-0,      89088,      89088,     1024,     4096, 0x3305428c
-0,      90112,      90112,     1024,     4096, 0xe1a8008c
-0,      91136,      91136,     1024,     4096, 0xd81ff15f
-0,      92160,      92160,     1024,     4096, 0x0ccad2e7
-0,      93184,      93184,     1024,     4096, 0xc613bf29
-0,      94208,      94208,     1024,     4096, 0x5411ef73
-0,      95232,      95232,     1024,     4096, 0x51f7e01b
-0,      96256,      96256,     1024,     4096, 0x23d1ee5b
-0,      97280,      97280,     1024,     4096, 0xbc9721e2
-0,      98304,      98304,     1024,     4096, 0x0d49c94b
-0,      99328,      99328,     1024,     4096, 0xa102d963
-0,     100352,     100352,     1024,     4096, 0x5fd8fe95
-0,     101376,     101376,     1024,     4096, 0xd8c738e0
-0,     102400,     102400,     1024,     4096, 0xa9882686
-0,     103424,     103424,     1024,     4096, 0xfa30c4b1
-0,     104448,     104448,     1024,     4096, 0x76ecdb31
-0,     105472,     105472,     1024,     4096, 0x540ccff9
-0,     106496,     106496,     1024,     4096, 0xb365cf5f
-0,     107520,     107520,     1024,     4096, 0x3ab51dcc
-0,     108544,     108544,     1024,     4096, 0x266fd553
-0,     109568,     109568,     1024,     4096, 0xdac42f58
-0,     110592,     110592,     1024,     4096, 0x3ab23628
-0,     111616,     111616,     1024,     4096, 0x94c9a8bf
-0,     112640,     112640,     1024,     4096, 0x7ba5ff41
-0,     113664,     113664,     1024,     4096, 0xc6bfd5db
-0,     114688,     114688,     1024,     4096, 0x6b9ef98f
-0,     115712,     115712,     1024,     4096, 0xe5621a02
-0,     116736,     116736,     1024,     4096, 0xeedd28ec
-0,     117760,     117760,     1024,     4096, 0xddf5e045
-0,     118784,     118784,     1024,     4096, 0x49f0e0a9
-0,     119808,     119808,     1024,     4096, 0xd18f0ca0
-0,     120832,     120832,     1024,     4096, 0xa0fa00c6
-0,     121856,     121856,     1024,     4096, 0x9e406e6c
-0,     122880,     122880,     1024,     4096, 0x1a3f23bc
-0,     123904,     123904,     1024,     4096, 0xcbf409d0
-0,     124928,     124928,     1024,     4096, 0x499b3ac8
-0,     125952,     125952,     1024,     4096, 0x2ef93980
-0,     126976,     126976,     1024,     4096, 0x83092bfa
-0,     128000,     128000,     1024,     4096, 0x4838093a
-0,     129024,     129024,     1024,     4096, 0xd1bff209
-0,     130048,     130048,     1024,     4096, 0xdef04f12
-0,     131072,     131072,     1024,     4096, 0x130dd787
-0,     132096,     132096,     1024,     4096, 0xc8621030
-0,     133120,     133120,     1024,     4096, 0x1b2bf867
-0,     134144,     134144,     1024,     4096, 0x01220341
-0,     135168,     135168,     1024,     4096, 0x7c8dfdb1
-0,     136192,     136192,     1024,     4096, 0xe81df813
-0,     137216,     137216,     1024,     4096, 0xf820fe8d
-0,     138240,     138240,     1024,     4096, 0x1f9dfe49
-0,     139264,     139264,     1024,     4096, 0x2f84f144
-0,     140288,     140288,     1024,     4096, 0xab9deec8
-0,     141312,     141312,     1024,     4096, 0x7d7bf5b9
-0,     142336,     142336,     1024,     4096, 0xbecff5ea
-0,     143360,     143360,     1024,     4096, 0x2872e5c0
-0,     144384,     144384,     1024,     4096, 0x6e2ff713
-0,     145408,     145408,     1024,     4096, 0x0b2df757
-0,     146432,     146432,     1024,     4096, 0x5030fa0a
-0,     147456,     147456,     1024,     4096, 0xb5b5f3da
-0,     148480,     148480,     1024,     4096, 0xce4cf9a6
-0,     149504,     149504,     1024,     4096, 0x9eacf61f
-0,     150528,     150528,     1024,     4096, 0x3bfff549
-0,     151552,     151552,     1024,     4096, 0x4eeae60a
-0,     152576,     152576,     1024,     4096, 0x188ef258
-0,     153600,     153600,     1024,     4096, 0xb546f30d
-0,     154624,     154624,     1024,     4096, 0x0a84e6f8
-0,     155648,     155648,     1024,     4096, 0xe7b0ee27
-0,     156672,     156672,     1024,     4096, 0x04d0f6ee
-0,     157696,     157696,     1024,     4096, 0x09fa042a
-0,     158720,     158720,     1024,     4096, 0x5a3cf418
-0,     159744,     159744,     1024,     4096, 0x89d8017f
-0,     160768,     160768,     1024,     4096, 0x64eb0320
-0,     161792,     161792,     1024,     4096, 0xe40df279
-0,     162816,     162816,     1024,     4096, 0x4dc4fd25
-0,     163840,     163840,     1024,     4096, 0x466af97c
-0,     164864,     164864,     1024,     4096, 0x7306f4e2
-0,     165888,     165888,     1024,     4096, 0x9782eda4
-0,     166912,     166912,     1024,     4096, 0x3635fad8
-0,     167936,     167936,     1024,     4096, 0x3344eabe
-0,     168960,     168960,     1024,     4096, 0x9143fda0
-0,     169984,     169984,     1024,     4096, 0x33e7eb7f
-0,     171008,     171008,     1024,     4096, 0x4ca0e947
-0,     172032,     172032,     1024,     4096, 0x5b1bf80d
-0,     173056,     173056,     1024,     4096, 0xbb15eab7
-0,     174080,     174080,     1024,     4096, 0xd800f7cb
-0,     175104,     175104,     1024,     4096, 0xd3d4e960
-0,     176128,     176128,     1024,     4096, 0x2fc30f2f
-0,     177152,     177152,     1024,     4096, 0xb410f092
-0,     178176,     178176,     1024,     4096, 0x4350fddf
-0,     179200,     179200,     1024,     4096, 0x477a07c6
-0,     180224,     180224,     1024,     4096, 0x9d48ed59
-0,     181248,     181248,     1024,     4096, 0xd6ae02a8
-0,     182272,     182272,     1024,     4096, 0x206be433
-0,     183296,     183296,     1024,     4096, 0xf465fc54
-0,     184320,     184320,     1024,     4096, 0x745dacb9
-0,     185344,     185344,     1024,     4096, 0x3783e765
-0,     186368,     186368,     1024,     4096, 0x479feb48
-0,     187392,     187392,     1024,     4096, 0x34f2050f
-0,     188416,     188416,     1024,     4096, 0x9df1f441
-0,     189440,     189440,     1024,     4096, 0x1864f225
-0,     190464,     190464,     1024,     4096, 0xebacf084
-0,     191488,     191488,     1024,     4096, 0xaa14f082
-0,     192512,     192512,     1024,     4096, 0xbac10f8b
-0,     193536,     193536,     1024,     4096, 0xa4520210
-0,     194560,     194560,     1024,     4096, 0xfee4f8c3
-0,     195584,     195584,     1024,     4096, 0xadf5e4c2
-0,     196608,     196608,     1024,     4096, 0x7bf20584
-0,     197632,     197632,     1024,     4096, 0x541debf5
-0,     198656,     198656,     1024,     4096, 0x9a350796
-0,     199680,     199680,     1024,     4096, 0x1388fa83
-0,     200704,     200704,     1024,     4096, 0x9839b0c2
-0,     201728,     201728,     1024,     4096, 0xfc9afff0
-0,     202752,     202752,     1024,     4096, 0x73100a7c
-0,     203776,     203776,     1024,     4096, 0xb56df070
-0,     204800,     204800,     1024,     4096, 0x71d8efa7
-0,     205824,     205824,     1024,     4096, 0xde800412
-0,     206848,     206848,     1024,     4096, 0x7bf7f840
-0,     207872,     207872,     1024,     4096, 0x1480044d
-0,     208896,     208896,     1024,     4096, 0x60201217
-0,     209920,     209920,     1024,     4096, 0xb410f092
-0,     210944,     210944,     1024,     4096, 0x4350fddf
-0,     211968,     211968,     1024,     4096, 0x477a07c6
-0,     212992,     212992,     1024,     4096, 0x9d48ed59
-0,     214016,     214016,     1024,     4096, 0xd6ae02a8
-0,     215040,     215040,     1024,     4096, 0x206be433
-0,     216064,     216064,     1024,     4096, 0xf465fc54
-0,     217088,     217088,     1024,     4096, 0x745dacb9
-0,     218112,     218112,     1024,     4096, 0x3783e765
-0,     219136,     219136,     1024,     4096, 0x479feb48
-0,     220160,     220160,     1024,     4096, 0x34f2050f
-0,     221184,     221184,     1024,     4096, 0x9df1f441
-0,     222208,     222208,     1024,     4096, 0x1864f225
-0,     223232,     223232,     1024,     4096, 0xebacf084
-0,     224256,     224256,     1024,     4096, 0xaa14f082
-0,     225280,     225280,     1024,     4096, 0xbac10f8b
-0,     226304,     226304,     1024,     4096, 0xa4520210
-0,     227328,     227328,     1024,     4096, 0xfee4f8c3
-0,     228352,     228352,     1024,     4096, 0xadf5e4c2
-0,     229376,     229376,     1024,     4096, 0x7bf20584
-0,     230400,     230400,     1024,     4096, 0x541debf5
-0,     231424,     231424,     1024,     4096, 0x9a350796
-0,     232448,     232448,     1024,     4096, 0x1388fa83
-0,     233472,     233472,     1024,     4096, 0x9839b0c2
-0,     234496,     234496,     1024,     4096, 0xfc9afff0
-0,     235520,     235520,     1024,     4096, 0x73100a7c
-0,     236544,     236544,     1024,     4096, 0xb56df070
-0,     237568,     237568,     1024,     4096, 0x71d8efa7
-0,     238592,     238592,     1024,     4096, 0xde800412
-0,     239616,     239616,     1024,     4096, 0x7bf7f840
-0,     240640,     240640,     1024,     4096, 0x1480044d
-0,     241664,     241664,     1024,     4096, 0x60201217
-0,     242688,     242688,     1024,     4096, 0xb410f092
-0,     243712,     243712,     1024,     4096, 0x4350fddf
-0,     244736,     244736,     1024,     4096, 0x477a07c6
-0,     245760,     245760,     1024,     4096, 0x9d48ed59
-0,     246784,     246784,     1024,     4096, 0xd6ae02a8
-0,     247808,     247808,     1024,     4096, 0x206be433
-0,     248832,     248832,     1024,     4096, 0xf465fc54
-0,     249856,     249856,     1024,     4096, 0x745dacb9
-0,     250880,     250880,     1024,     4096, 0x3783e765
-0,     251904,     251904,     1024,     4096, 0x479feb48
-0,     252928,     252928,     1024,     4096, 0x34f2050f
-0,     253952,     253952,     1024,     4096, 0x9df1f441
-0,     254976,     254976,     1024,     4096, 0x1864f225
-0,     256000,     256000,     1024,     4096, 0xebacf084
-0,     257024,     257024,     1024,     4096, 0xaa14f082
-0,     258048,     258048,     1024,     4096, 0xbac10f8b
-0,     259072,     259072,     1024,     4096, 0xa4520210
-0,     260096,     260096,     1024,     4096, 0xfee4f8c3
-0,     261120,     261120,     1024,     4096, 0xadf5e4c2
-0,     262144,     262144,     1024,     4096, 0x7bf20584
-0,     263168,     263168,     1024,     4096, 0x541debf5
-0,     264192,     264192,      408,     1632, 0xadd02d39
-#tb 0: 1/44100
-#media_type 0: audio
-#codec_id 0: pcm_s16le
-#sample_rate 0: 44100
-0,          0,          0,     1024,     4096, 0xfd510c8e
-0,       1024,       1024,     1024,     4096, 0x09dcf895
-0,       2048,       2048,     1024,     4096, 0xd8cbe29f
-0,       3072,       3072,     1024,     4096, 0xefcffb51
-0,       4096,       4096,     1024,     4096, 0xa3840ebe
-0,       5120,       5120,     1024,     4096, 0xfcf0f60f
-0,       6144,       6144,     1024,     4096, 0x3d82f4ad
-0,       7168,       7168,     1024,     4096, 0x17960344
-0,       8192,       8192,     1024,     4096, 0xdecbf6f9
-0,       9216,       9216,     1024,     4096, 0x783d000e
-0,      10240,      10240,     1024,     4096, 0xea4607fe
-0,      11264,      11264,     1024,     4096, 0xabc7f8ad
-0,      12288,      12288,     1024,     4096, 0xda22f07d
-0,      13312,      13312,     1024,     4096, 0xbcebfc6b
-0,      14336,      14336,     1024,     4096, 0xc7020a20
-0,      15360,      15360,     1024,     4096, 0xfa28f94b
-0,      16384,      16384,     1024,     4096, 0x926ee3b5
-0,      17408,      17408,     1024,     4096, 0x161cf985
-0,      18432,      18432,     1024,     4096, 0x40e909ce
-0,      19456,      19456,     1024,     4096, 0x1bf8f2ef
-0,      20480,      20480,     1024,     4096, 0x322fe983
-0,      21504,      21504,     1024,     4096, 0xead2fe3f
-0,      22528,      22528,     1024,     4096, 0xcb51fb99
-0,      23552,      23552,     1024,     4096, 0xd430e117
-0,      24576,      24576,     1024,     4096, 0x3d72f74f
-0,      25600,      25600,     1024,     4096, 0x12b1f269
-0,      26624,      26624,     1024,     4096, 0x0469e035
-0,      27648,      27648,     1024,     4096, 0xd164f5bf
-0,      28672,      28672,     1024,     4096, 0xa6f803aa
-0,      29696,      29696,     1024,     4096, 0x3569f3e9
-0,      30720,      30720,     1024,     4096, 0x8662ec45
-0,      31744,      31744,     1024,     4096, 0x92fdfeb7
-0,      32768,      32768,     1024,     4096, 0x915f12ce
-0,      33792,      33792,     1024,     4096, 0x09dcf895
-0,      34816,      34816,     1024,     4096, 0xd8cbe29f
-0,      35840,      35840,     1024,     4096, 0xefcffb51
-0,      36864,      36864,     1024,     4096, 0xa3840ebe
-0,      37888,      37888,     1024,     4096, 0xfcf0f60f
-0,      38912,      38912,     1024,     4096, 0x3d82f4ad
-0,      39936,      39936,     1024,     4096, 0x17960344
-0,      40960,      40960,     1024,     4096, 0xdecbf6f9
-0,      41984,      41984,     1024,     4096, 0x783d000e
-0,      43008,      43008,     1024,     4096, 0xea4607fe
-0,      44032,      44032,     1024,     4096, 0x3e840b8a
-0,      45056,      45056,     1024,     4096, 0x45d30e80
-0,      46080,      46080,     1024,     4096, 0xc31bef4f
-0,      47104,      47104,     1024,     4096, 0x8b1302e4
-0,      48128,      48128,     1024,     4096, 0x0b21144e
-0,      49152,      49152,     1024,     4096, 0xb873e7b1
-0,      50176,      50176,     1024,     4096, 0x914e07ee
-0,      51200,      51200,     1024,     4096, 0x7e9dfc37
-0,      52224,      52224,     1024,     4096, 0x8255f9b7
-0,      53248,      53248,     1024,     4096, 0x98a7ebeb
-0,      54272,      54272,     1024,     4096, 0xf438eeb1
-0,      55296,      55296,     1024,     4096, 0x31f40542
-0,      56320,      56320,     1024,     4096, 0x5fb7eb35
-0,      57344,      57344,     1024,     4096, 0xe9220582
-0,      58368,      58368,     1024,     4096, 0xf1a80e3a
-0,      59392,      59392,     1024,     4096, 0xe8ff0f14
-0,      60416,      60416,     1024,     4096, 0x48980ac2
-0,      61440,      61440,     1024,     4096, 0x98d9ffdd
-0,      62464,      62464,     1024,     4096, 0x6db8f2f5
-0,      63488,      63488,     1024,     4096, 0x892f06fa
-0,      64512,      64512,     1024,     4096, 0xa8defbcb
-0,      65536,      65536,     1024,     4096, 0xd39d0f38
-0,      66560,      66560,     1024,     4096, 0xe9bef09b
-0,      67584,      67584,     1024,     4096, 0xa930fd67
-0,      68608,      68608,     1024,     4096, 0x78cc1e42
-0,      69632,      69632,     1024,     4096, 0x7a2eeeeb
-0,      70656,      70656,     1024,     4096, 0xdf660c6a
-0,      71680,      71680,     1024,     4096, 0x00ff0240
-0,      72704,      72704,     1024,     4096, 0x421dd4a5
-0,      73728,      73728,     1024,     4096, 0x7abdd0a3
-0,      74752,      74752,     1024,     4096, 0x172e2578
-0,      75776,      75776,     1024,     4096, 0x24b5e26d
-0,      76800,      76800,     1024,     4096, 0xaf3e136c
-0,      77824,      77824,     1024,     4096, 0xb1ccf1dd
-0,      78848,      78848,     1024,     4096, 0xd08ef9f9
-0,      79872,      79872,     1024,     4096, 0x76c415f8
-0,      80896,      80896,     1024,     4096, 0x0269f63f
-0,      81920,      81920,     1024,     4096, 0xe65f07fe
-0,      82944,      82944,     1024,     4096, 0xc9831ccc
-0,      83968,      83968,     1024,     4096, 0x6907f72b
-0,      84992,      84992,     1024,     4096, 0x9cfae861
-0,      86016,      86016,     1024,     4096, 0x2ed7fbbf
-0,      87040,      87040,     1024,     4096, 0x3b1718f0
-0,      88064,      88064,     1024,     4096, 0xe066fe41
-0,      89088,      89088,     1024,     4096, 0xf4fee887
-0,      90112,      90112,     1024,     4096, 0xc0220baa
-0,      91136,      91136,     1024,     4096, 0x32abcc4b
-0,      92160,      92160,     1024,     4096, 0x96dbc677
-0,      93184,      93184,     1024,     4096, 0x1b72dd23
-0,      94208,      94208,     1024,     4096, 0x2ae0eaef
-0,      95232,      95232,     1024,     4096, 0x3218fc25
-0,      96256,      96256,     1024,     4096, 0x5ed8f2a7
-0,      97280,      97280,     1024,     4096, 0x4df02c50
-0,      98304,      98304,     1024,     4096, 0x50e3a51d
-0,      99328,      99328,     1024,     4096, 0xaf52dc95
-0,     100352,     100352,     1024,     4096, 0x60a101a8
-0,     101376,     101376,     1024,     4096, 0x01c20386
-0,     102400,     102400,     1024,     4096, 0xb017e893
-0,     103424,     103424,     1024,     4096, 0x5a39f907
-0,     104448,     104448,     1024,     4096, 0xbf05e505
-0,     105472,     105472,     1024,     4096, 0x1797d237
-0,     106496,     106496,     1024,     4096, 0xb06bc281
-0,     107520,     107520,     1024,     4096, 0xb49f0402
-0,     108544,     108544,     1024,     4096, 0x4bfdb3a3
-0,     109568,     109568,     1024,     4096, 0x601302ae
-0,     110592,     110592,     1024,     4096, 0x2dad13ac
-0,     111616,     111616,     1024,     4096, 0xe95ed0a3
-0,     112640,     112640,     1024,     4096, 0x8df2dfe3
-0,     113664,     113664,     1024,     4096, 0x4183e52f
-0,     114688,     114688,     1024,     4096, 0x23f1ecad
-0,     115712,     115712,     1024,     4096, 0xb40c20e0
-0,     116736,     116736,     1024,     4096, 0x11bf2d2c
-0,     117760,     117760,     1024,     4096, 0x85f8f2cb
-0,     118784,     118784,     1024,     4096, 0x7961e007
-0,     119808,     119808,     1024,     4096, 0x63a9207a
-0,     120832,     120832,     1024,     4096, 0x7383e583
-0,     121856,     121856,     1024,     4096, 0xa3e36e6a
-0,     122880,     122880,     1024,     4096, 0xd2803f22
-0,     123904,     123904,     1024,     4096, 0x11a70252
-0,     124928,     124928,     1024,     4096, 0x4cfe20f6
-0,     125952,     125952,     1024,     4096, 0x2e66307e
-0,     126976,     126976,     1024,     4096, 0x87c9229c
-0,     128000,     128000,     1024,     4096, 0x8ecdfddb
-0,     129024,     129024,     1024,     4096, 0x7e41e4b7
-0,     130048,     130048,     1024,     4096, 0x568d46fc
-0,     131072,     131072,     1024,     4096, 0x3c97b403
-0,     132096,     132096,     1024,     4096, 0xe04105c2
-0,     133120,     133120,     1024,     4096, 0xe8d6f531
-0,     134144,     134144,     1024,     4096, 0x9a410079
-0,     135168,     135168,     1024,     4096, 0x12631511
-0,     136192,     136192,     1024,     4096, 0x530ff27c
-0,     137216,     137216,     1024,     4096, 0x41f0f3ab
-0,     138240,     138240,     1024,     4096, 0x6985f567
-0,     139264,     139264,     1024,     4096, 0xffc80074
-0,     140288,     140288,     1024,     4096, 0xc6c21def
-0,     141312,     141312,     1024,     4096, 0xf5ddf852
-0,     142336,     142336,     1024,     4096, 0xf61af464
-0,     143360,     143360,     1024,     4096, 0xccabfbd1
-0,     144384,     144384,     1024,     4096, 0x466e062c
-0,     145408,     145408,     1024,     4096, 0xec68ee08
-0,     146432,     146432,     1024,     4096, 0xead4f61a
-0,     147456,     147456,     1024,     4096, 0xb3feef14
-0,     148480,     148480,     1024,     4096, 0x8f03e128
-0,     149504,     149504,     1024,     4096, 0x0c54fd08
-0,     150528,     150528,     1024,     4096, 0x1ae6f4cf
-0,     151552,     151552,     1024,     4096, 0x34bae7d5
-0,     152576,     152576,     1024,     4096, 0xeefc1293
-0,     153600,     153600,     1024,     4096, 0x0c2bfd50
-0,     154624,     154624,     1024,     4096, 0x432ef6f5
-0,     155648,     155648,     1024,     4096, 0xd0f0e4a6
-0,     156672,     156672,     1024,     4096, 0xdeb4fe78
-0,     157696,     157696,     1024,     4096, 0xa6eeef90
-0,     158720,     158720,     1024,     4096, 0xad6701b6
-0,     159744,     159744,     1024,     4096, 0x9865f521
-0,     160768,     160768,     1024,     4096, 0xd7c301a0
-0,     161792,     161792,     1024,     4096, 0x3e82f05d
-0,     162816,     162816,     1024,     4096, 0x09d1fe12
-0,     163840,     163840,     1024,     4096, 0x5b3eeab5
-0,     164864,     164864,     1024,     4096, 0xa8f8e69d
-0,     165888,     165888,     1024,     4096, 0x7b1efe94
-0,     166912,     166912,     1024,     4096, 0xb65dfae6
-0,     167936,     167936,     1024,     4096, 0xf90ffa31
-0,     168960,     168960,     1024,     4096, 0x62e805fe
-0,     169984,     169984,     1024,     4096, 0xe20cfa8e
-0,     171008,     171008,     1024,     4096, 0x1cbdf820
-0,     172032,     172032,     1024,     4096, 0x79e8e729
-0,     173056,     173056,     1024,     4096, 0xfa8bf6ac
-0,     174080,     174080,     1024,     4096, 0xe294f8a6
-0,     175104,     175104,     1024,     4096, 0xa4800572
-0,     176128,     176128,     1024,     4096, 0x8a0e1b32
-0,     177152,     177152,     1024,     4096, 0x00bcf36c
-0,     178176,     178176,     1024,     4096, 0xb3a4eec2
-0,     179200,     179200,     1024,     4096, 0x137a03bd
-0,     180224,     180224,     1024,     4096, 0xb8770bf1
-0,     181248,     181248,     1024,     4096, 0xcc66f90a
-0,     182272,     182272,     1024,     4096, 0x66be04d4
-0,     183296,     183296,     1024,     4096, 0x80a40461
-0,     184320,     184320,     1024,     4096, 0xe4a2b95d
-0,     185344,     185344,     1024,     4096, 0x2537edf0
-0,     186368,     186368,     1024,     4096, 0xc3e8e74f
-0,     187392,     187392,     1024,     4096, 0xd2a40021
-0,     188416,     188416,     1024,     4096, 0xb366f18a
-0,     189440,     189440,     1024,     4096, 0x1d3a0b8a
-0,     190464,     190464,     1024,     4096, 0xac40f416
-0,     191488,     191488,     1024,     4096, 0xc90bf16c
-0,     192512,     192512,     1024,     4096, 0xd6931f86
-0,     193536,     193536,     1024,     4096, 0xf9170265
-0,     194560,     194560,     1024,     4096, 0xb024f8dc
-0,     195584,     195584,     1024,     4096, 0x31cdf143
-0,     196608,     196608,     1024,     4096, 0x1fe1e5e0
-0,     197632,     197632,     1024,     4096, 0x0f1ef3af
-0,     198656,     198656,     1024,     4096, 0x3c86ee15
-0,     199680,     199680,     1024,     4096, 0xf151ecf2
-0,     200704,     200704,     1024,     4096, 0x81fbb354
-0,     201728,     201728,     1024,     4096, 0x88c903e8
-0,     202752,     202752,     1024,     4096, 0x1f480608
-0,     203776,     203776,     1024,     4096, 0x15f4f3cf
-0,     204800,     204800,     1024,     4096, 0xb1ed0d3d
-0,     205824,     205824,     1024,     4096, 0xa074ecfe
-0,     206848,     206848,     1024,     4096, 0xc38100c8
-0,     207872,     207872,     1024,     4096, 0xd43000d8
-0,     208896,     208896,     1024,     4096, 0x59e61b3b
-0,     209920,     209920,     1024,     4096, 0x00bcf36c
-0,     210944,     210944,     1024,     4096, 0xb3a4eec2
-0,     211968,     211968,     1024,     4096, 0x137a03bd
-0,     212992,     212992,     1024,     4096, 0xb8770bf1
-0,     214016,     214016,     1024,     4096, 0xcc66f90a
-0,     215040,     215040,     1024,     4096, 0x66be04d4
-0,     216064,     216064,     1024,     4096, 0x80a40461
-0,     217088,     217088,     1024,     4096, 0xe4a2b95d
-0,     218112,     218112,     1024,     4096, 0x2537edf0
-0,     219136,     219136,     1024,     4096, 0xc3e8e74f
-0,     220160,     220160,     1024,     4096, 0xd2a40021
-0,     221184,     221184,     1024,     4096, 0xb366f18a
-0,     222208,     222208,     1024,     4096, 0x1d3a0b8a
-0,     223232,     223232,     1024,     4096, 0xac40f416
-0,     224256,     224256,     1024,     4096, 0xc90bf16c
-0,     225280,     225280,     1024,     4096, 0xd6931f86
-0,     226304,     226304,     1024,     4096, 0xf9170265
-0,     227328,     227328,     1024,     4096, 0xb024f8dc
-0,     228352,     228352,     1024,     4096, 0x31cdf143
-0,     229376,     229376,     1024,     4096, 0x1fe1e5e0
-0,     230400,     230400,     1024,     4096, 0x0f1ef3af
-0,     231424,     231424,     1024,     4096, 0x3c86ee15
-0,     232448,     232448,     1024,     4096, 0xf151ecf2
-0,     233472,     233472,     1024,     4096, 0x81fbb354
-0,     234496,     234496,     1024,     4096, 0x88c903e8
-0,     235520,     235520,     1024,     4096, 0x1f480608
-0,     236544,     236544,     1024,     4096, 0x15f4f3cf
-0,     237568,     237568,     1024,     4096, 0xb1ed0d3d
-0,     238592,     238592,     1024,     4096, 0xa074ecfe
-0,     239616,     239616,     1024,     4096, 0xc38100c8
-0,     240640,     240640,     1024,     4096, 0xd43000d8
-0,     241664,     241664,     1024,     4096, 0x59e61b3b
-0,     242688,     242688,     1024,     4096, 0x00bcf36c
-0,     243712,     243712,     1024,     4096, 0xb3a4eec2
-0,     244736,     244736,     1024,     4096, 0x137a03bd
-0,     245760,     245760,     1024,     4096, 0xb8770bf1
-0,     246784,     246784,     1024,     4096, 0xcc66f90a
-0,     247808,     247808,     1024,     4096, 0x66be04d4
-0,     248832,     248832,     1024,     4096, 0x80a40461
-0,     249856,     249856,     1024,     4096, 0xe4a2b95d
-0,     250880,     250880,     1024,     4096, 0x2537edf0
-0,     251904,     251904,     1024,     4096, 0xc3e8e74f
-0,     252928,     252928,     1024,     4096, 0xd2a40021
-0,     253952,     253952,     1024,     4096, 0xb366f18a
-0,     254976,     254976,     1024,     4096, 0x1d3a0b8a
-0,     256000,     256000,     1024,     4096, 0xac40f416
-0,     257024,     257024,     1024,     4096, 0xc90bf16c
-0,     258048,     258048,     1024,     4096, 0xd6931f86
-0,     259072,     259072,     1024,     4096, 0xf9170265
-0,     260096,     260096,     1024,     4096, 0xb024f8dc
-0,     261120,     261120,     1024,     4096, 0x31cdf143
-0,     262144,     262144,     1024,     4096, 0x1fe1e5e0
-0,     263168,     263168,     1024,     4096, 0x0f1ef3af
-0,     264192,     264192,      408,     1632, 0x70682eea
diff --git a/tests/ref/fate/g729-0 b/tests/ref/fate/g729-0
deleted file mode 100644
index 36c6634fab..0000000000
--- a/tests/ref/fate/g729-0
+++ /dev/null
@@ -1,1000 +0,0 @@
-0, 0, 160, 0xbb6d5aa0
-0, 900, 160, 0x91563d8d
-0, 1800, 160, 0x10a7535b
-0, 2700, 160, 0xa4f35594
-0, 3600, 160, 0x7f8e54e0
-0, 4500, 160, 0x85275000
-0, 5400, 160, 0x00734c7b
-0, 6300, 160, 0x8a2d544d
-0, 7200, 160, 0x97dc533c
-0, 8100, 160, 0xa7064ec4
-0, 9000, 160, 0xb7984a3c
-0, 9900, 160, 0x28334db6
-0, 10800, 160, 0x5838521f
-0, 11700, 160, 0x2337502c
-0, 12600, 160, 0x4a1e4599
-0, 13500, 160, 0x0d3858a8
-0, 14400, 160, 0xa0974b46
-0, 15300, 160, 0xc3254b93
-0, 16200, 160, 0x42b75231
-0, 17100, 160, 0x93634662
-0, 18000, 160, 0x11674fa1
-0, 18900, 160, 0xf2da5414
-0, 19800, 160, 0x97754dbc
-0, 20700, 160, 0x40a24d94
-0, 21600, 160, 0x26b34ebf
-0, 22500, 160, 0x7730542f
-0, 23400, 160, 0xb45254aa
-0, 24300, 160, 0xd8d752c3
-0, 25200, 160, 0x655c4a81
-0, 26100, 160, 0xa5da4f35
-0, 27000, 160, 0xd43551a1
-0, 27900, 160, 0x72a74e7d
-0, 28800, 160, 0xdb2150b3
-0, 29700, 160, 0x972852a1
-0, 30600, 160, 0xbae14c07
-0, 31500, 160, 0x23b54d57
-0, 32400, 160, 0x2d9650a5
-0, 33300, 160, 0xaf755107
-0, 34200, 160, 0xdb054f0e
-0, 35100, 160, 0x9f084cc0
-0, 36000, 160, 0x64ca5760
-0, 36900, 160, 0x3ea24be2
-0, 37800, 160, 0x93ea503b
-0, 38700, 160, 0xb6694afa
-0, 39600, 160, 0xf94c52e7
-0, 40500, 160, 0x2b7156b8
-0, 41400, 160, 0xbbdf414c
-0, 42300, 160, 0x10cd4ac8
-0, 43200, 160, 0x39885453
-0, 44100, 160, 0xa1505568
-0, 45000, 160, 0x86124ec1
-0, 45900, 160, 0xe2ab5489
-0, 46800, 160, 0x406254bc
-0, 47700, 160, 0x09044629
-0, 48600, 160, 0xb2ed5702
-0, 49500, 160, 0xd9ee5188
-0, 50400, 160, 0x59f7592a
-0, 51300, 160, 0x8f144c08
-0, 52200, 160, 0x90394e61
-0, 53100, 160, 0x79524df7
-0, 54000, 160, 0x58044674
-0, 54900, 160, 0x73b24d90
-0, 55800, 160, 0x80e257a1
-0, 56700, 160, 0xe8ff4caf
-0, 57600, 160, 0x1db84e3e
-0, 58500, 160, 0xd7db59d9
-0, 59400, 160, 0x43244c15
-0, 60300, 160, 0x1f63558f
-0, 61200, 160, 0xf0d851c6
-0, 62100, 160, 0x76484f3a
-0, 63000, 160, 0x5746551e
-0, 63900, 160, 0x83b54cd7
-0, 64800, 160, 0x97f550a1
-0, 65700, 160, 0x77c45340
-0, 66600, 160, 0xfd7b520a
-0, 67500, 160, 0x989a4e13
-0, 68400, 160, 0x9a8551c0
-0, 69300, 160, 0xa0cb4f93
-0, 70200, 160, 0xc568536f
-0, 71100, 160, 0x6fa74a95
-0, 72000, 160, 0xd550568b
-0, 72900, 160, 0xf88f4de5
-0, 73800, 160, 0x91285517
-0, 74700, 160, 0xdb675270
-0, 75600, 160, 0x606c53f9
-0, 76500, 160, 0x43f64601
-0, 77400, 160, 0x28b94b45
-0, 78300, 160, 0x7f2347f5
-0, 79200, 160, 0x84ba55db
-0, 80100, 160, 0x3ca3477c
-0, 81000, 160, 0x57d158ba
-0, 81900, 160, 0x2c3c506d
-0, 82800, 160, 0x59b34e5f
-0, 83700, 160, 0x014f530a
-0, 84600, 160, 0x877f4f76
-0, 85500, 160, 0x97a65c5f
-0, 86400, 160, 0xf643516d
-0, 87300, 160, 0x6ccc5242
-0, 88200, 160, 0x895450bd
-0, 89100, 160, 0xe246570e
-0, 90000, 160, 0xbb9f4a0c
-0, 90900, 160, 0x60e646fe
-0, 91800, 160, 0x546f515b
-0, 92700, 160, 0xc59254f0
-0, 93600, 160, 0xcad6551f
-0, 94500, 160, 0x14e14fac
-0, 95400, 160, 0x3cf94c52
-0, 96300, 160, 0x99b14f45
-0, 97200, 160, 0xfdb14dc7
-0, 98100, 160, 0x48f359e7
-0, 99000, 160, 0x186153e3
-0, 99900, 160, 0x047d4a78
-0, 100800, 160, 0x992f462b
-0, 101700, 160, 0x4a0e504d
-0, 102600, 160, 0x1f245275
-0, 103500, 160, 0x026959a9
-0, 104400, 160, 0x648846e7
-0, 105300, 160, 0xcac94cb3
-0, 106200, 160, 0x55e551a4
-0, 107100, 160, 0x767a5315
-0, 108000, 160, 0xbfde4d2b
-0, 108900, 160, 0x29bf4613
-0, 109800, 160, 0x8a8d5394
-0, 110700, 160, 0x36f94dae
-0, 111600, 160, 0x4cbf50ba
-0, 112500, 160, 0x9af44d8b
-0, 113400, 160, 0x6e8a519e
-0, 114300, 160, 0x496348b7
-0, 115200, 160, 0x95324eb2
-0, 116100, 160, 0x5bfe5118
-0, 117000, 160, 0xa1ff4c88
-0, 117900, 160, 0x86c2500a
-0, 118800, 160, 0xc53353c5
-0, 119700, 160, 0x062f52ee
-0, 120600, 160, 0x11cf522d
-0, 121500, 160, 0x054f5855
-0, 122400, 160, 0x8c4e44e9
-0, 123300, 160, 0x4d514fda
-0, 124200, 160, 0x5726568e
-0, 125100, 160, 0x281859ad
-0, 126000, 160, 0x3f3344f8
-0, 126900, 160, 0x2cbb3ee5
-0, 127800, 160, 0xa075551c
-0, 128700, 160, 0xafb25528
-0, 129600, 160, 0x9221478a
-0, 130500, 160, 0x6cb15634
-0, 131400, 160, 0xb5cf4523
-0, 132300, 160, 0x8a7a4f2c
-0, 133200, 160, 0x278e553d
-0, 134100, 160, 0x49054ad3
-0, 135000, 160, 0x5d7449bb
-0, 135900, 160, 0x67c346a0
-0, 136800, 160, 0x5d915bf8
-0, 137700, 160, 0x671355b2
-0, 138600, 160, 0xdfa84ee6
-0, 139500, 160, 0x4c3552d0
-0, 140400, 160, 0x63a1483c
-0, 141300, 160, 0x14c151ba
-0, 142200, 160, 0xf7434d78
-0, 143100, 160, 0x1c3652c9
-0, 144000, 160, 0x035b51da
-0, 144900, 160, 0x2bf6496b
-0, 145800, 160, 0x50a14f14
-0, 146700, 160, 0x518948f8
-0, 147600, 160, 0x7e784331
-0, 148500, 160, 0x73384dce
-0, 149400, 160, 0x11015066
-0, 150300, 160, 0xacc5525c
-0, 151200, 160, 0xf75a5431
-0, 152100, 160, 0xa78e4b8a
-0, 153000, 160, 0xd07955b0
-0, 153900, 160, 0x63164a03
-0, 154800, 160, 0x952f519e
-0, 155700, 160, 0xe5764f77
-0, 156600, 160, 0xa9255738
-0, 157500, 160, 0x65d64ce5
-0, 158400, 160, 0x8ab7507c
-0, 159300, 160, 0xf5265251
-0, 160200, 160, 0xa6a84d74
-0, 161100, 160, 0xc2594fee
-0, 162000, 160, 0xdfae5056
-0, 162900, 160, 0xa5a74c11
-0, 163800, 160, 0x5fdf4a21
-0, 164700, 160, 0x11014f8d
-0, 165600, 160, 0x08d0553f
-0, 166500, 160, 0x3036520e
-0, 167400, 160, 0xee3a464e
-0, 168300, 160, 0xbfd94949
-0, 169200, 160, 0x21625176
-0, 170100, 160, 0x6c714e8d
-0, 171000, 160, 0x055a4c05
-0, 171900, 160, 0xc7f35347
-0, 172800, 160, 0x82344b60
-0, 173700, 160, 0x99854ce4
-0, 174600, 160, 0x95504ec3
-0, 175500, 160, 0xe245502a
-0, 176400, 160, 0xb0e14a4c
-0, 177300, 160, 0x09835b86
-0, 178200, 160, 0xe9495220
-0, 179100, 160, 0xce9b514f
-0, 180000, 160, 0xbaf85695
-0, 180900, 160, 0x69aa3f1d
-0, 181800, 160, 0xd6a551b8
-0, 182700, 160, 0x4eb956e6
-0, 183600, 160, 0xdd6d4e58
-0, 184500, 160, 0xba1f4814
-0, 185400, 160, 0x4a604f48
-0, 186300, 160, 0xa8995890
-0, 187200, 160, 0x3a80616b
-0, 188100, 160, 0xfb796013
-0, 189000, 160, 0x8eba5c12
-0, 189900, 160, 0xd37859b9
-0, 190800, 160, 0x19a857c8
-0, 191700, 160, 0xec0e5a16
-0, 192600, 160, 0xd5335159
-0, 193500, 160, 0x560f4de7
-0, 194400, 160, 0x06d354c8
-0, 195300, 160, 0xdade5860
-0, 196200, 160, 0x093a512c
-0, 197100, 160, 0xb37b5098
-0, 198000, 160, 0x3eea537c
-0, 198900, 160, 0xf5c94f06
-0, 199800, 160, 0x552c4bb2
-0, 200700, 160, 0xea9a5a79
-0, 201600, 160, 0xd2645494
-0, 202500, 160, 0x5ba958ea
-0, 203400, 160, 0x54b559cf
-0, 204300, 160, 0x86bf5bba
-0, 205200, 160, 0xb89b6149
-0, 206100, 160, 0x1e825314
-0, 207000, 160, 0xf0d250cc
-0, 207900, 160, 0xc7ad53ba
-0, 208800, 160, 0x320c552f
-0, 209700, 160, 0xc62756f7
-0, 210600, 160, 0xa41351f7
-0, 211500, 160, 0x27ed4e78
-0, 212400, 160, 0x8d6047bc
-0, 213300, 160, 0xa45c48d0
-0, 214200, 160, 0x14da5400
-0, 215100, 160, 0x48514dd2
-0, 216000, 160, 0xec395318
-0, 216900, 160, 0xf3c85e4a
-0, 217800, 160, 0x657a63ed
-0, 218700, 160, 0xcc975c4d
-0, 219600, 160, 0x86125dd4
-0, 220500, 160, 0x6a3f6019
-0, 221400, 160, 0x84c05aeb
-0, 222300, 160, 0xe68561f7
-0, 223200, 160, 0x7ec763ae
-0, 224100, 160, 0x91bd5792
-0, 225000, 160, 0xb9365c8e
-0, 225900, 160, 0x42d7587a
-0, 226800, 160, 0x80a45453
-0, 227700, 160, 0x9ecf50c2
-0, 228600, 160, 0xc8de5173
-0, 229500, 160, 0x776952f7
-0, 230400, 160, 0x45f856c0
-0, 231300, 160, 0x729c4d73
-0, 232200, 160, 0xfd364a18
-0, 233100, 160, 0x709e587d
-0, 234000, 160, 0x288240e5
-0, 234900, 160, 0x16a6493f
-0, 235800, 160, 0x76db596f
-0, 236700, 160, 0x16c24a51
-0, 237600, 160, 0xc55b5a8f
-0, 238500, 160, 0x19024a2e
-0, 239400, 160, 0x16514d1b
-0, 240300, 160, 0x48bb5b82
-0, 241200, 160, 0x5a6e4d80
-0, 242100, 160, 0x6d404b0f
-0, 243000, 160, 0x57bc4e4a
-0, 243900, 160, 0xc10c5381
-0, 244800, 160, 0x34bd51d9
-0, 245700, 160, 0x5dcf52b7
-0, 246600, 160, 0xf61f57a7
-0, 247500, 160, 0x4e204934
-0, 248400, 160, 0xe18b4a3f
-0, 249300, 160, 0xb81256e3
-0, 250200, 160, 0x294047b2
-0, 251100, 160, 0x3ad559df
-0, 252000, 160, 0xd28d4d86
-0, 252900, 160, 0x67b75895
-0, 253800, 160, 0x191357b0
-0, 254700, 160, 0x8016556f
-0, 255600, 160, 0x62475c86
-0, 256500, 160, 0x0c975bc9
-0, 257400, 160, 0x901c5909
-0, 258300, 160, 0x9909567d
-0, 259200, 160, 0xce715b99
-0, 260100, 160, 0xae5062b1
-0, 261000, 160, 0x5bd056d6
-0, 261900, 160, 0xe3d3555a
-0, 262800, 160, 0xc4b1555c
-0, 263700, 160, 0x39c95649
-0, 264600, 160, 0x50145d11
-0, 265500, 160, 0xc0ba5307
-0, 266400, 160, 0x182455a3
-0, 267300, 160, 0x36c24e98
-0, 268200, 160, 0x1b5b52d0
-0, 269100, 160, 0xd38352d1
-0, 270000, 160, 0x6a1d5d2a
-0, 270900, 160, 0x50f05c44
-0, 271800, 160, 0xb2365dc1
-0, 272700, 160, 0x10825934
-0, 273600, 160, 0xcb4c61c2
-0, 274500, 160, 0x578252ab
-0, 275400, 160, 0xed99596c
-0, 276300, 160, 0xdfec6305
-0, 277200, 160, 0x97e2550a
-0, 278100, 160, 0xd60a56e1
-0, 279000, 160, 0xb6c4535e
-0, 279900, 160, 0x4d2e536c
-0, 280800, 160, 0xdef85cc7
-0, 281700, 160, 0xee985a98
-0, 282600, 160, 0x006a4cdb
-0, 283500, 160, 0xd06652ad
-0, 284400, 160, 0xeeee4ed6
-0, 285300, 160, 0xcb8b586d
-0, 286200, 160, 0x2ee4556e
-0, 287100, 160, 0x6d924c01
-0, 288000, 160, 0x7ff257cc
-0, 288900, 160, 0x67df5710
-0, 289800, 160, 0x0f704f29
-0, 290700, 160, 0x19dc53a7
-0, 291600, 160, 0xfbf44bc0
-0, 292500, 160, 0x640b5718
-0, 293400, 160, 0x2bfd4b91
-0, 294300, 160, 0xaae049bf
-0, 295200, 160, 0xca3154f6
-0, 296100, 160, 0x36064f2c
-0, 297000, 160, 0x28404919
-0, 297900, 160, 0x9c944fe3
-0, 298800, 160, 0xb4214c82
-0, 299700, 160, 0x442c514d
-0, 300600, 160, 0x44434ea5
-0, 301500, 160, 0x82a05aae
-0, 302400, 160, 0x4b86510d
-0, 303300, 160, 0x46844eab
-0, 304200, 160, 0xe5455deb
-0, 305100, 160, 0x60826550
-0, 306000, 160, 0x3c5a5448
-0, 306900, 160, 0x2db860c9
-0, 307800, 160, 0x4d845b78
-0, 308700, 160, 0x81dc5e23
-0, 309600, 160, 0x78c95932
-0, 310500, 160, 0xb5be57cd
-0, 311400, 160, 0x6fa45c65
-0, 312300, 160, 0x4e085e2a
-0, 313200, 160, 0x50ee530c
-0, 314100, 160, 0x2bb85587
-0, 315000, 160, 0x6d58614e
-0, 315900, 160, 0xcf4c5d69
-0, 316800, 160, 0x3cbf5ffb
-0, 317700, 160, 0x452157d3
-0, 318600, 160, 0x3cb55cd8
-0, 319500, 160, 0x2bba5735
-0, 320400, 160, 0x36a45670
-0, 321300, 160, 0x23b85b8a
-0, 322200, 160, 0x9a255457
-0, 323100, 160, 0x4e6956f3
-0, 324000, 160, 0xa0714edc
-0, 324900, 160, 0x7dee4a3d
-0, 325800, 160, 0x86404bc9
-0, 326700, 160, 0x358c50cd
-0, 327600, 160, 0x9eda47e8
-0, 328500, 160, 0x3cfe522e
-0, 329400, 160, 0xddb95758
-0, 330300, 160, 0x1a434a83
-0, 331200, 160, 0xa8a450bb
-0, 332100, 160, 0x44e7530e
-0, 333000, 160, 0x59b5555a
-0, 333900, 160, 0x65404db1
-0, 334800, 160, 0xcac15945
-0, 335700, 160, 0x38864f17
-0, 336600, 160, 0x61114f30
-0, 337500, 160, 0x195542d8
-0, 338400, 160, 0xacbb4c69
-0, 339300, 160, 0xd0da4ab9
-0, 340200, 160, 0x563d4eb6
-0, 341100, 160, 0xd0ce503c
-0, 342000, 160, 0x8b684e15
-0, 342900, 160, 0x711541d3
-0, 343800, 160, 0xb28b5b9b
-0, 344700, 160, 0x48b145e4
-0, 345600, 160, 0x908f5606
-0, 346500, 160, 0x22c74f02
-0, 347400, 160, 0x87274716
-0, 348300, 160, 0xaa2351e6
-0, 349200, 160, 0x2df5505a
-0, 350100, 160, 0x7999525c
-0, 351000, 160, 0x728a4b73
-0, 351900, 160, 0xa67447ff
-0, 352800, 160, 0x28884a20
-0, 353700, 160, 0x3ffa5840
-0, 354600, 160, 0xd6265047
-0, 355500, 160, 0x2f1553a8
-0, 356400, 160, 0xac0653ec
-0, 357300, 160, 0x35844368
-0, 358200, 160, 0x6e1553ba
-0, 359100, 160, 0xb62a4c88
-0, 360000, 160, 0x88a04ffc
-0, 360900, 160, 0x947e525e
-0, 361800, 160, 0x3dd24f98
-0, 362700, 160, 0x942e542e
-0, 363600, 160, 0xdb985211
-0, 364500, 160, 0x615a5022
-0, 365400, 160, 0x71c04569
-0, 366300, 160, 0xbbbe4f41
-0, 367200, 160, 0x62074e0b
-0, 368100, 160, 0x2c5d56c7
-0, 369000, 160, 0x34344c18
-0, 369900, 160, 0xc57d4c22
-0, 370800, 160, 0xb273560d
-0, 371700, 160, 0x7e985229
-0, 372600, 160, 0x2dd3542d
-0, 373500, 160, 0x39645000
-0, 374400, 160, 0x1b3f4d9e
-0, 375300, 160, 0x0bbf5ed2
-0, 376200, 160, 0xc81f5608
-0, 377100, 160, 0xe82e569e
-0, 378000, 160, 0x34df537d
-0, 378900, 160, 0x53175837
-0, 379800, 160, 0xbb76517f
-0, 380700, 160, 0xd5a25737
-0, 381600, 160, 0x58eb4f3d
-0, 382500, 160, 0x8f6e51d3
-0, 383400, 160, 0x1fd85602
-0, 384300, 160, 0xef2a4ee7
-0, 385200, 160, 0x0e6e58f4
-0, 386100, 160, 0x80345497
-0, 387000, 160, 0x710150a1
-0, 387900, 160, 0x32fb51db
-0, 388800, 160, 0x7efd564c
-0, 389700, 160, 0xf6604f26
-0, 390600, 160, 0xc0954d7e
-0, 391500, 160, 0x27705072
-0, 392400, 160, 0xd26f5958
-0, 393300, 160, 0x2c2552cd
-0, 394200, 160, 0xd14056b1
-0, 395100, 160, 0x11f356d2
-0, 396000, 160, 0x93b35efd
-0, 396900, 160, 0xa6d65ae7
-0, 397800, 160, 0x95015177
-0, 398700, 160, 0x2e6157e8
-0, 399600, 160, 0xb90c5021
-0, 400500, 160, 0xf39155c9
-0, 401400, 160, 0xd6ad544b
-0, 402300, 160, 0x4b8a5b98
-0, 403200, 160, 0x90a94f2d
-0, 404100, 160, 0x46a04f3f
-0, 405000, 160, 0x542b5cd1
-0, 405900, 160, 0xebaa5710
-0, 406800, 160, 0x504854a0
-0, 407700, 160, 0xbd9d53b5
-0, 408600, 160, 0x91524fed
-0, 409500, 160, 0x9b7a582d
-0, 410400, 160, 0xa4f258cf
-0, 411300, 160, 0x46274dda
-0, 412200, 160, 0xc0335ba9
-0, 413100, 160, 0xe59c5c74
-0, 414000, 160, 0xc2ee5ab0
-0, 414900, 160, 0x3e035996
-0, 415800, 160, 0x63e25521
-0, 416700, 160, 0xc09851af
-0, 417600, 160, 0xb8225715
-0, 418500, 160, 0x74355bfb
-0, 419400, 160, 0xf4c75adf
-0, 420300, 160, 0x2f8b56cd
-0, 421200, 160, 0xb4705795
-0, 422100, 160, 0xb4b25506
-0, 423000, 160, 0xaadb54f8
-0, 423900, 160, 0xe6d158aa
-0, 424800, 160, 0xed64614f
-0, 425700, 160, 0x80195732
-0, 426600, 160, 0xa8995f0e
-0, 427500, 160, 0xdc4a520d
-0, 428400, 160, 0x071a5bae
-0, 429300, 160, 0xce1b5ae9
-0, 430200, 160, 0x85e25804
-0, 431100, 160, 0x435e555f
-0, 432000, 160, 0xe4154ef4
-0, 432900, 160, 0xeff857b4
-0, 433800, 160, 0xc9e25868
-0, 434700, 160, 0x6e6961eb
-0, 435600, 160, 0x361e45e6
-0, 436500, 160, 0xf8a94988
-0, 437400, 160, 0x9de758b3
-0, 438300, 160, 0x2e65533e
-0, 439200, 160, 0x3f89422d
-0, 440100, 160, 0x77fd56a5
-0, 441000, 160, 0x91104845
-0, 441900, 160, 0x2eeb5491
-0, 442800, 160, 0x6a5348c4
-0, 443700, 160, 0xe0954882
-0, 444600, 160, 0x7e915761
-0, 445500, 160, 0x2cb5531f
-0, 446400, 160, 0xe1dc4ecd
-0, 447300, 160, 0xbf6b4e61
-0, 448200, 160, 0x3d6b5746
-0, 449100, 160, 0xe8bd5077
-0, 450000, 160, 0xd38d5921
-0, 450900, 160, 0xfc534e38
-0, 451800, 160, 0xd361475b
-0, 452700, 160, 0x4d5152c7
-0, 453600, 160, 0xb6684d11
-0, 454500, 160, 0xd2e25864
-0, 455400, 160, 0x02ec536a
-0, 456300, 160, 0x27ac550e
-0, 457200, 160, 0xe8d44e2d
-0, 458100, 160, 0x520152c8
-0, 459000, 160, 0xace747ea
-0, 459900, 160, 0x773a4ee3
-0, 460800, 160, 0x7dd1559f
-0, 461700, 160, 0x124453a8
-0, 462600, 160, 0x04154991
-0, 463500, 160, 0x3c794d98
-0, 464400, 160, 0x309f4e47
-0, 465300, 160, 0x98c74a48
-0, 466200, 160, 0xd0c34bcc
-0, 467100, 160, 0xfa304e19
-0, 468000, 160, 0x69505201
-0, 468900, 160, 0x2e714ac7
-0, 469800, 160, 0x076654a3
-0, 470700, 160, 0xc6674e27
-0, 471600, 160, 0x1adf4dd9
-0, 472500, 160, 0x4408507e
-0, 473400, 160, 0xd2654d94
-0, 474300, 160, 0x97a65cc0
-0, 475200, 160, 0xb53251f9
-0, 476100, 160, 0xd498584b
-0, 477000, 160, 0x46a058c8
-0, 477900, 160, 0xa2f85cbd
-0, 478800, 160, 0x43b856fb
-0, 479700, 160, 0xdeb957ba
-0, 480600, 160, 0x3064580a
-0, 481500, 160, 0xe86357a5
-0, 482400, 160, 0x9b974d00
-0, 483300, 160, 0x66ee4ff3
-0, 484200, 160, 0x0b9958f7
-0, 485100, 160, 0xc3754d0a
-0, 486000, 160, 0x42314c33
-0, 486900, 160, 0x4550555f
-0, 487800, 160, 0x0f064e4c
-0, 488700, 160, 0xe569596d
-0, 489600, 160, 0x056c4751
-0, 490500, 160, 0xdc1049fc
-0, 491400, 160, 0x63c54a1e
-0, 492300, 160, 0xb402518e
-0, 493200, 160, 0xaf0d4b19
-0, 494100, 160, 0xa22b4c5b
-0, 495000, 160, 0x28084bbf
-0, 495900, 160, 0x10495224
-0, 496800, 160, 0x4cb94993
-0, 497700, 160, 0x17c15457
-0, 498600, 160, 0xbd834d6d
-0, 499500, 160, 0x6ca25235
-0, 500400, 160, 0x84b74f89
-0, 501300, 160, 0xdeef4e76
-0, 502200, 160, 0x6ab05188
-0, 503100, 160, 0xa91c4646
-0, 504000, 160, 0xad574e7d
-0, 504900, 160, 0xba264d69
-0, 505800, 160, 0xd8734dd0
-0, 506700, 160, 0x69f25581
-0, 507600, 160, 0x3b8e4ae9
-0, 508500, 160, 0xb1124607
-0, 509400, 160, 0xd78e4e4f
-0, 510300, 160, 0x05a1504f
-0, 511200, 160, 0x3e705270
-0, 512100, 160, 0x1e144b3b
-0, 513000, 160, 0xbb0b5416
-0, 513900, 160, 0xc26f5b45
-0, 514800, 160, 0x14224ab9
-0, 515700, 160, 0x2bbd4837
-0, 516600, 160, 0xd2bf4e60
-0, 517500, 160, 0xbeec506c
-0, 518400, 160, 0x2cd34d3a
-0, 519300, 160, 0x85134fc6
-0, 520200, 160, 0xdb9a4ac2
-0, 521100, 160, 0x92715256
-0, 522000, 160, 0xff395098
-0, 522900, 160, 0xa5ec560c
-0, 523800, 160, 0xce95534b
-0, 524700, 160, 0xe36f46f1
-0, 525600, 160, 0x45f74a58
-0, 526500, 160, 0x02d05440
-0, 527400, 160, 0xa005529f
-0, 528300, 160, 0xae0f3f22
-0, 529200, 160, 0x3f984eb0
-0, 530100, 160, 0xc5bd5015
-0, 531000, 160, 0xf4504c53
-0, 531900, 160, 0x7f4044c5
-0, 532800, 160, 0x82dd4bab
-0, 533700, 160, 0x7a0d5122
-0, 534600, 160, 0xd0da5271
-0, 535500, 160, 0x67d14e3e
-0, 536400, 160, 0x54564f42
-0, 537300, 160, 0x77df4e0a
-0, 538200, 160, 0x0c4a4f70
-0, 539100, 160, 0xb2944f40
-0, 540000, 160, 0xe57a52de
-0, 540900, 160, 0x7d994ed1
-0, 541800, 160, 0x9dc35763
-0, 542700, 160, 0x8d0a4da9
-0, 543600, 160, 0x0c6449a4
-0, 544500, 160, 0xc73c503a
-0, 545400, 160, 0x52904cbe
-0, 546300, 160, 0x49824c2e
-0, 547200, 160, 0xb7e14e0b
-0, 548100, 160, 0x9745548e
-0, 549000, 160, 0xdafb4c20
-0, 549900, 160, 0x1aa84d67
-0, 550800, 160, 0x64bc5033
-0, 551700, 160, 0x9e2e5a05
-0, 552600, 160, 0x69144bc5
-0, 553500, 160, 0xce1253fa
-0, 554400, 160, 0x359f4c15
-0, 555300, 160, 0xdba74ed0
-0, 556200, 160, 0xea1453b8
-0, 557100, 160, 0xccdf49d3
-0, 558000, 160, 0xeb324750
-0, 558900, 160, 0x62b14ad4
-0, 559800, 160, 0x446e50c0
-0, 560700, 160, 0x111e5151
-0, 561600, 160, 0x6be84f3a
-0, 562500, 160, 0xf5cf4e42
-0, 563400, 160, 0xcc995459
-0, 564300, 160, 0x0faf5172
-0, 565200, 160, 0x31334f66
-0, 566100, 160, 0x20ba52c0
-0, 567000, 160, 0xc7cc4975
-0, 567900, 160, 0x9e7a51ba
-0, 568800, 160, 0x52884ff1
-0, 569700, 160, 0xc7a84cfd
-0, 570600, 160, 0x5ae64c22
-0, 571500, 160, 0x68125a92
-0, 572400, 160, 0x39ed54f1
-0, 573300, 160, 0xfa0a4ad1
-0, 574200, 160, 0xe8c8590c
-0, 575100, 160, 0x5f555576
-0, 576000, 160, 0xaf7a57a1
-0, 576900, 160, 0x858257e9
-0, 577800, 160, 0x1223523e
-0, 578700, 160, 0x446954a1
-0, 579600, 160, 0xfbe952d9
-0, 580500, 160, 0xd56259ff
-0, 581400, 160, 0xc4fa4f44
-0, 582300, 160, 0x77cc57f6
-0, 583200, 160, 0x53d3573d
-0, 584100, 160, 0x085e4ff9
-0, 585000, 160, 0x7a4e5410
-0, 585900, 160, 0xb4ad5794
-0, 586800, 160, 0x71255738
-0, 587700, 160, 0x36724918
-0, 588600, 160, 0x370e5974
-0, 589500, 160, 0xb709596c
-0, 590400, 160, 0x89b05052
-0, 591300, 160, 0x74e550ce
-0, 592200, 160, 0x6e2c5a49
-0, 593100, 160, 0x4dfa5b50
-0, 594000, 160, 0x80764c70
-0, 594900, 160, 0xc1d14fc6
-0, 595800, 160, 0x53e746b3
-0, 596700, 160, 0x728350c0
-0, 597600, 160, 0x9aa6500e
-0, 598500, 160, 0x60985454
-0, 599400, 160, 0xa0c54b6f
-0, 600300, 160, 0xe3b157ea
-0, 601200, 160, 0xce86573b
-0, 602100, 160, 0x9dad5535
-0, 603000, 160, 0xb3094af9
-0, 603900, 160, 0x2d1456ed
-0, 604800, 160, 0x328248b9
-0, 605700, 160, 0x4ffb4f52
-0, 606600, 160, 0x71fe53de
-0, 607500, 160, 0x0d114e92
-0, 608400, 160, 0x37065510
-0, 609300, 160, 0x426c4c07
-0, 610200, 160, 0x58e3528b
-0, 611100, 160, 0x71674484
-0, 612000, 160, 0x45934ee1
-0, 612900, 160, 0x4e914b31
-0, 613800, 160, 0x525b4ec2
-0, 614700, 160, 0x4393563d
-0, 615600, 160, 0xb10154e9
-0, 616500, 160, 0x23b15a4d
-0, 617400, 160, 0x6d995220
-0, 618300, 160, 0xcd2949fd
-0, 619200, 160, 0x67234f75
-0, 620100, 160, 0x00cc4cdb
-0, 621000, 160, 0x97c35574
-0, 621900, 160, 0xc0855753
-0, 622800, 160, 0xf4e650a5
-0, 623700, 160, 0x95b14bc2
-0, 624600, 160, 0x04d948dc
-0, 625500, 160, 0x284d4d02
-0, 626400, 160, 0xfb0d4cd9
-0, 627300, 160, 0x0e515126
-0, 628200, 160, 0xb4055a86
-0, 629100, 160, 0x0bbe4f68
-0, 630000, 160, 0xf1b848af
-0, 630900, 160, 0x7d154853
-0, 631800, 160, 0x78225418
-0, 632700, 160, 0xfb2f523e
-0, 633600, 160, 0xa6d34ea6
-0, 634500, 160, 0xe4264e30
-0, 635400, 160, 0x113750aa
-0, 636300, 160, 0x4073529b
-0, 637200, 160, 0xd1754dda
-0, 638100, 160, 0x1b495413
-0, 639000, 160, 0x29f94cd8
-0, 639900, 160, 0x49004a53
-0, 640800, 160, 0x1fec4de4
-0, 641700, 160, 0x7d6b4670
-0, 642600, 160, 0x626c4c9f
-0, 643500, 160, 0x79265234
-0, 644400, 160, 0xab765b86
-0, 645300, 160, 0xe9ae4d26
-0, 646200, 160, 0xeee1481f
-0, 647100, 160, 0x289d5287
-0, 648000, 160, 0xb5524e8b
-0, 648900, 160, 0x7e715764
-0, 649800, 160, 0xb1b25091
-0, 650700, 160, 0xf1a946f6
-0, 651600, 160, 0x57dc51bd
-0, 652500, 160, 0x4c0b4f14
-0, 653400, 160, 0xdc1f4930
-0, 654300, 160, 0x79d75057
-0, 655200, 160, 0x22bd52df
-0, 656100, 160, 0x963a5562
-0, 657000, 160, 0x7e475303
-0, 657900, 160, 0x2c065494
-0, 658800, 160, 0xb0514720
-0, 659700, 160, 0xbc734849
-0, 660600, 160, 0xf4924e4d
-0, 661500, 160, 0xe50f44c9
-0, 662400, 160, 0x978c4ce8
-0, 663300, 160, 0x302e51c2
-0, 664200, 160, 0x262b4a60
-0, 665100, 160, 0xf95f4e99
-0, 666000, 160, 0x7465504a
-0, 666900, 160, 0xab0e5108
-0, 667800, 160, 0xbec15395
-0, 668700, 160, 0x4f2c5139
-0, 669600, 160, 0x26444deb
-0, 670500, 160, 0xee4c4b15
-0, 671400, 160, 0x8bc350e1
-0, 672300, 160, 0xd0744a5a
-0, 673200, 160, 0xfee64d9d
-0, 674100, 160, 0x234c50b6
-0, 675000, 160, 0x8592482c
-0, 675900, 160, 0x5e8b5308
-0, 676800, 160, 0x4f9848c7
-0, 677700, 160, 0x939d4faa
-0, 678600, 160, 0x797654f1
-0, 679500, 160, 0x15d24d9b
-0, 680400, 160, 0xa6e54bd2
-0, 681300, 160, 0x755e4c90
-0, 682200, 160, 0xcd334bce
-0, 683100, 160, 0xfc1746e9
-0, 684000, 160, 0x81f04dd5
-0, 684900, 160, 0x44b35080
-0, 685800, 160, 0x91e65217
-0, 686700, 160, 0x492150af
-0, 687600, 160, 0xf73e58ec
-0, 688500, 160, 0xf988538a
-0, 689400, 160, 0x0dee4c10
-0, 690300, 160, 0x2c9f4c23
-0, 691200, 160, 0x8c1e4e08
-0, 692100, 160, 0x25bb5286
-0, 693000, 160, 0xd0ed469b
-0, 693900, 160, 0x71eb50e8
-0, 694800, 160, 0x249f4d26
-0, 695700, 160, 0x9662498f
-0, 696600, 160, 0x49ee55e2
-0, 697500, 160, 0x54d9491b
-0, 698400, 160, 0x4c675649
-0, 699300, 160, 0x0e4b4b34
-0, 700200, 160, 0x776f4995
-0, 701100, 160, 0x722656b2
-0, 702000, 160, 0x081d4b6f
-0, 702900, 160, 0xf70746fe
-0, 703800, 160, 0x08b151da
-0, 704700, 160, 0x6b255328
-0, 705600, 160, 0xeb2b586a
-0, 706500, 160, 0x812b4444
-0, 707400, 160, 0x1e16533f
-0, 708300, 160, 0xc1244760
-0, 709200, 160, 0x67584d87
-0, 710100, 160, 0xde8b5726
-0, 711000, 160, 0xe96d4e3e
-0, 711900, 160, 0x41174c98
-0, 712800, 160, 0x4cdd4cd8
-0, 713700, 160, 0xfb724b64
-0, 714600, 160, 0x78f154df
-0, 715500, 160, 0x97e1476d
-0, 716400, 160, 0x6f034e7f
-0, 717300, 160, 0x93b240df
-0, 718200, 160, 0xc4d040e6
-0, 719100, 160, 0xe47744a4
-0, 720000, 160, 0x87a950ff
-0, 720900, 160, 0x7079491b
-0, 721800, 160, 0x89f0491a
-0, 722700, 160, 0x70b8467e
-0, 723600, 160, 0x20945294
-0, 724500, 160, 0x2d5c4919
-0, 725400, 160, 0x1ed44c78
-0, 726300, 160, 0x93d74a5f
-0, 727200, 160, 0x300e490e
-0, 728100, 160, 0x8249558d
-0, 729000, 160, 0x630a4f57
-0, 729900, 160, 0xdd6e475f
-0, 730800, 160, 0xf50941e5
-0, 731700, 160, 0x1fe44bea
-0, 732600, 160, 0x03be5469
-0, 733500, 160, 0x7ece4f4c
-0, 734400, 160, 0x31f953dd
-0, 735300, 160, 0x22a44b7d
-0, 736200, 160, 0x1f5e5562
-0, 737100, 160, 0x771b5688
-0, 738000, 160, 0x7d1c4d45
-0, 738900, 160, 0x6bc45cd0
-0, 739800, 160, 0x8f714c36
-0, 740700, 160, 0xfb1f4c87
-0, 741600, 160, 0x1f8a4b36
-0, 742500, 160, 0xee5c451a
-0, 743400, 160, 0xd56950ac
-0, 744300, 160, 0x529057f6
-0, 745200, 160, 0x336641fd
-0, 746100, 160, 0xa0dd5a66
-0, 747000, 160, 0x5f4b5248
-0, 747900, 160, 0xb6ef49a3
-0, 748800, 160, 0x07705f19
-0, 749700, 160, 0x3fce4bbb
-0, 750600, 160, 0xda395511
-0, 751500, 160, 0x1ecf5145
-0, 752400, 160, 0x88a547ab
-0, 753300, 160, 0x6c6849be
-0, 754200, 160, 0x979c4e97
-0, 755100, 160, 0x171854b3
-0, 756000, 160, 0x9a715283
-0, 756900, 160, 0x064e50ac
-0, 757800, 160, 0xc2fb4e94
-0, 758700, 160, 0x708146f5
-0, 759600, 160, 0x1ca45198
-0, 760500, 160, 0x332d4869
-0, 761400, 160, 0xc2ff4656
-0, 762300, 160, 0x0747552e
-0, 763200, 160, 0x0c3d4ba8
-0, 764100, 160, 0x72934dab
-0, 765000, 160, 0xbb1e5860
-0, 765900, 160, 0x526d4cea
-0, 766800, 160, 0xa4c445d6
-0, 767700, 160, 0x70cd49ba
-0, 768600, 160, 0x008c53a7
-0, 769500, 160, 0xf7174bca
-0, 770400, 160, 0x0bab4936
-0, 771300, 160, 0x59e5564d
-0, 772200, 160, 0x33045087
-0, 773100, 160, 0xde7454f0
-0, 774000, 160, 0x31184cc3
-0, 774900, 160, 0x37984bb3
-0, 775800, 160, 0xf5e052d4
-0, 776700, 160, 0x23ca4b42
-0, 777600, 160, 0xbe2a572b
-0, 778500, 160, 0x9a91538d
-0, 779400, 160, 0x8a994c40
-0, 780300, 160, 0x5dea51ee
-0, 781200, 160, 0x1b53524c
-0, 782100, 160, 0xd9e75227
-0, 783000, 160, 0x58384c3b
-0, 783900, 160, 0x4a1b53b2
-0, 784800, 160, 0xc2a3458a
-0, 785700, 160, 0x7f68502d
-0, 786600, 160, 0x85475559
-0, 787500, 160, 0xd0d25472
-0, 788400, 160, 0x4c0d4bbf
-0, 789300, 160, 0xcad352df
-0, 790200, 160, 0x17904c97
-0, 791100, 160, 0x4e774b8e
-0, 792000, 160, 0x21905952
-0, 792900, 160, 0xc2d950cd
-0, 793800, 160, 0xfdea55e6
-0, 794700, 160, 0x22ca4e37
-0, 795600, 160, 0x1143562a
-0, 796500, 160, 0xe83c583e
-0, 797400, 160, 0xba544b27
-0, 798300, 160, 0x1e8c50e4
-0, 799200, 160, 0xf7ca4d2a
-0, 800100, 160, 0x67764579
-0, 801000, 160, 0x40d74f42
-0, 801900, 160, 0x88e35360
-0, 802800, 160, 0xda3f4f5b
-0, 803700, 160, 0x19c1522f
-0, 804600, 160, 0x93ce4f78
-0, 805500, 160, 0xf65447ba
-0, 806400, 160, 0xc0bc4e5a
-0, 807300, 160, 0x4915572b
-0, 808200, 160, 0x1651460b
-0, 809100, 160, 0xffe552a5
-0, 810000, 160, 0x5bd351ab
-0, 810900, 160, 0xbbd85034
-0, 811800, 160, 0xb9ff505f
-0, 812700, 160, 0xfc104eaf
-0, 813600, 160, 0xdaa74d6c
-0, 814500, 160, 0x34b04d78
-0, 815400, 160, 0x1e924f70
-0, 816300, 160, 0x0d46512d
-0, 817200, 160, 0x0d115950
-0, 818100, 160, 0x62de55a4
-0, 819000, 160, 0x58d652ab
-0, 819900, 160, 0x1776584e
-0, 820800, 160, 0x60175a2b
-0, 821700, 160, 0x4d714c82
-0, 822600, 160, 0xe13c4ce0
-0, 823500, 160, 0x7cd15464
-0, 824400, 160, 0x6c87571a
-0, 825300, 160, 0x1abe4f07
-0, 826200, 160, 0x039d5661
-0, 827100, 160, 0x0eba5909
-0, 828000, 160, 0xa46e51ec
-0, 828900, 160, 0x9be44eb7
-0, 829800, 160, 0xe0634aad
-0, 830700, 160, 0xcd53530b
-0, 831600, 160, 0x12cd482c
-0, 832500, 160, 0x71884634
-0, 833400, 160, 0xd5845743
-0, 834300, 160, 0xacd1502c
-0, 835200, 160, 0x04795031
-0, 836100, 160, 0xf0df54b9
-0, 837000, 160, 0x43aa5155
-0, 837900, 160, 0x316a4988
-0, 838800, 160, 0xfbc64f8a
-0, 839700, 160, 0xda084e8e
-0, 840600, 160, 0x3cc34ce2
-0, 841500, 160, 0xbfc055d8
-0, 842400, 160, 0x20ef4876
-0, 843300, 160, 0x035a5660
-0, 844200, 160, 0xbc7255be
-0, 845100, 160, 0xba514f44
-0, 846000, 160, 0x868c4c9c
-0, 846900, 160, 0x83494f04
-0, 847800, 160, 0xa452521a
-0, 848700, 160, 0x2ed04f65
-0, 849600, 160, 0x2e3e592d
-0, 850500, 160, 0x82bc4763
-0, 851400, 160, 0x339950db
-0, 852300, 160, 0x5bb64eff
-0, 853200, 160, 0x347c4d85
-0, 854100, 160, 0x25e949a3
-0, 855000, 160, 0xbdf649a8
-0, 855900, 160, 0x498650f3
-0, 856800, 160, 0x2a6f4e60
-0, 857700, 160, 0x661e5697
-0, 858600, 160, 0x5d6150ca
-0, 859500, 160, 0xe7c74b8f
-0, 860400, 160, 0x1ae148da
-0, 861300, 160, 0xaeef485d
-0, 862200, 160, 0x105650c6
-0, 863100, 160, 0xc1c45376
-0, 864000, 160, 0x83c55011
-0, 864900, 160, 0x77025597
-0, 865800, 160, 0x324250b7
-0, 866700, 160, 0x5cdc570f
-0, 867600, 160, 0x292e52a1
-0, 868500, 160, 0x8d7a5090
-0, 869400, 160, 0x32fc54e4
-0, 870300, 160, 0x50984e8b
-0, 871200, 160, 0x07f442a0
-0, 872100, 160, 0xc91c4fc3
-0, 873000, 160, 0x06cf53d7
-0, 873900, 160, 0xa66c5923
-0, 874800, 160, 0xc2015120
-0, 875700, 160, 0xedfa50c4
-0, 876600, 160, 0xe4c85fb5
-0, 877500, 160, 0xcd7b4c65
-0, 878400, 160, 0xb22353c1
-0, 879300, 160, 0x298c5996
-0, 880200, 160, 0xefce51db
-0, 881100, 160, 0x6df74ee3
-0, 882000, 160, 0x7c46496b
-0, 882900, 160, 0x910a48a4
-0, 883800, 160, 0xbf504b1e
-0, 884700, 160, 0x096947e8
-0, 885600, 160, 0x4a07629d
-0, 886500, 160, 0x577b43c1
-0, 887400, 160, 0x939e4d6d
-0, 888300, 160, 0x486e48ac
-0, 889200, 160, 0x50064871
-0, 890100, 160, 0x4a255534
-0, 891000, 160, 0xc80d4618
-0, 891900, 160, 0xf18a4780
-0, 892800, 160, 0x1c274dd4
-0, 893700, 160, 0x2f3e4f7c
-0, 894600, 160, 0x44b24cc2
-0, 895500, 160, 0x89b451f4
-0, 896400, 160, 0x06515b65
-0, 897300, 160, 0xc5b857ce
-0, 898200, 160, 0xa47b47a7
-0, 899100, 160, 0xfb375448
diff --git a/tests/ref/fate/g729-1 b/tests/ref/fate/g729-1
deleted file mode 100644
index 6bf05c5efd..0000000000
--- a/tests/ref/fate/g729-1
+++ /dev/null
@@ -1,1000 +0,0 @@
-0, 0, 160, 0xf7e550f0
-0, 900, 160, 0x42794ea8
-0, 1800, 160, 0xfe023e42
-0, 2700, 160, 0xc1ae40e3
-0, 3600, 160, 0xee6d4bf1
-0, 4500, 160, 0x107451d7
-0, 5400, 160, 0x40cb4ba4
-0, 6300, 160, 0x90504e5e
-0, 7200, 160, 0xf6f3531d
-0, 8100, 160, 0x48664ea0
-0, 9000, 160, 0xa30458e1
-0, 9900, 160, 0x00b74aa2
-0, 10800, 160, 0x95234e49
-0, 11700, 160, 0x9cf24a94
-0, 12600, 160, 0x4f2952f4
-0, 13500, 160, 0x658353db
-0, 14400, 160, 0x98ef4d79
-0, 15300, 160, 0x765d5472
-0, 16200, 160, 0xc6e25262
-0, 17100, 160, 0x33334993
-0, 18000, 160, 0xfa104dc5
-0, 18900, 160, 0x03ee5530
-0, 19800, 160, 0x52c54e0e
-0, 20700, 160, 0xbd744638
-0, 21600, 160, 0x7775519f
-0, 22500, 160, 0xd22f499e
-0, 23400, 160, 0x26af4eec
-0, 24300, 160, 0x37474ed9
-0, 25200, 160, 0x6b19548d
-0, 26100, 160, 0x4a3449b7
-0, 27000, 160, 0x2bed5231
-0, 27900, 160, 0x556d5349
-0, 28800, 160, 0xbb6c5227
-0, 29700, 160, 0xea354b4d
-0, 30600, 160, 0xf35f4b7d
-0, 31500, 160, 0x9dcb4e9d
-0, 32400, 160, 0xc81f5ac2
-0, 33300, 160, 0xfa054cfd
-0, 34200, 160, 0x0c554e62
-0, 35100, 160, 0x7ffa5250
-0, 36000, 160, 0x7e5148ec
-0, 36900, 160, 0x95bc4d69
-0, 37800, 160, 0xf34a5644
-0, 38700, 160, 0xcaa3493d
-0, 39600, 160, 0xa44745dc
-0, 40500, 160, 0x320355c0
-0, 41400, 160, 0xbd1e5670
-0, 42300, 160, 0xfe3250cd
-0, 43200, 160, 0xce7a574c
-0, 44100, 160, 0x09b04f6e
-0, 45000, 160, 0x035759c8
-0, 45900, 160, 0x713458c7
-0, 46800, 160, 0x9a75494b
-0, 47700, 160, 0x99114fef
-0, 48600, 160, 0x129251f0
-0, 49500, 160, 0x4eb845f2
-0, 50400, 160, 0x5d064da5
-0, 51300, 160, 0x5a8e4a34
-0, 52200, 160, 0x5b784608
-0, 53100, 160, 0x1ca7546a
-0, 54000, 160, 0x327e5cbf
-0, 54900, 160, 0xd7ae4bc3
-0, 55800, 160, 0xba3f55b4
-0, 56700, 160, 0x09fe4ca7
-0, 57600, 160, 0x347248ba
-0, 58500, 160, 0xf0bf52ff
-0, 59400, 160, 0x3500507e
-0, 60300, 160, 0x30e65135
-0, 61200, 160, 0x390a5201
-0, 62100, 160, 0xf0dc5bca
-0, 63000, 160, 0x69b94f64
-0, 63900, 160, 0x6ac04cf6
-0, 64800, 160, 0xbc014cf4
-0, 65700, 160, 0x4b564eca
-0, 66600, 160, 0x33e44e85
-0, 67500, 160, 0xe39e5343
-0, 68400, 160, 0xebf64c80
-0, 69300, 160, 0x5a92562b
-0, 70200, 160, 0xe0075c88
-0, 71100, 160, 0x59bd55e8
-0, 72000, 160, 0xe6ca4ef2
-0, 72900, 160, 0xea9a4df2
-0, 73800, 160, 0xf53c4bf6
-0, 74700, 160, 0x977a4f32
-0, 75600, 160, 0xe5894eb2
-0, 76500, 160, 0x956c4c28
-0, 77400, 160, 0xdff74c3d
-0, 78300, 160, 0xace74db7
-0, 79200, 160, 0x00e74ef5
-0, 80100, 160, 0x6633560a
-0, 81000, 160, 0xd63647c5
-0, 81900, 160, 0xff144eef
-0, 82800, 160, 0xc5fe4d51
-0, 83700, 160, 0x5c244c7c
-0, 84600, 160, 0x95be50f1
-0, 85500, 160, 0x74d84b77
-0, 86400, 160, 0x1e965711
-0, 87300, 160, 0x7ae45ad7
-0, 88200, 160, 0xf9cd5920
-0, 89100, 160, 0xf0064ea9
-0, 90000, 160, 0xec645244
-0, 90900, 160, 0x8330539a
-0, 91800, 160, 0x4a5d5023
-0, 92700, 160, 0x706153d7
-0, 93600, 160, 0xd6e0520f
-0, 94500, 160, 0x0bd9586f
-0, 95400, 160, 0xc1554dec
-0, 96300, 160, 0x89be4bde
-0, 97200, 160, 0x0c2a49c0
-0, 98100, 160, 0xc18d498a
-0, 99000, 160, 0xc36147e1
-0, 99900, 160, 0x99de4d4b
-0, 100800, 160, 0x2b9d542b
-0, 101700, 160, 0x062b52c9
-0, 102600, 160, 0x9dcf542e
-0, 103500, 160, 0x641f58b9
-0, 104400, 160, 0x114c51ff
-0, 105300, 160, 0x78e04b0e
-0, 106200, 160, 0xfec74535
-0, 107100, 160, 0x71d54cd3
-0, 108000, 160, 0xee9e5289
-0, 108900, 160, 0x142354d9
-0, 109800, 160, 0x051e4ddc
-0, 110700, 160, 0x358146b8
-0, 111600, 160, 0x4dec58eb
-0, 112500, 160, 0xd0944f04
-0, 113400, 160, 0xdc025a99
-0, 114300, 160, 0x6b355402
-0, 115200, 160, 0x1c0b5a6d
-0, 116100, 160, 0xa3b34bc8
-0, 117000, 160, 0x92604eb7
-0, 117900, 160, 0x6f2f5465
-0, 118800, 160, 0xcb565361
-0, 119700, 160, 0x8bfb50a3
-0, 120600, 160, 0xf9114e99
-0, 121500, 160, 0x11065580
-0, 122400, 160, 0x903550c8
-0, 123300, 160, 0xe7aa3da8
-0, 124200, 160, 0x13f34e01
-0, 125100, 160, 0x4c3b4c0a
-0, 126000, 160, 0x08e64c60
-0, 126900, 160, 0xffcd6176
-0, 127800, 160, 0x09684f13
-0, 128700, 160, 0xd8a646b5
-0, 129600, 160, 0xc07355f0
-0, 130500, 160, 0xe836515b
-0, 131400, 160, 0x935741a5
-0, 132300, 160, 0x68f85160
-0, 133200, 160, 0x669a4ed0
-0, 134100, 160, 0xce9f4883
-0, 135000, 160, 0xd94c42de
-0, 135900, 160, 0xf1874b54
-0, 136800, 160, 0x42da46ce
-0, 137700, 160, 0xe99a4da5
-0, 138600, 160, 0x94934f16
-0, 139500, 160, 0x8571437f
-0, 140400, 160, 0xe4774dc2
-0, 141300, 160, 0x743f4f89
-0, 142200, 160, 0x3b3e50ba
-0, 143100, 160, 0x439355e9
-0, 144000, 160, 0x3e4d5178
-0, 144900, 160, 0x64595524
-0, 145800, 160, 0x42d14702
-0, 146700, 160, 0x051e4b1d
-0, 147600, 160, 0x5db84cee
-0, 148500, 160, 0x4d875136
-0, 149400, 160, 0x33b75996
-0, 150300, 160, 0xd5094d76
-0, 151200, 160, 0x6a7052b7
-0, 152100, 160, 0x77264c8f
-0, 153000, 160, 0xcf7e4ccf
-0, 153900, 160, 0x5f7c568b
-0, 154800, 160, 0x8886578b
-0, 155700, 160, 0xd33a4e52
-0, 156600, 160, 0xeefe5c23
-0, 157500, 160, 0xa9c94e38
-0, 158400, 160, 0x67845aa0
-0, 159300, 160, 0xbe91498f
-0, 160200, 160, 0x843d46e3
-0, 161100, 160, 0xbd215999
-0, 162000, 160, 0x1a2e5f2c
-0, 162900, 160, 0x6a344a63
-0, 163800, 160, 0xd80d5743
-0, 164700, 160, 0x80964879
-0, 165600, 160, 0xaafb5e35
-0, 166500, 160, 0x3b855ff3
-0, 167400, 160, 0x770b51d0
-0, 168300, 160, 0x623a5312
-0, 169200, 160, 0x0c235b56
-0, 170100, 160, 0xc8c25724
-0, 171000, 160, 0xb44650e2
-0, 171900, 160, 0xab964d47
-0, 172800, 160, 0x7aa35107
-0, 173700, 160, 0xf12d4780
-0, 174600, 160, 0x77e64f92
-0, 175500, 160, 0x34ee4fa0
-0, 176400, 160, 0x6701466b
-0, 177300, 160, 0xa79d4b4c
-0, 178200, 160, 0xbb7f557b
-0, 179100, 160, 0xaeb253c4
-0, 180000, 160, 0xe7255029
-0, 180900, 160, 0xa5f1505c
-0, 181800, 160, 0x4ae54f09
-0, 182700, 160, 0x6a2b4bc9
-0, 183600, 160, 0xf8724ea5
-0, 184500, 160, 0x4ab35317
-0, 185400, 160, 0xc8d350fb
-0, 186300, 160, 0x73a74994
-0, 187200, 160, 0x9cd1596d
-0, 188100, 160, 0x5ba16005
-0, 189000, 160, 0xb17e4fcc
-0, 189900, 160, 0x8ac958cd
-0, 190800, 160, 0x7919557f
-0, 191700, 160, 0x0be35121
-0, 192600, 160, 0xf8f752f2
-0, 193500, 160, 0xae894d40
-0, 194400, 160, 0x03d94c10
-0, 195300, 160, 0xf12c4917
-0, 196200, 160, 0x3c94534e
-0, 197100, 160, 0x111d51c3
-0, 198000, 160, 0x0a285304
-0, 198900, 160, 0xc3ac4ab1
-0, 199800, 160, 0x5576579d
-0, 200700, 160, 0x9cd04f10
-0, 201600, 160, 0x38a04bf9
-0, 202500, 160, 0xbd0d4d6d
-0, 203400, 160, 0x4db24510
-0, 204300, 160, 0x968753de
-0, 205200, 160, 0x1fa35c67
-0, 206100, 160, 0xc9c048bc
-0, 207000, 160, 0x221d629e
-0, 207900, 160, 0xbb864b0e
-0, 208800, 160, 0xe2964bcd
-0, 209700, 160, 0x20ff4b23
-0, 210600, 160, 0x01dc53e7
-0, 211500, 160, 0x522b56aa
-0, 212400, 160, 0x1e6a495a
-0, 213300, 160, 0x0dcf5731
-0, 214200, 160, 0x241f448d
-0, 215100, 160, 0xdafa55b6
-0, 216000, 160, 0x40584e43
-0, 216900, 160, 0xb73850ab
-0, 217800, 160, 0x7cff593a
-0, 218700, 160, 0x2796515a
-0, 219600, 160, 0x872c5454
-0, 220500, 160, 0xa13058e7
-0, 221400, 160, 0xd8a65261
-0, 222300, 160, 0x48a75601
-0, 223200, 160, 0xb1e7584c
-0, 224100, 160, 0x29cd53fa
-0, 225000, 160, 0xba514d84
-0, 225900, 160, 0x747f4f99
-0, 226800, 160, 0x5819526e
-0, 227700, 160, 0x10185413
-0, 228600, 160, 0x4d084cdc
-0, 229500, 160, 0x8313530b
-0, 230400, 160, 0xd26c5583
-0, 231300, 160, 0x76d749f9
-0, 232200, 160, 0x7cf847a5
-0, 233100, 160, 0xa642590c
-0, 234000, 160, 0x7fef56f2
-0, 234900, 160, 0xf6ea49b9
-0, 235800, 160, 0x6c654e89
-0, 236700, 160, 0x164f56e9
-0, 237600, 160, 0x84cf6139
-0, 238500, 160, 0x20c753ef
-0, 239400, 160, 0x3f3a485f
-0, 240300, 160, 0xee0c5f4b
-0, 241200, 160, 0x706b5313
-0, 242100, 160, 0x47da5af3
-0, 243000, 160, 0x05504b25
-0, 243900, 160, 0x584e59d8
-0, 244800, 160, 0xe9cc4e37
-0, 245700, 160, 0xf33b518a
-0, 246600, 160, 0xb9ac58b7
-0, 247500, 160, 0xed5c57f0
-0, 248400, 160, 0x4cf1579d
-0, 249300, 160, 0x96f94792
-0, 250200, 160, 0x7c455836
-0, 251100, 160, 0xad6652ce
-0, 252000, 160, 0x1ba95cab
-0, 252900, 160, 0xd86755bb
-0, 253800, 160, 0x2f9e51b4
-0, 254700, 160, 0x084e5119
-0, 255600, 160, 0x54ad5449
-0, 256500, 160, 0xff7c5b86
-0, 257400, 160, 0x29a94fff
-0, 258300, 160, 0x679c55ff
-0, 259200, 160, 0x9a415b81
-0, 260100, 160, 0x3ea5528a
-0, 261000, 160, 0x54e15d3f
-0, 261900, 160, 0x122b5c28
-0, 262800, 160, 0xdc0f4e7f
-0, 263700, 160, 0xdc304acd
-0, 264600, 160, 0xe55e5407
-0, 265500, 160, 0x8d07485f
-0, 266400, 160, 0xdc0b5333
-0, 267300, 160, 0xfaed4a90
-0, 268200, 160, 0xb0625538
-0, 269100, 160, 0x1ef3526b
-0, 270000, 160, 0xb48c48e9
-0, 270900, 160, 0x8c945190
-0, 271800, 160, 0x7f9a58b3
-0, 272700, 160, 0x55735499
-0, 273600, 160, 0xeba34a71
-0, 274500, 160, 0xbaa94a6d
-0, 275400, 160, 0x15ab484f
-0, 276300, 160, 0xdc675509
-0, 277200, 160, 0xc2e94f0e
-0, 278100, 160, 0xd7f348ac
-0, 279000, 160, 0x14884e8f
-0, 279900, 160, 0x2d274a97
-0, 280800, 160, 0x578c5834
-0, 281700, 160, 0x12074dab
-0, 282600, 160, 0x74c55067
-0, 283500, 160, 0x7c904e0f
-0, 284400, 160, 0x81d45735
-0, 285300, 160, 0x766f4d71
-0, 286200, 160, 0x9c915273
-0, 287100, 160, 0xf37f4d04
-0, 288000, 160, 0x1ac74d66
-0, 288900, 160, 0xf9b253ab
-0, 289800, 160, 0x6e0c5bb2
-0, 290700, 160, 0x603d629e
-0, 291600, 160, 0xbb674faf
-0, 292500, 160, 0x5d8d51c6
-0, 293400, 160, 0xae7350b9
-0, 294300, 160, 0xfde859ec
-0, 295200, 160, 0x900d50a4
-0, 296100, 160, 0x003551b2
-0, 297000, 160, 0xf8ae4c9d
-0, 297900, 160, 0x66ea508f
-0, 298800, 160, 0xd45b4c51
-0, 299700, 160, 0xb64451a3
-0, 300600, 160, 0x6d2a5621
-0, 301500, 160, 0x71db4d36
-0, 302400, 160, 0x06704647
-0, 303300, 160, 0x1f124cf9
-0, 304200, 160, 0x10d14b46
-0, 305100, 160, 0x421b59d8
-0, 306000, 160, 0x84ba4cae
-0, 306900, 160, 0x4fba48e1
-0, 307800, 160, 0xec294a6b
-0, 308700, 160, 0x2f1752a7
-0, 309600, 160, 0x8d665570
-0, 310500, 160, 0x586e537d
-0, 311400, 160, 0x18d54a49
-0, 312300, 160, 0xa895566d
-0, 313200, 160, 0xb9b35255
-0, 314100, 160, 0x2e194e1f
-0, 315000, 160, 0x4810594b
-0, 315900, 160, 0xb82557ee
-0, 316800, 160, 0x35d84d67
-0, 317700, 160, 0x5ee95128
-0, 318600, 160, 0x24f05747
-0, 319500, 160, 0x434d53f6
-0, 320400, 160, 0x3c894f3e
-0, 321300, 160, 0x81c34896
-0, 322200, 160, 0x7540543c
-0, 323100, 160, 0x35bc5504
-0, 324000, 160, 0x546943dc
-0, 324900, 160, 0x084d46e9
-0, 325800, 160, 0x983852ba
-0, 326700, 160, 0xefac4e15
-0, 327600, 160, 0xc9294430
-0, 328500, 160, 0xe9e74de1
-0, 329400, 160, 0x4ca1516a
-0, 330300, 160, 0x44014ceb
-0, 331200, 160, 0x1dbc5ad1
-0, 332100, 160, 0x98be4efd
-0, 333000, 160, 0x2dc75c7a
-0, 333900, 160, 0x46275852
-0, 334800, 160, 0x61c15d30
-0, 335700, 160, 0x1f605adc
-0, 336600, 160, 0xf08659ac
-0, 337500, 160, 0xb7656021
-0, 338400, 160, 0x1f4a5a72
-0, 339300, 160, 0xf8175275
-0, 340200, 160, 0xbbf4564d
-0, 341100, 160, 0x6fdc5a7d
-0, 342000, 160, 0x082f5250
-0, 342900, 160, 0x84cb55b5
-0, 343800, 160, 0x0e1a51ba
-0, 344700, 160, 0xa84e52fc
-0, 345600, 160, 0xcb5a55c9
-0, 346500, 160, 0x9ce6570d
-0, 347400, 160, 0x82b253cc
-0, 348300, 160, 0x34c4594b
-0, 349200, 160, 0xff5c5854
-0, 350100, 160, 0xd5da4ea0
-0, 351000, 160, 0xc86e5553
-0, 351900, 160, 0x7ecb55c6
-0, 352800, 160, 0xb08b5338
-0, 353700, 160, 0xd601573c
-0, 354600, 160, 0x93305092
-0, 355500, 160, 0x352d4912
-0, 356400, 160, 0xddba4d29
-0, 357300, 160, 0xc79c50b7
-0, 358200, 160, 0xe67d4e8e
-0, 359100, 160, 0xdbfd4bbc
-0, 360000, 160, 0xb2f746fb
-0, 360900, 160, 0x835b5539
-0, 361800, 160, 0x612049e9
-0, 362700, 160, 0x91a6503c
-0, 363600, 160, 0x762e4f0e
-0, 364500, 160, 0x2b2153f9
-0, 365400, 160, 0xdcfe5804
-0, 366300, 160, 0x79144cae
-0, 367200, 160, 0xd6394d99
-0, 368100, 160, 0x22395292
-0, 369000, 160, 0x50b04fa0
-0, 369900, 160, 0x846b49a5
-0, 370800, 160, 0x1f554dff
-0, 371700, 160, 0x0aa458dd
-0, 372600, 160, 0x62154dde
-0, 373500, 160, 0xe69847ac
-0, 374400, 160, 0x75855425
-0, 375300, 160, 0x49125665
-0, 376200, 160, 0xa8605945
-0, 377100, 160, 0xc02a5083
-0, 378000, 160, 0x6198537c
-0, 378900, 160, 0x90f25711
-0, 379800, 160, 0x32da51f1
-0, 380700, 160, 0x96c3474d
-0, 381600, 160, 0x82ae4579
-0, 382500, 160, 0xbabf5919
-0, 383400, 160, 0x78095772
-0, 384300, 160, 0x46964abb
-0, 385200, 160, 0x5fcb5ba3
-0, 386100, 160, 0x4a775585
-0, 387000, 160, 0xc41f53af
-0, 387900, 160, 0x457251bc
-0, 388800, 160, 0x8f864fb3
-0, 389700, 160, 0x439d526c
-0, 390600, 160, 0x5cf6503f
-0, 391500, 160, 0x90b7534f
-0, 392400, 160, 0xecc45253
-0, 393300, 160, 0x533b4ee3
-0, 394200, 160, 0x4cc44f27
-0, 395100, 160, 0x6ff35096
-0, 396000, 160, 0x141e4a80
-0, 396900, 160, 0x9e075461
-0, 397800, 160, 0xc4b55791
-0, 398700, 160, 0x40955666
-0, 399600, 160, 0x6255462f
-0, 400500, 160, 0x2cec55d6
-0, 401400, 160, 0xd71652e9
-0, 402300, 160, 0xe65e530c
-0, 403200, 160, 0xeeb9556d
-0, 404100, 160, 0x558f523e
-0, 405000, 160, 0x76e14b00
-0, 405900, 160, 0x3f9f4e9b
-0, 406800, 160, 0x0d7b492a
-0, 407700, 160, 0xdd6e51bd
-0, 408600, 160, 0x5ab353b9
-0, 409500, 160, 0x5b934f33
-0, 410400, 160, 0x36bb57a0
-0, 411300, 160, 0x455d54d3
-0, 412200, 160, 0x7e6853d7
-0, 413100, 160, 0xdcb85ed4
-0, 414000, 160, 0x3a8d5860
-0, 414900, 160, 0x5c90558f
-0, 415800, 160, 0x25504d46
-0, 416700, 160, 0x0fc55413
-0, 417600, 160, 0x98545409
-0, 418500, 160, 0x963b550e
-0, 419400, 160, 0x544a569c
-0, 420300, 160, 0x7ab65f77
-0, 421200, 160, 0x14c257e2
-0, 422100, 160, 0x6cac6262
-0, 423000, 160, 0x2f7f5091
-0, 423900, 160, 0xc2655462
-0, 424800, 160, 0xbb4b4744
-0, 425700, 160, 0x4c5f54db
-0, 426600, 160, 0x9e694ab5
-0, 427500, 160, 0xc2c95173
-0, 428400, 160, 0xf4ae553f
-0, 429300, 160, 0xb4c04ed1
-0, 430200, 160, 0xf3095128
-0, 431100, 160, 0x73b04de1
-0, 432000, 160, 0xff4951c7
-0, 432900, 160, 0x28c156bd
-0, 433800, 160, 0x17b652aa
-0, 434700, 160, 0xb9ce528b
-0, 435600, 160, 0x3cc558be
-0, 436500, 160, 0xdf385905
-0, 437400, 160, 0xe2de4fe2
-0, 438300, 160, 0xc2a6582d
-0, 439200, 160, 0xe5715bc9
-0, 440100, 160, 0x741b6416
-0, 441000, 160, 0xf9b1544f
-0, 441900, 160, 0x012e5f01
-0, 442800, 160, 0x5ab65a49
-0, 443700, 160, 0xfe1e5b1a
-0, 444600, 160, 0x370056ef
-0, 445500, 160, 0xfde45ed4
-0, 446400, 160, 0xa34f6053
-0, 447300, 160, 0x31755604
-0, 448200, 160, 0xc3415bfe
-0, 449100, 160, 0xe5dd5b58
-0, 450000, 160, 0xb6cf5295
-0, 450900, 160, 0x3d81538b
-0, 451800, 160, 0xc00255d2
-0, 452700, 160, 0xb0714f71
-0, 453600, 160, 0x9c9756ac
-0, 454500, 160, 0x4de053a0
-0, 455400, 160, 0x6706500c
-0, 456300, 160, 0x34e4511d
-0, 457200, 160, 0xe4224e3e
-0, 458100, 160, 0xdf695529
-0, 459000, 160, 0xeb1f54e0
-0, 459900, 160, 0x2870550e
-0, 460800, 160, 0x08465464
-0, 461700, 160, 0xe34150e6
-0, 462600, 160, 0xb77556e0
-0, 463500, 160, 0xb23e46ab
-0, 464400, 160, 0x83884a7b
-0, 465300, 160, 0xa0284b16
-0, 466200, 160, 0x87b749e1
-0, 467100, 160, 0x4b276444
-0, 468000, 160, 0x92f95091
-0, 468900, 160, 0x2b1056c2
-0, 469800, 160, 0xd5d5590a
-0, 470700, 160, 0x5a454fac
-0, 471600, 160, 0x0ab05b13
-0, 472500, 160, 0xd98e56ca
-0, 473400, 160, 0x183d5892
-0, 474300, 160, 0x8ba951e4
-0, 475200, 160, 0x487054ff
-0, 476100, 160, 0xc0d05562
-0, 477000, 160, 0x166c590f
-0, 477900, 160, 0x3e254cc0
-0, 478800, 160, 0xd2784ab4
-0, 479700, 160, 0x9f7b4ef6
-0, 480600, 160, 0xdd7653b6
-0, 481500, 160, 0x7ae453b7
-0, 482400, 160, 0xff6c50ec
-0, 483300, 160, 0xfa0d51a9
-0, 484200, 160, 0x29ab583b
-0, 485100, 160, 0x671d5437
-0, 486000, 160, 0x6867569f
-0, 486900, 160, 0xdd775e05
-0, 487800, 160, 0xbafa65ed
-0, 488700, 160, 0xd33f5aea
-0, 489600, 160, 0x851455a8
-0, 490500, 160, 0x044c4d45
-0, 491400, 160, 0xcd7c5d84
-0, 492300, 160, 0xd6565e61
-0, 493200, 160, 0x2f345a92
-0, 494100, 160, 0x50e05530
-0, 495000, 160, 0x787f516a
-0, 495900, 160, 0x75cd5ade
-0, 496800, 160, 0x55b558ad
-0, 497700, 160, 0x55255b01
-0, 498600, 160, 0xfc5b5945
-0, 499500, 160, 0x33914e05
-0, 500400, 160, 0x1f4a5c31
-0, 501300, 160, 0x542f4bf2
-0, 502200, 160, 0xd8b2573f
-0, 503100, 160, 0x127758b0
-0, 504000, 160, 0x18dd5a30
-0, 504900, 160, 0xe8ce61c4
-0, 505800, 160, 0x9a225b47
-0, 506700, 160, 0xd4436314
-0, 507600, 160, 0x2bf06310
-0, 508500, 160, 0x0de35e82
-0, 509400, 160, 0x76cb56f2
-0, 510300, 160, 0x65bc569b
-0, 511200, 160, 0x00a45461
-0, 512100, 160, 0xb5c55019
-0, 513000, 160, 0x5eb04b4d
-0, 513900, 160, 0xf1224c39
-0, 514800, 160, 0x4d135288
-0, 515700, 160, 0x9bc34ba7
-0, 516600, 160, 0xbde3510e
-0, 517500, 160, 0xefaf4fa4
-0, 518400, 160, 0x584950e2
-0, 519300, 160, 0x1e844e27
-0, 520200, 160, 0x38634315
-0, 521100, 160, 0x6b9b4a0b
-0, 522000, 160, 0xd491512a
-0, 522900, 160, 0x8624478c
-0, 523800, 160, 0x67ab45c7
-0, 524700, 160, 0xf78e4c53
-0, 525600, 160, 0xb1654f0d
-0, 526500, 160, 0x17bb4e96
-0, 527400, 160, 0xf3165e7c
-0, 528300, 160, 0xf7914633
-0, 529200, 160, 0x3421530f
-0, 530100, 160, 0x492e572c
-0, 531000, 160, 0xa3185319
-0, 531900, 160, 0x92d054c0
-0, 532800, 160, 0x1cc24ce1
-0, 533700, 160, 0x2ebc519e
-0, 534600, 160, 0x946b53e7
-0, 535500, 160, 0xf85c4fe6
-0, 536400, 160, 0x2974534c
-0, 537300, 160, 0xef7e4a28
-0, 538200, 160, 0x01a74c6e
-0, 539100, 160, 0x2a865674
-0, 540000, 160, 0x70474faf
-0, 540900, 160, 0x2df75014
-0, 541800, 160, 0xf1f3574e
-0, 542700, 160, 0x741b5308
-0, 543600, 160, 0xcb34513e
-0, 544500, 160, 0x7b5e50c7
-0, 545400, 160, 0x0165553b
-0, 546300, 160, 0x04b85450
-0, 547200, 160, 0x795d5873
-0, 548100, 160, 0x508859fb
-0, 549000, 160, 0xca09587d
-0, 549900, 160, 0x86a65ac8
-0, 550800, 160, 0x447353fe
-0, 551700, 160, 0x48ca54a5
-0, 552600, 160, 0x1b3e5f3e
-0, 553500, 160, 0x270a5aa2
-0, 554400, 160, 0x48a45c29
-0, 555300, 160, 0xfbf75a0b
-0, 556200, 160, 0xe65161e5
-0, 557100, 160, 0xf47c6701
-0, 558000, 160, 0xc12058bc
-0, 558900, 160, 0xdb17520c
-0, 559800, 160, 0x860455bd
-0, 560700, 160, 0xa02d56de
-0, 561600, 160, 0xf5574c7d
-0, 562500, 160, 0x500e59b3
-0, 563400, 160, 0xf0b75894
-0, 564300, 160, 0x9d454a04
-0, 565200, 160, 0x0b0554a4
-0, 566100, 160, 0x3fc34d98
-0, 567000, 160, 0x538550b8
-0, 567900, 160, 0xd84e495e
-0, 568800, 160, 0x736c4e17
-0, 569700, 160, 0xa59e5607
-0, 570600, 160, 0xe7485609
-0, 571500, 160, 0x20185a67
-0, 572400, 160, 0x9aa5576f
-0, 573300, 160, 0xed8c5d11
-0, 574200, 160, 0xecef5494
-0, 575100, 160, 0x76f75a5c
-0, 576000, 160, 0xa8fa5322
-0, 576900, 160, 0xd1945734
-0, 577800, 160, 0x817f5c82
-0, 578700, 160, 0x40756063
-0, 579600, 160, 0x524454c7
-0, 580500, 160, 0x5a776106
-0, 581400, 160, 0xd16e5d9d
-0, 582300, 160, 0x8522524c
-0, 583200, 160, 0x4a115bb9
-0, 584100, 160, 0xbf5c5c27
-0, 585000, 160, 0x48905da4
-0, 585900, 160, 0x58735040
-0, 586800, 160, 0x48635631
-0, 587700, 160, 0xf1305eaf
-0, 588600, 160, 0xd34451bd
-0, 589500, 160, 0x1a244fcf
-0, 590400, 160, 0xdb995ca0
-0, 591300, 160, 0xe38e52bb
-0, 592200, 160, 0x00715069
-0, 593100, 160, 0x72a95190
-0, 594000, 160, 0xea7d50b7
-0, 594900, 160, 0xb4094a9c
-0, 595800, 160, 0xd5284d79
-0, 596700, 160, 0x3c4349e5
-0, 597600, 160, 0x65d34e92
-0, 598500, 160, 0x67805756
-0, 599400, 160, 0x1b96502f
-0, 600300, 160, 0x395250ae
-0, 601200, 160, 0x4dc74976
-0, 602100, 160, 0x2666486e
-0, 603000, 160, 0x41924d01
-0, 603900, 160, 0x94a845f5
-0, 604800, 160, 0x1b264cf9
-0, 605700, 160, 0x63ea4aab
-0, 606600, 160, 0x9c0d4a82
-0, 607500, 160, 0x02ba4cf6
-0, 608400, 160, 0x9cd54b87
-0, 609300, 160, 0x24624c5b
-0, 610200, 160, 0x14cf54b1
-0, 611100, 160, 0xce54544b
-0, 612000, 160, 0x459b4fc9
-0, 612900, 160, 0xcc2453f1
-0, 613800, 160, 0xa4ab53bc
-0, 614700, 160, 0x92235013
-0, 615600, 160, 0xbfa257b3
-0, 616500, 160, 0xd32d51f5
-0, 617400, 160, 0x7d5d47e6
-0, 618300, 160, 0xe23d43ed
-0, 619200, 160, 0x51d8514f
-0, 620100, 160, 0x0fa04240
-0, 621000, 160, 0x233c4dce
-0, 621900, 160, 0xcd30466f
-0, 622800, 160, 0x4435546a
-0, 623700, 160, 0x3eb6445b
-0, 624600, 160, 0xcaed4ef9
-0, 625500, 160, 0xf0174da8
-0, 626400, 160, 0x60e756a0
-0, 627300, 160, 0x72ba457d
-0, 628200, 160, 0x84ce4f0f
-0, 629100, 160, 0x660d45ae
-0, 630000, 160, 0xac8446e2
-0, 630900, 160, 0xeeb153b4
-0, 631800, 160, 0x6a634c23
-0, 632700, 160, 0x890f4af8
-0, 633600, 160, 0x1d3743a7
-0, 634500, 160, 0xa37e4ee8
-0, 635400, 160, 0xb9334d56
-0, 636300, 160, 0xc1384bef
-0, 637200, 160, 0x52964f6e
-0, 638100, 160, 0xe36e57e2
-0, 639000, 160, 0x62114a53
-0, 639900, 160, 0xb1f855bb
-0, 640800, 160, 0xf0934da0
-0, 641700, 160, 0xb454494a
-0, 642600, 160, 0xb6e04b15
-0, 643500, 160, 0x933e488e
-0, 644400, 160, 0x762d5ce8
-0, 645300, 160, 0x1c4a4f85
-0, 646200, 160, 0xaaa25313
-0, 647100, 160, 0xd3655979
-0, 648000, 160, 0x8ff149e5
-0, 648900, 160, 0x5d5e51fb
-0, 649800, 160, 0x0a354c51
-0, 650700, 160, 0x79ea52ee
-0, 651600, 160, 0x306e5365
-0, 652500, 160, 0x7e03546a
-0, 653400, 160, 0x71575ddf
-0, 654300, 160, 0x08da523d
-0, 655200, 160, 0x2a2152b2
-0, 656100, 160, 0x50e55447
-0, 657000, 160, 0xf3b55758
-0, 657900, 160, 0xc29d5f12
-0, 658800, 160, 0x0c0b5778
-0, 659700, 160, 0x1b07593a
-0, 660600, 160, 0x946f562d
-0, 661500, 160, 0xcdc85636
-0, 662400, 160, 0x2421589b
-0, 663300, 160, 0x8e3b5451
-0, 664200, 160, 0xd565536a
-0, 665100, 160, 0x8d225557
-0, 666000, 160, 0xa0084e44
-0, 666900, 160, 0x85bd5413
-0, 667800, 160, 0xa4be4c3b
-0, 668700, 160, 0x332957c8
-0, 669600, 160, 0x60505225
-0, 670500, 160, 0x3d154eb3
-0, 671400, 160, 0xd85359f4
-0, 672300, 160, 0xf95b4f6b
-0, 673200, 160, 0x8bea5846
-0, 674100, 160, 0x43835a02
-0, 675000, 160, 0x340b5732
-0, 675900, 160, 0x8b6d5005
-0, 676800, 160, 0xa4995aca
-0, 677700, 160, 0x88d34efc
-0, 678600, 160, 0x078e5003
-0, 679500, 160, 0x09964b19
-0, 680400, 160, 0x2eaf5120
-0, 681300, 160, 0x52514d52
-0, 682200, 160, 0x08f84d4c
-0, 683100, 160, 0x4a9b4cc7
-0, 684000, 160, 0x947f4ca6
-0, 684900, 160, 0x086a4f32
-0, 685800, 160, 0x0e0857a6
-0, 686700, 160, 0x38145bf7
-0, 687600, 160, 0xc6e156bf
-0, 688500, 160, 0xb07853b2
-0, 689400, 160, 0xaeda5172
-0, 690300, 160, 0xc4e54d07
-0, 691200, 160, 0x0b075a61
-0, 692100, 160, 0x09f05c1f
-0, 693000, 160, 0xf5415796
-0, 693900, 160, 0xe3be584e
-0, 694800, 160, 0x6e1656f9
-0, 695700, 160, 0xd6d85599
-0, 696600, 160, 0xd9b4502e
-0, 697500, 160, 0x1186598c
-0, 698400, 160, 0x879c543d
-0, 699300, 160, 0x5b2551a3
-0, 700200, 160, 0xcf50528d
-0, 701100, 160, 0x95d059b2
-0, 702000, 160, 0x34ba5515
-0, 702900, 160, 0x7a014ba8
-0, 703800, 160, 0x27725169
-0, 704700, 160, 0x2fd14ca4
-0, 705600, 160, 0xd5ad542a
-0, 706500, 160, 0xddc24d2e
-0, 707400, 160, 0x8a4b48b4
-0, 708300, 160, 0x915e4a29
-0, 709200, 160, 0xd56d4cae
-0, 710100, 160, 0x59594eea
-0, 711000, 160, 0x87085338
-0, 711900, 160, 0xa5ee538f
-0, 712800, 160, 0xf34e5030
-0, 713700, 160, 0x6bef4da7
-0, 714600, 160, 0x05a14c52
-0, 715500, 160, 0x67bc49ce
-0, 716400, 160, 0xb18f4cff
-0, 717300, 160, 0x5d744e6d
-0, 718200, 160, 0xcb7c5973
-0, 719100, 160, 0x6df056f0
-0, 720000, 160, 0xd62c4e00
-0, 720900, 160, 0xa54d4d1e
-0, 721800, 160, 0xdaa250b0
-0, 722700, 160, 0x350e475f
-0, 723600, 160, 0x0e454bb2
-0, 724500, 160, 0xe37949ca
-0, 725400, 160, 0x551453bf
-0, 726300, 160, 0x35d04c27
-0, 727200, 160, 0x6749469d
-0, 728100, 160, 0x544752e9
-0, 729000, 160, 0xf23b4888
-0, 729900, 160, 0x6f0a5519
-0, 730800, 160, 0x808a58df
-0, 731700, 160, 0x8e674c88
-0, 732600, 160, 0xd3ab51f7
-0, 733500, 160, 0x985d500f
-0, 734400, 160, 0x734e52d8
-0, 735300, 160, 0xb0da5227
-0, 736200, 160, 0xcc7d4a21
-0, 737100, 160, 0xb1354baf
-0, 738000, 160, 0xfc8d4f9a
-0, 738900, 160, 0x6f044d82
-0, 739800, 160, 0x41e7546b
-0, 740700, 160, 0x67014682
-0, 741600, 160, 0x5516575b
-0, 742500, 160, 0x26254693
-0, 743400, 160, 0x81ce4af5
-0, 744300, 160, 0x77f152a0
-0, 745200, 160, 0x995a5096
-0, 746100, 160, 0x6114532e
-0, 747000, 160, 0x4df457f3
-0, 747900, 160, 0xbcd94804
-0, 748800, 160, 0x1e544fd2
-0, 749700, 160, 0xa70b5954
-0, 750600, 160, 0x1c77484c
-0, 751500, 160, 0xb07f4c42
-0, 752400, 160, 0x62074f1f
-0, 753300, 160, 0xf3b656a1
-0, 754200, 160, 0x65734ac0
-0, 755100, 160, 0x2a9752cd
-0, 756000, 160, 0x15ff4ef0
-0, 756900, 160, 0xabd4532c
-0, 757800, 160, 0x8a44503a
-0, 758700, 160, 0xbf4250f3
-0, 759600, 160, 0x17594ac5
-0, 760500, 160, 0x7b5e4b24
-0, 761400, 160, 0x24684cb5
-0, 762300, 160, 0xc4d54b42
-0, 763200, 160, 0xd48f58af
-0, 764100, 160, 0x0374593a
-0, 765000, 160, 0x398a5b0d
-0, 765900, 160, 0xf60855e6
-0, 766800, 160, 0x6fbb5587
-0, 767700, 160, 0x44405c2b
-0, 768600, 160, 0xa6345d70
-0, 769500, 160, 0x464557d5
-0, 770400, 160, 0x0c3153ca
-0, 771300, 160, 0x15ec50c4
-0, 772200, 160, 0xd5e559da
-0, 773100, 160, 0x999757b9
-0, 774000, 160, 0x7a5d5754
-0, 774900, 160, 0xf85b5f18
-0, 775800, 160, 0xa66d5c72
-0, 776700, 160, 0xd8f55981
-0, 777600, 160, 0xe6364f64
-0, 778500, 160, 0x528a5785
-0, 779400, 160, 0xdefe5332
-0, 780300, 160, 0x4bc4532e
-0, 781200, 160, 0x505a4eb3
-0, 782100, 160, 0xa28d589d
-0, 783000, 160, 0x092d511f
-0, 783900, 160, 0x3079591e
-0, 784800, 160, 0x2b1d5339
-0, 785700, 160, 0xf8d849d1
-0, 786600, 160, 0xadb056a6
-0, 787500, 160, 0x2ee74c4f
-0, 788400, 160, 0x35c34c9f
-0, 789300, 160, 0xb6ae53d3
-0, 790200, 160, 0x7258534e
-0, 791100, 160, 0xb76d4b1b
-0, 792000, 160, 0x99a14a0f
-0, 792900, 160, 0x88365944
-0, 793800, 160, 0x97cf4aed
-0, 794700, 160, 0x444b56f6
-0, 795600, 160, 0x1d1f4b01
-0, 796500, 160, 0x3dcd417e
-0, 797400, 160, 0xa4985140
-0, 798300, 160, 0x86f94c4d
-0, 799200, 160, 0xc3635436
-0, 800100, 160, 0x198b432b
-0, 801000, 160, 0xae5253e4
-0, 801900, 160, 0x248c4f1a
-0, 802800, 160, 0x787a45df
-0, 803700, 160, 0x5fd44cad
-0, 804600, 160, 0x68be581c
-0, 805500, 160, 0x5ff5531b
-0, 806400, 160, 0x2bcd4aa1
-0, 807300, 160, 0x0d134a7c
-0, 808200, 160, 0x28af5885
-0, 809100, 160, 0xc09f4d65
-0, 810000, 160, 0x7468552d
-0, 810900, 160, 0x82df49ac
-0, 811800, 160, 0xe3725fdc
-0, 812700, 160, 0x0ec74d11
-0, 813600, 160, 0xfc2a5355
-0, 814500, 160, 0x41df4d4f
-0, 815400, 160, 0x4ebe473d
-0, 816300, 160, 0xd8734bf2
-0, 817200, 160, 0x4acd5056
-0, 818100, 160, 0x47805700
-0, 819000, 160, 0xe4f25135
-0, 819900, 160, 0x9f195649
-0, 820800, 160, 0x8b055f64
-0, 821700, 160, 0xc4b751c8
-0, 822600, 160, 0x95e55ba4
-0, 823500, 160, 0xf0955494
-0, 824400, 160, 0xca1a47b9
-0, 825300, 160, 0x9d025711
-0, 826200, 160, 0xf6cb4a0a
-0, 827100, 160, 0xd8385b4d
-0, 828000, 160, 0x7b2852b6
-0, 828900, 160, 0x90a35643
-0, 829800, 160, 0x63105d0a
-0, 830700, 160, 0x55414083
-0, 831600, 160, 0xc94554a9
-0, 832500, 160, 0xa88f4a36
-0, 833400, 160, 0xda5d52bc
-0, 834300, 160, 0x5b3943da
-0, 835200, 160, 0xd2314755
-0, 836100, 160, 0x743c4cdc
-0, 837000, 160, 0x7c3e4dc2
-0, 837900, 160, 0x12644715
-0, 838800, 160, 0x1050480b
-0, 839700, 160, 0x73645906
-0, 840600, 160, 0x28ef4a9e
-0, 841500, 160, 0xf72440bc
-0, 842400, 160, 0x41964bda
-0, 843300, 160, 0x2afb4d9b
-0, 844200, 160, 0xf74b4c5a
-0, 845100, 160, 0xcf165e2e
-0, 846000, 160, 0x3dbb4d06
-0, 846900, 160, 0xbd9755f9
-0, 847800, 160, 0x3248581d
-0, 848700, 160, 0xc00c559d
-0, 849600, 160, 0xff6c4b0a
-0, 850500, 160, 0x154157e3
-0, 851400, 160, 0xb996499c
-0, 852300, 160, 0xe1a059ba
-0, 853200, 160, 0x98015946
-0, 854100, 160, 0x168b4ceb
-0, 855000, 160, 0x567b4f83
-0, 855900, 160, 0x903e52f8
-0, 856800, 160, 0xc0a252dc
-0, 857700, 160, 0x08cb4b70
-0, 858600, 160, 0x3d9a5be6
-0, 859500, 160, 0x904b4907
-0, 860400, 160, 0x738847b1
-0, 861300, 160, 0x10405c19
-0, 862200, 160, 0x8c134f27
-0, 863100, 160, 0xdfe34d7f
-0, 864000, 160, 0x9d0948a8
-0, 864900, 160, 0x67755611
-0, 865800, 160, 0x46734258
-0, 866700, 160, 0x76f449fa
-0, 867600, 160, 0xfad64d30
-0, 868500, 160, 0x7f4357f4
-0, 869400, 160, 0xd20e5079
-0, 870300, 160, 0xdf7857ec
-0, 871200, 160, 0x46ff4891
-0, 872100, 160, 0x1b724ffc
-0, 873000, 160, 0xdf20545a
-0, 873900, 160, 0xeb5254e0
-0, 874800, 160, 0x794b4a96
-0, 875700, 160, 0x86a15147
-0, 876600, 160, 0x30f75504
-0, 877500, 160, 0x39575354
-0, 878400, 160, 0xb6a35351
-0, 879300, 160, 0x9da34c3a
-0, 880200, 160, 0xcf2d5386
-0, 881100, 160, 0xa7f353f6
-0, 882000, 160, 0xa6e34e95
-0, 882900, 160, 0x98174400
-0, 883800, 160, 0x13685641
-0, 884700, 160, 0x99215154
-0, 885600, 160, 0x5be75237
-0, 886500, 160, 0x4cb64942
-0, 887400, 160, 0x15de4e03
-0, 888300, 160, 0x613a4fd5
-0, 889200, 160, 0xc97c4821
-0, 890100, 160, 0xbf1558f2
-0, 891000, 160, 0x651d4cf4
-0, 891900, 160, 0xbee44a56
-0, 892800, 160, 0x6cbd4c20
-0, 893700, 160, 0xcf45493d
-0, 894600, 160, 0x73e74d2a
-0, 895500, 160, 0x6a3256e4
-0, 896400, 160, 0x89ac4a68
-0, 897300, 160, 0x0d2652aa
-0, 898200, 160, 0x56ce4b78
-0, 899100, 160, 0xb7b24bcb
diff --git a/tests/ref/fate/hapenc-hap-none b/tests/ref/fate/hapenc-hap-none
deleted file mode 100644
index 22c8b2c751..0000000000
--- a/tests/ref/fate/hapenc-hap-none
+++ /dev/null
@@ -1,14 +0,0 @@
-#format: frame checksums
-#version: 2
-#hash: MD5
-#tb 0: 1/25
-#media_type 0: video
-#codec_id 0: hap
-#dimensions 0: 352x288
-#sar 0: 0/1
-#stream#, dts,        pts, duration,     size, hash
-0,          0,          0,        1,    50696, 7fd5bc08f7b96326953ba6926cb06109
-0,          1,          1,        1,    50696, 24d172f2ea03994add2596a48151fca8
-0,          2,          2,        1,    50696, e5f2bac02ad850eb769007694a2f7acc
-0,          3,          3,        1,    50696, 26042fbce3868ad012b0b4557fd95d8a
-0,          4,          4,        1,    50696, 80902dd47d1211f1cd388652d5e0a797
diff --git a/tests/ref/fate/hapenc-hapa-none b/tests/ref/fate/hapenc-hapa-none
deleted file mode 100644
index 9aa80ae83d..0000000000
--- a/tests/ref/fate/hapenc-hapa-none
+++ /dev/null
@@ -1,14 +0,0 @@
-#format: frame checksums
-#version: 2
-#hash: MD5
-#tb 0: 1/25
-#media_type 0: video
-#codec_id 0: hap
-#dimensions 0: 352x288
-#sar 0: 0/1
-#stream#, dts,        pts, duration,     size, hash
-0,          0,          0,        1,   101384, 7bd1e603a54fb468242c9e00b0a90359
-0,          1,          1,        1,   101384, 09bf0e48db9bf465f3d89a192ddfda2d
-0,          2,          2,        1,   101384, 4993a96ed5f5d2bc0f0ff2080622eed2
-0,          3,          3,        1,   101384, 5cdbd0f763ba40366816588160ec73c2
-0,          4,          4,        1,   101384, 9202fe8358efde2c92c75210ed93c118
diff --git a/tests/ref/fate/hapenc-hapq-none b/tests/ref/fate/hapenc-hapq-none
deleted file mode 100644
index ee467b6753..0000000000
--- a/tests/ref/fate/hapenc-hapq-none
+++ /dev/null
@@ -1,14 +0,0 @@
-#format: frame checksums
-#version: 2
-#hash: MD5
-#tb 0: 1/25
-#media_type 0: video
-#codec_id 0: hap
-#dimensions 0: 352x288
-#sar 0: 0/1
-#stream#, dts,        pts, duration,     size, hash
-0,          0,          0,        1,   101384, cb6ef787ae7adff965ba4904a57c2188
-0,          1,          1,        1,   101384, 7cd50676c256354c06f728a265556efd
-0,          2,          2,        1,   101384, 454b14f7770a1f57830a678ea6e24b86
-0,          3,          3,        1,   101384, 6e6c088ed068d05870976fe78a75bb30
-0,          4,          4,        1,   101384, ba79bd8e7fc5d8919b174f0c8ea82753
diff --git a/tests/ref/fate/smjpeg b/tests/ref/fate/smjpeg
deleted file mode 100644
index 7aac52febc..0000000000
--- a/tests/ref/fate/smjpeg
+++ /dev/null
@@ -1,425 +0,0 @@
-#tb 0: 1/1000
-#tb 1: 1/22050
-0,          0,          0,        0,      734, 0x5a042c2c
-1,          0,          0,      512,     1024, 0x00000000
-1,        507,        507,      512,     1024, 0x00000000
-1,       1014,       1014,      512,     1024, 0xd89a448e
-1,       1521,       1521,      512,     1024, 0x695b369c
-1,       2029,       2029,      512,     1024, 0xc8ba5707
-0,        111,        111,        0,      763, 0xb5893f2f
-1,       2558,       2558,      512,     1024, 0xdf241fc6
-1,       3065,       3065,      512,     1024, 0x61cf4166
-1,       3572,       3572,      512,     1024, 0x97cbc386
-1,       4079,       4079,      512,     1024, 0x44899d04
-1,       4586,       4586,      512,     1024, 0xa7cbaa62
-0,        222,        222,        0,     3023, 0x0f3907d3
-1,       5116,       5116,      512,     1024, 0xa7aea60c
-1,       5623,       5623,      512,     1024, 0xd7b18a89
-1,       6130,       6130,      512,     1024, 0x268e81f6
-1,       6637,       6637,      512,     1024, 0x9cf83a2f
-1,       7166,       7166,      512,     1024, 0x5559b508
-0,        333,        333,        0,     4800, 0x22e6e18a
-1,       7673,       7673,      512,     1024, 0xe1b9e71c
-1,       8181,       8181,      512,     1024, 0xdcee733e
-1,       8688,       8688,      512,     1024, 0xe5918f60
-1,       9195,       9195,      512,     1024, 0x29dbd209
-1,       9724,       9724,      512,     1024, 0x9bcbcf16
-0,        444,        444,        0,     6417, 0x427adde5
-1,      10231,      10231,      512,     1024, 0x86f5f458
-1,      10738,      10738,      512,     1024, 0xabcbda86
-1,      11246,      11246,      512,     1024, 0xc51f77b9
-1,      11775,      11775,      512,     1024, 0xf6b3a504
-0,        555,        555,        0,     6776, 0x7a74c6ad
-1,      12282,      12282,      512,     1024, 0x1af3e40e
-1,      12789,      12789,      512,     1024, 0x3866b03b
-1,      13296,      13296,      512,     1024, 0xbc005403
-1,      13803,      13803,      512,     1024, 0xe9dfcc51
-1,      14333,      14333,      512,     1024, 0x83c837cb
-0,        666,        666,        0,     6808, 0x1f6eb7c3
-1,      14840,      14840,      512,     1024, 0xfa649580
-1,      15347,      15347,      512,     1024, 0x519452ea
-1,      15854,      15854,      512,     1024, 0xd4978774
-1,      16383,      16383,      512,     1024, 0xe2a3b1cd
-1,      16890,      16890,      512,     1024, 0x9a9472ad
-0,        777,        777,        0,     6726, 0x452087e6
-1,      17397,      17397,      512,     1024, 0xa12d4060
-1,      17905,      17905,      512,     1024, 0x31fb0646
-1,      18412,      18412,      512,     1024, 0xfc44343f
-1,      18941,      18941,      512,     1024, 0x0847751a
-1,      19448,      19448,      512,     1024, 0x227968a2
-0,        888,        888,        0,     6829, 0xee82b109
-1,      19955,      19955,      512,     1024, 0x7cce9f1c
-1,      20462,      20462,      512,     1024, 0xb8356713
-1,      20992,      20992,      512,     1024, 0xb29f6e6f
-1,      21499,      21499,      512,     1024, 0x9e1430ab
-1,      22006,      22006,      512,     1024, 0x26d85423
-0,        999,        999,        0,     7055, 0xf41f1108
-1,      22513,      22513,      512,     1024, 0x6496547d
-1,      23020,      23020,      512,     1024, 0x316b1a86
-1,      23549,      23549,      512,     1024, 0x3cd83afc
-1,      24057,      24057,      512,     1024, 0x993ff633
-0,       1111,       1111,        0,     6977, 0xf8fe1ede
-1,      24564,      24564,      512,     1024, 0x0708d1a2
-1,      25071,      25071,      512,     1024, 0xd7230db9
-1,      25578,      25578,      512,     1024, 0xbb0779ca
-1,      26107,      26107,      512,     1024, 0xc6094e1b
-1,      26614,      26614,      512,     1024, 0x15a8b039
-0,       1222,       1222,        0,     6942, 0x9ad105c6
-1,      27122,      27122,      512,     1024, 0xd6dbe88c
-1,      27629,      27629,      512,     1024, 0x7e8d1140
-1,      28158,      28158,      512,     1024, 0xef88e525
-1,      28665,      28665,      512,     1024, 0x44e21149
-1,      29172,      29172,      512,     1024, 0x65b0f5f4
-0,       1333,       1333,        0,     6926, 0xe239dad6
-1,      29679,      29679,      512,     1024, 0xb955f687
-1,      30186,      30186,      512,     1024, 0xc85fba9c
-1,      30716,      30716,      512,     1024, 0xf59655ad
-1,      31223,      31223,      512,     1024, 0x6de80bf1
-1,      31730,      31730,      512,     1024, 0x2dcf6e41
-0,       1444,       1444,        0,     6966, 0x81dcfab1
-1,      32237,      32237,      512,     1024, 0xd0ddcf8a
-1,      32766,      32766,      512,     1024, 0x00135c2d
-1,      33273,      33273,      512,     1024, 0x697f8efd
-1,      33781,      33781,      512,     1024, 0x7a9bada5
-0,       1555,       1555,        0,     6896, 0x31e6cc02
-1,      34288,      34288,      512,     1024, 0x0d22783c
-1,      34795,      34795,      512,     1024, 0x7726d07d
-1,      35324,      35324,      512,     1024, 0xa2f14f67
-1,      35831,      35831,      512,     1024, 0x7f51060d
-1,      36338,      36338,      512,     1024, 0xc4ec6aea
-0,       1666,       1666,        0,     6889, 0x1cc1006e
-1,      36846,      36846,      512,     1024, 0x9bb37ca4
-1,      37375,      37375,      512,     1024, 0x9b085577
-1,      37882,      37882,      512,     1024, 0x8812f8af
-1,      38389,      38389,      512,     1024, 0x788f5221
-1,      38896,      38896,      512,     1024, 0x3a2ce642
-0,       1777,       1777,        0,     6933, 0xc303f87f
-1,      39403,      39403,      512,     1024, 0x72415692
-1,      39933,      39933,      512,     1024, 0xe3dcc105
-1,      40440,      40440,      512,     1024, 0xb26c0599
-1,      40947,      40947,      512,     1024, 0x5c9e55eb
-1,      41454,      41454,      512,     1024, 0x8fe88707
-0,       1888,       1888,        0,     7034, 0xb4970a20
-1,      41983,      41983,      512,     1024, 0xc5d7beb6
-1,      42490,      42490,      512,     1024, 0xe1d3a3b4
-1,      42998,      42998,      512,     1024, 0x012da0c6
-1,      43505,      43505,      512,     1024, 0x8d010922
-1,      44012,      44012,      512,     1024, 0x3366eb0d
-0,       1999,       1999,        0,     6961, 0xf064095d
-1,      44541,      44541,      512,     1024, 0xc9381a27
-1,      45048,      45048,      512,     1024, 0x0774f685
-1,      45555,      45555,      512,     1024, 0xc5cae0a5
-1,      46062,      46062,      512,     1024, 0xa6f4737c
-0,       2111,       2111,        0,     7089, 0x5ba350f9
-1,      46592,      46592,      512,     1024, 0x8fb6d0d1
-1,      47099,      47099,      512,     1024, 0x05f579c2
-1,      47606,      47606,      512,     1024, 0x56905d99
-1,      48113,      48113,      512,     1024, 0x002ee18d
-1,      48620,      48620,      512,     1024, 0xeb37ef51
-0,       2222,       2222,        0,     7078, 0xa83f3e88
-1,      49149,      49149,      512,     1024, 0x38025635
-1,      49657,      49657,      512,     1024, 0x4fe643c8
-1,      50164,      50164,      512,     1024, 0x11d66ab1
-1,      50671,      50671,      512,     1024, 0xcc3051e9
-1,      51178,      51178,      512,     1024, 0xcd93e854
-0,       2333,       2333,        0,     7147, 0xcda66cfc
-1,      51707,      51707,      512,     1024, 0x38f1196d
-1,      52214,      52214,      512,     1024, 0x657a15fc
-1,      52722,      52722,      512,     1024, 0x669ce2a9
-1,      53229,      53229,      512,     1024, 0x95862dda
-1,      53758,      53758,      512,     1024, 0x1726a7b2
-0,       2444,       2444,        0,     7173, 0xb7455859
-1,      54265,      54265,      512,     1024, 0xd6ece2a1
-1,      54772,      54772,      512,     1024, 0x33ab9553
-1,      55279,      55279,      512,     1024, 0xd50c73a6
-1,      55787,      55787,      512,     1024, 0xfe25b63a
-1,      56316,      56316,      512,     1024, 0x7e2959e3
-0,       2555,       2555,        0,     7213, 0x97b89994
-1,      56823,      56823,      512,     1024, 0xa4c07b34
-1,      57330,      57330,      512,     1024, 0xd6d8f15c
-1,      57837,      57837,      512,     1024, 0x1eccddd7
-1,      58366,      58366,      512,     1024, 0x2b69f9cb
-0,       2666,       2666,        0,     7170, 0xca8b2948
-1,      58874,      58874,      512,     1024, 0x667b775f
-1,      59381,      59381,      512,     1024, 0xad3b84e9
-1,      59888,      59888,      512,     1024, 0x4f29fc67
-1,      60395,      60395,      512,     1024, 0x8d611ab7
-1,      60924,      60924,      512,     1024, 0x278966ea
-0,       2777,       2777,        0,     7174, 0xc7cc6bbb
-1,      61431,      61431,      512,     1024, 0xaf33812b
-1,      61938,      61938,      512,     1024, 0xa55f4265
-1,      62446,      62446,      512,     1024, 0x023cb51c
-1,      62975,      62975,      512,     1024, 0x1d1f1005
-1,      63482,      63482,      512,     1024, 0x874cccf7
-0,       2888,       2888,        0,     7235, 0xc2e68d2b
-1,      63989,      63989,      512,     1024, 0xda705428
-1,      64496,      64496,      512,     1024, 0x48d9b440
-1,      65003,      65003,      512,     1024, 0xa14e0712
-1,      65533,      65533,      512,     1024, 0x7efbad1f
-1,      66040,      66040,      512,     1024, 0xdb82c17f
-0,       3000,       3000,        0,     7261, 0x8204a423
-1,      66547,      66547,      512,     1024, 0xcbe87613
-1,      67054,      67054,      512,     1024, 0x3a63df1d
-1,      67583,      67583,      512,     1024, 0xd5636bba
-1,      68090,      68090,      512,     1024, 0x9397af23
-0,       3111,       3111,        0,     7353, 0xacc7e7c0
-1,      68598,      68598,      512,     1024, 0x32a07c98
-1,      69105,      69105,      512,     1024, 0x202ca667
-1,      69612,      69612,      512,     1024, 0xdf969011
-1,      70141,      70141,      512,     1024, 0xc434d238
-1,      70648,      70648,      512,     1024, 0xe9ad7562
-0,       3222,       3222,        0,     7065, 0x45035c5c
-1,      71155,      71155,      512,     1024, 0xb51b6b50
-1,      71663,      71663,      512,     1024, 0xe70aecd3
-1,      72192,      72192,      512,     1024, 0x03c816b2
-1,      72699,      72699,      512,     1024, 0x869fdf25
-1,      73206,      73206,      512,     1024, 0xd40a0a62
-0,       3333,       3333,        0,     7269, 0x72edbb76
-1,      73713,      73713,      512,     1024, 0x5af7dd35
-1,      74220,      74220,      512,     1024, 0x891ffc72
-1,      74750,      74750,      512,     1024, 0x1ff68a08
-1,      75257,      75257,      512,     1024, 0x5a7517a9
-1,      75764,      75764,      512,     1024, 0x0f959f74
-0,       3444,       3444,        0,     7220, 0xb926772f
-1,      76271,      76271,      512,     1024, 0xe92a12a2
-1,      76778,      76778,      512,     1024, 0x38000e55
-1,      77307,      77307,      512,     1024, 0x39fbdd70
-1,      77814,      77814,      512,     1024, 0xca3d9184
-1,      78322,      78322,      512,     1024, 0x66c8995b
-0,       3555,       3555,        0,     7326, 0x0a66c632
-1,      78829,      78829,      512,     1024, 0xac25acea
-1,      79358,      79358,      512,     1024, 0x3cd1046c
-1,      79865,      79865,      512,     1024, 0x6a1df31c
-1,      80372,      80372,      512,     1024, 0x21ca10a1
-0,       3666,       3666,        0,     7225, 0xe39076ab
-1,      80879,      80879,      512,     1024, 0x1aeccedc
-1,      81387,      81387,      512,     1024, 0xddea1335
-1,      81916,      81916,      512,     1024, 0x19f5ca9f
-1,      82423,      82423,      512,     1024, 0x88e95e43
-1,      82930,      82930,      512,     1024, 0x726284fe
-0,       3777,       3777,        0,     7265, 0xe0209036
-1,      83437,      83437,      512,     1024, 0x6b85b40e
-1,      83966,      83966,      512,     1024, 0x111fee2a
-1,      84474,      84474,      512,     1024, 0x3656b588
-1,      84981,      84981,      512,     1024, 0xa5a2b552
-1,      85488,      85488,      512,     1024, 0x38fb2467
-0,       3888,       3888,        0,     7337, 0x7a5dc093
-1,      85995,      85995,      512,     1024, 0xaa919ccc
-1,      86524,      86524,      512,     1024, 0x15993dbc
-1,      87031,      87031,      512,     1024, 0xbe01a7b9
-1,      87539,      87539,      512,     1024, 0xefe93c09
-1,      88046,      88046,      512,     1024, 0x1bb566e5
-0,       4000,       4000,        0,     7246, 0x519a7a3c
-1,      88575,      88575,      512,     1024, 0x15ce6237
-1,      89082,      89082,      512,     1024, 0xa8552e66
-1,      89589,      89589,      512,     1024, 0x9d80187e
-1,      90096,      90096,      512,     1024, 0x5df3fc30
-1,      90603,      90603,      512,     1024, 0x1a312aa5
-0,       4111,       4111,        0,     7266, 0x352c8078
-1,      91133,      91133,      512,     1024, 0x6bb8e302
-1,      91640,      91640,      512,     1024, 0xbd9684bb
-1,      92147,      92147,      512,     1024, 0x78b0b166
-1,      92654,      92654,      512,     1024, 0xd9af5eae
-0,       4222,       4222,        0,     7323, 0xcaf69d7c
-1,      93183,      93183,      512,     1024, 0xdb90fe82
-1,      93690,      93690,      512,     1024, 0x327614e9
-1,      94198,      94198,      512,     1024, 0x1f19b7fe
-1,      94705,      94705,      512,     1024, 0x46c53f96
-1,      95212,      95212,      512,     1024, 0x921b2189
-0,       4333,       4333,        0,     7309, 0x98c1e6f7
-1,      95741,      95741,      512,     1024, 0xa8fbc85a
-1,      96248,      96248,      512,     1024, 0xabfdaaae
-1,      96755,      96755,      512,     1024, 0x6acc7387
-1,      97263,      97263,      512,     1024, 0x0d9c27b5
-1,      97792,      97792,      512,     1024, 0xba4dd809
-0,       4444,       4444,        0,     7121, 0x913d5bd6
-1,      98299,      98299,      512,     1024, 0x2a2ad521
-1,      98806,      98806,      512,     1024, 0x892de38a
-1,      99313,      99313,      512,     1024, 0xdc97a2eb
-1,      99820,      99820,      512,     1024, 0x4f614ca4
-1,     100350,     100350,      512,     1024, 0x9c8a77ea
-0,       4555,       4555,      111,     7088, 0x56302362
-1,     100857,     100857,      512,     1024, 0x2d30e646
-1,     101364,     101364,      512,     1024, 0x74e800a7
-1,     101871,     101871,      512,     1024, 0x1e01fb02
-1,     102378,     102378,      512,     1024, 0x4ed2c1d8
-0,       4666,       4666,      111,     7104, 0xc0d14f78
-1,     102907,     102907,      512,     1024, 0xf2fdbe63
-1,     103415,     103415,      512,     1024, 0x8d6f63a1
-1,     103922,     103922,      512,     1024, 0xded468d9
-1,     104429,     104429,      512,     1024, 0xccad839e
-1,     104958,     104958,      512,     1024, 0xdde7c082
-0,       4777,       4777,      111,     7169, 0xd03c825b
-1,     105465,     105465,      512,     1024, 0x548613c5
-1,     105972,     105972,      512,     1024, 0x383909bd
-1,     106479,     106479,      512,     1024, 0xfd37627b
-1,     106987,     106987,      512,     1024, 0x6d95a481
-1,     107516,     107516,      512,     1024, 0x56aa87fa
-0,       4888,       4888,      111,     7038, 0x1ecc201d
-1,     108023,     108023,      512,     1024, 0x7b67258c
-1,     108530,     108530,      512,     1024, 0x7dd99a92
-1,     109037,     109037,      512,     1024, 0x4a66d102
-1,     109566,     109566,      512,     1024, 0x7b3fce51
-1,     110074,     110074,      512,     1024, 0xbbd968aa
-0,       5000,       5000,      111,     7015, 0x83c94454
-1,     110581,     110581,      512,     1024, 0x8283ec36
-1,     111088,     111088,      512,     1024, 0x3c96493d
-1,     111595,     111595,      512,     1024, 0xfa4f8cf8
-1,     112124,     112124,      512,     1024, 0xe2cf872d
-1,     112631,     112631,      512,     1024, 0x0a9e7aa6
-0,       5111,       5111,      111,     6983, 0x9e51f54d
-1,     113139,     113139,      512,     1024, 0x6e7a0550
-1,     113646,     113646,      512,     1024, 0x3acfea2f
-1,     114175,     114175,      512,     1024, 0x7111d0fa
-1,     114682,     114682,      512,     1024, 0xe9a1eca9
-0,       5222,       5222,      111,     7088, 0x70d33de1
-1,     115189,     115189,      512,     1024, 0x24da6c46
-1,     115696,     115696,      512,     1024, 0x117cff37
-1,     116204,     116204,      512,     1024, 0x0f27cab6
-1,     116733,     116733,      512,     1024, 0x69b6b4e6
-1,     117240,     117240,      512,     1024, 0x1e6cc841
-0,       5333,       5333,      111,     7096, 0x4d0f81b5
-1,     117747,     117747,      512,     1024, 0xb01e2365
-1,     118254,     118254,      512,     1024, 0x14e200d3
-1,     118783,     118783,      512,     1024, 0xd1184c98
-1,     119291,     119291,      512,     1024, 0xef9140e9
-1,     119798,     119798,      512,     1024, 0x4cbb645e
-0,       5444,       5444,      111,     7106, 0xd1a83ddc
-1,     120305,     120305,      512,     1024, 0xe7fe2f06
-1,     120812,     120812,      512,     1024, 0xf8c45028
-1,     121341,     121341,      512,     1024, 0x561358f4
-1,     121848,     121848,      512,     1024, 0xd0129b77
-1,     122355,     122355,      512,     1024, 0xcc636e88
-0,       5555,       5555,      111,     7219, 0x20f47fe4
-1,     122863,     122863,      512,     1024, 0xe9406321
-1,     123392,     123392,      512,     1024, 0x9f16a041
-1,     123899,     123899,      512,     1024, 0x468bf409
-1,     124406,     124406,      512,     1024, 0x3df70f7b
-1,     124913,     124913,      512,     1024, 0xa880b11b
-0,       5666,       5666,      111,     7184, 0x45dc6a0e
-1,     125420,     125420,      512,     1024, 0x3286c489
-1,     125950,     125950,      512,     1024, 0x39fe9ebc
-1,     126457,     126457,      512,     1024, 0xc533d83b
-1,     126964,     126964,      512,     1024, 0x153b195d
-0,       5777,       5777,      111,     7222, 0x488c6499
-1,     127471,     127471,      512,     1024, 0xd84786a1
-1,     127978,     127978,      512,     1024, 0xdc295aaa
-1,     128507,     128507,      512,     1024, 0xfb764d8c
-1,     129015,     129015,      512,     1024, 0xeebc9db9
-1,     129522,     129522,      512,     1024, 0x7ba9403e
-0,       5888,       5888,      111,     7254, 0xbd097ba7
-1,     130029,     130029,      512,     1024, 0x4e5571ec
-1,     130558,     130558,      512,     1024, 0xd965fad4
-1,     131065,     131065,      512,     1024, 0x87e259f2
-1,     131572,     131572,      512,     1024, 0xae7e533b
-1,     132080,     132080,      512,     1024, 0x313cf4d6
-0,       6000,       6000,      111,     7189, 0x46e06d43
-1,     132587,     132587,      512,     1024, 0xe1844c90
-1,     133116,     133116,      512,     1024, 0xbb057b44
-1,     133623,     133623,      512,     1024, 0xa5099687
-1,     134130,     134130,      512,     1024, 0xbff10707
-1,     134637,     134637,      512,     1024, 0x37c4ffc0
-0,       6111,       6111,      111,     7283, 0x19dd7319
-1,     135167,     135167,      512,     1024, 0xf9fb6caa
-1,     135674,     135674,      512,     1024, 0x3b6a3a1f
-1,     136181,     136181,      512,     1024, 0x83431edb
-1,     136688,     136688,      512,     1024, 0x1eb713cf
-1,     137195,     137195,      512,     1024, 0xd7b07a6d
-0,       6222,       6222,      111,     7161, 0x23171d02
-1,     137724,     137724,      512,     1024, 0x81ae3391
-1,     138231,     138231,      512,     1024, 0xf150130a
-1,     138739,     138739,      512,     1024, 0x09678eaa
-1,     139246,     139246,      512,     1024, 0xb94e06f1
-0,       6333,       6333,      111,     6976, 0xcc610c26
-1,     139775,     139775,      512,     1024, 0x67b1dbc9
-1,     140282,     140282,      512,     1024, 0xd6edc235
-1,     140789,     140789,      512,     1024, 0x34e4c499
-1,     141296,     141296,      512,     1024, 0xeefd89c0
-1,     141804,     141804,      512,     1024, 0x38afdaf1
-0,       6444,       6444,      111,     7056, 0x6cd917b0
-1,     142333,     142333,      512,     1024, 0x29a60d76
-1,     142840,     142840,      512,     1024, 0xe28a4372
-1,     143347,     143347,      512,     1024, 0x7089454d
-1,     143854,     143854,      512,     1024, 0x0c01bb7b
-1,     144383,     144383,      512,     1024, 0xbd776a72
-0,       6555,       6555,      111,     6736, 0x02b78951
-1,     144891,     144891,      512,     1024, 0x86776fd0
-1,     145398,     145398,      512,     1024, 0xb37c88f7
-1,     145905,     145905,      512,     1024, 0x5f90aaf8
-1,     146412,     146412,      512,     1024, 0x203d4222
-1,     146941,     146941,      512,     1024, 0x382692a6
-0,       6666,       6666,      111,     6540, 0x767e0854
-1,     147448,     147448,      512,     1024, 0xf37c95fd
-1,     147956,     147956,      512,     1024, 0x6c0b8877
-1,     148463,     148463,      512,     1024, 0x2e54a8b6
-1,     148992,     148992,      512,     1024, 0x7f266488
-0,       6777,       6777,      111,     6170, 0xc84962fb
-1,     149499,     149499,      512,     1024, 0xfbf20f9a
-1,     150006,     150006,      512,     1024, 0xf2985cc0
-1,     150513,     150513,      512,     1024, 0xc7075340
-1,     151020,     151020,      512,     1024, 0xe4585695
-1,     151550,     151550,      512,     1024, 0xbdffa380
-0,       6888,       6888,      111,     6169, 0x27e06c03
-1,     152057,     152057,      512,     1024, 0x2422a8a9
-1,     152564,     152564,      512,     1024, 0x59cbd75f
-1,     153071,     153071,      512,     1024, 0x04ad1a8c
-1,     153578,     153578,      512,     1024, 0x33c09191
-1,     154107,     154107,      512,     1024, 0x55efa6fd
-0,       7000,       7000,      111,     5864, 0xd14db83f
-1,     154615,     154615,      512,     1024, 0xf73d0e5d
-1,     155122,     155122,      512,     1024, 0x6141ebae
-1,     155629,     155629,      512,     1024, 0x7db17a68
-1,     156158,     156158,      512,     1024, 0xa6c690b6
-1,     156665,     156665,      512,     1024, 0xa6fd6725
-0,       7111,       7111,      111,     5375, 0x4a21055d
-1,     157172,     157172,      512,     1024, 0x50a90b9b
-1,     157680,     157680,      512,     1024, 0xef990dc8
-1,     158187,     158187,      512,     1024, 0x75adf6b5
-1,     158716,     158716,      512,     1024, 0x61eac43e
-1,     159223,     159223,      512,     1024, 0x67797a19
-0,       7222,       7222,      111,     5206, 0x95ead3cb
-1,     159730,     159730,      512,     1024, 0xf325277a
-1,     160237,     160237,      512,     1024, 0x18bf254a
-1,     160767,     160767,      512,     1024, 0x2ce6bee3
-1,     161274,     161274,      512,     1024, 0x8d320860
-0,       7333,       7333,      111,     5220, 0xcfdcc37e
-1,     161781,     161781,      512,     1024, 0xc979b6e8
-1,     162288,     162288,      512,     1024, 0xdb644b41
-1,     162795,     162795,      512,     1024, 0xe1b368ba
-1,     163324,     163324,      512,     1024, 0xacc53d15
-1,     163832,     163832,      512,     1024, 0x42ea8c18
-0,       7444,       7444,      111,     4946, 0x2d864a77
-1,     164339,     164339,      512,     1024, 0xe52c99a4
-1,     164846,     164846,      512,     1024, 0xd7db54a6
-1,     165375,     165375,      512,     1024, 0x7f27a7e3
-1,     165882,     165882,      512,     1024, 0xf7ffeaa9
-1,     166389,     166389,      512,     1024, 0x792b6088
-0,       7555,       7555,      111,     4390, 0x2ab9f462
-1,     166896,     166896,      512,     1024, 0x61d99724
-1,     167404,     167404,      512,     1024, 0x5213720e
-1,     167933,     167933,      512,     1024, 0xac09dd30
-1,     168440,     168440,      512,     1024, 0x960bf6bb
-1,     168947,     168947,      512,     1024, 0xc90168e1
-0,       7666,       7666,      111,     4051, 0x1d09592e
-1,     169454,     169454,      512,     1024, 0x43b45768
-1,     169983,     169983,      512,     1024, 0x935d60a1
-1,     170491,     170491,      512,     1024, 0x9a342ef2
-1,     170998,     170998,      512,     1024, 0xc894709f
-0,       7777,       7777,      111,     3680, 0x39bd6a12
-1,     171505,     171505,      512,     1024, 0x59b43b07
-1,     172012,     172012,      512,     1024, 0x36a1a98d
-1,     172541,     172541,      512,     1024, 0x9e1a121c
-1,     173048,     173048,      512,     1024, 0x02208b78
-1,     173556,     173556,      512,     1024, 0xd1d7b274
-0,       7888,       7888,      111,     2910, 0x6337ece9
-1,     174063,     174063,      512,     1024, 0xdacd5096
-1,     174592,     174592,      512,     1024, 0x51b71ead
-1,     175099,     175099,      512,     1024, 0xd009a7ca
-1,     175606,     175606,      512,     1024, 0xb6d5a938
-1,     176113,     176113,      512,     1024, 0xf3d45e47
-0,       8000,       8000,      111,     2153, 0xf4e3bc17
-1,     176621,     176621,      512,     1024, 0xea8e04fc
-1,     177150,     177150,      512,     1024, 0x0b928bd8
-1,     177657,     177657,      512,     1024, 0x0f02caec
-1,     178164,     178164,      512,     1024, 0xe2b137a8
-1,     178671,     178671,      512,     1024, 0xd5f94892
diff --git a/tests/ref/vsynth/vsynth1-dnxhd_1080i b/tests/ref/vsynth/vsynth1-dnxhd_1080i
deleted file mode 100644
index f8f6df09bf..0000000000
--- a/tests/ref/vsynth/vsynth1-dnxhd_1080i
+++ /dev/null
@@ -1,4 +0,0 @@
-027c985483caab9397592bf27477dce1 *./tests/data/vsynth1/dnxhd-1080i.mov
-3031911 ./tests/data/vsynth1/dnxhd-1080i.mov
-0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv
-stddev:    6.29 PSNR: 32.15 MAXDIFF:   64 bytes:   760320/  7603200
diff --git a/tests/ref/vsynth/vsynth1-dv_411 b/tests/ref/vsynth/vsynth1-dv_411
deleted file mode 100644
index c45b593c02..0000000000
--- a/tests/ref/vsynth/vsynth1-dv_411
+++ /dev/null
@@ -1,4 +0,0 @@
-f179899efba432c6f01149c36c709092 *./tests/data/vsynth1/dv411.dv
-7200000 ./tests/data/vsynth1/dv411.dv
-b6640a3a572353f51284acb746eb00c4 *./tests/data/dv_411.vsynth1.out.yuv
-stddev:   30.76 PSNR: 18.37 MAXDIFF:  205 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-zmbv b/tests/ref/vsynth/vsynth1-zmbv
deleted file mode 100644
index c608c4bb36..0000000000
--- a/tests/ref/vsynth/vsynth1-zmbv
+++ /dev/null
@@ -1,4 +0,0 @@
-09bae55394f86ddb9e5c3254b174f865 *tests/data/fate/vsynth1-zmbv.avi
-2285442 tests/data/fate/vsynth1-zmbv.avi
-4ad1ca9de7c65eab68a619c54fffaec8 *tests/data/fate/vsynth1-zmbv.out.rawvideo
-stddev:    8.61 PSNR: 29.43 MAXDIFF:   64 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd_1080i b/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
deleted file mode 100644
index 125c7a8e16..0000000000
--- a/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
+++ /dev/null
@@ -1,4 +0,0 @@
-204e80f2e406ada90fca596ab2810b3e *./tests/data/vsynth_lena/dnxhd-1080i.mov
-3031911 ./tests/data/vsynth_lena/dnxhd-1080i.mov
-3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth_lena.out.yuv
-stddev:    1.31 PSNR: 45.77 MAXDIFF:   23 bytes:   760320/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dv_411 b/tests/ref/vsynth/vsynth_lena-dv_411
deleted file mode 100644
index 1ca2bc03d9..0000000000
--- a/tests/ref/vsynth/vsynth_lena-dv_411
+++ /dev/null
@@ -1,4 +0,0 @@
-e428508f400327aeb96969c08fb9e1b5 *./tests/data/vsynth_lena/dv411.dv
-7200000 ./tests/data/vsynth_lena/dv411.dv
-7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv_411.vsynth_lena.out.yuv
-stddev:   10.09 PSNR: 28.05 MAXDIFF:   60 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-zmbv b/tests/ref/vsynth/vsynth_lena-zmbv
deleted file mode 100644
index e6c994f844..0000000000
--- a/tests/ref/vsynth/vsynth_lena-zmbv
+++ /dev/null
@@ -1,4 +0,0 @@
-e9cc761eb3fedc36ce5f97744196ed8b *tests/data/fate/vsynth_lena-zmbv.avi
-1808720 tests/data/fate/vsynth_lena-zmbv.avi
-ee68a5292fd0745834246b4ec0d85e9b *tests/data/fate/vsynth_lena-zmbv.out.rawvideo
-stddev:    8.12 PSNR: 29.94 MAXDIFF:   32 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr
deleted file mode 100644
index 6002bbbbb6..0000000000
--- a/tests/ref/vsynth1/cljr
+++ /dev/null
@@ -1,4 +0,0 @@
-041982e4fa83428c621a127647d47b3f *./tests/data/vsynth1/cljr.avi
-5075660 ./tests/data/vsynth1/cljr.avi
-e1c4c96c74de3435d0f9f6118c5ed9b5 *./tests/data/cljr.vsynth1.out.yuv
-stddev:   30.53 PSNR: 18.43 MAXDIFF:  225 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth1/yuv b/tests/ref/vsynth1/yuv
deleted file mode 100644
index 6d8b1431db..0000000000
--- a/tests/ref/vsynth1/yuv
+++ /dev/null
@@ -1,4 +0,0 @@
-eaa66c3b27a2602e882befe154a8b119 *./tests/data/vsynth1/yuv.avi
-7610060 ./tests/data/vsynth1/yuv.avi
-c5ccac874dbf808e9088bc3107860042 *./tests/data/yuv.vsynth1.out.yuv
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth_lena/cljr b/tests/ref/vsynth_lena/cljr
deleted file mode 100644
index e3bbc05f4b..0000000000
--- a/tests/ref/vsynth_lena/cljr
+++ /dev/null
@@ -1,4 +0,0 @@
-fdc1926e0a599de94513f0a3472b598f *./tests/data/vsynth_lena/cljr.avi
-5075660 ./tests/data/vsynth_lena/cljr.avi
-7df03229ee6361ea11a0d83d4926cb10 *./tests/data/cljr.vsynth_lena.out.yuv
-stddev:   10.30 PSNR: 27.87 MAXDIFF:   65 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth_lena/huffyuv b/tests/ref/vsynth_lena/huffyuv
deleted file mode 100644
index c0e374d615..0000000000
--- a/tests/ref/vsynth_lena/huffyuv
+++ /dev/null
@@ -1,4 +0,0 @@
-ed66182be0d515e8b6cb970ad63162da *./tests/data/vsynth_lena/huffyuv.avi
-6455232 ./tests/data/vsynth_lena/huffyuv.avi
-dde5895817ad9d219f79a52d0bdfb001 *./tests/data/huffyuv.vsynth_lena.out.yuv
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth_lena/yuv b/tests/ref/vsynth_lena/yuv
deleted file mode 100644
index eff44c3276..0000000000
--- a/tests/ref/vsynth_lena/yuv
+++ /dev/null
@@ -1,4 +0,0 @@
-3d5ee6d2023bc15bba898819e4977e46 *./tests/data/vsynth_lena/yuv.avi
-7610060 ./tests/data/vsynth_lena/yuv.avi
-dde5895817ad9d219f79a52d0bdfb001 *./tests/data/yuv.vsynth_lena.out.yuv
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 22/24] tests/fate-run: Always use -bitexact for ffprobe

[Andreas Rheinhardt]

Makes no difference currently.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate-run.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 3c62246c8a..821e949b01 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -86,15 +86,15 @@ runecho(){
 }
 
 probefmt(){
-    run ffprobe${PROGSUF}${EXECSUF} -show_entries format=format_name -print_format default=nw=1:nk=1 "$@"
+    run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_entries format=format_name -print_format default=nw=1:nk=1 "$@"
 }
 
 probeaudiostream(){
-    run ffprobe${PROGSUF}${EXECSUF} -show_entries stream=codec_name,codec_time_base,sample_fmt,channels,channel_layout:side_data "$@"
+    run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_entries stream=codec_name,codec_time_base,sample_fmt,channels,channel_layout:side_data "$@"
 }
 
 probetags(){
-    run ffprobe${PROGSUF}${EXECSUF} -show_entries format_tags "$@"
+    run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_entries format_tags "$@"
 }
 
 runlocal(){
@@ -103,11 +103,11 @@ runlocal(){
 }
 
 probeframes(){
-    run ffprobe${PROGSUF}${EXECSUF} -show_frames "$@"
+    run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_frames "$@"
 }
 
 probechapters(){
-    run ffprobe${PROGSUF}${EXECSUF} -show_chapters "$@"
+    run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_chapters "$@"
 }
 
 probegaplessinfo(){
@@ -222,7 +222,7 @@ enc_dec(){
     do_md5sum $decfile
     tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift
     test -z $ffprobe_opts || \
-        run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return
+        run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return
 }
 
 transcode(){
@@ -245,7 +245,7 @@ transcode(){
     ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \
         -f framecrc - || return
     test -z $ffprobe_opts || \
-        run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return
+        run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return
 }
 
 stream_remux(){
@@ -264,7 +264,7 @@ stream_remux(){
     ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \
         -f framecrc - || return
     test -z $ffprobe_opts || \
-        run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return
+        run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return
 }
 
 # FIXME: There is a certain duplication between the avconv-related helper
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 23/24] fate/hap: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/hap.mak | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/fate/hap.mak b/tests/fate/hap.mak
index ba921798cc..8268798f4a 100644
--- a/tests/fate/hap.mak
+++ b/tests/fate/hap.mak
@@ -25,8 +25,10 @@ fate-hap-alpha-only-nosnappy-128x72: CMD = framecrc -i $(TARGET_SAMPLES)/hap/Hap
 FATE_HAP += fate-hap-alpha-only-snappy-127x71
 fate-hap-alpha-only-snappy-127x71: CMD = framecrc -i $(TARGET_SAMPLES)/hap/HapAlphaOnly_snappy1chunk_127x71.mov -pix_fmt gray8
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP)
-fate-hap: $(FATE_HAP)
+FATE_HAP-$(call FRAMECRC, MOV, HAP) += $(FATE_HAP)
+
+FATE_SAMPLES_FFMPEG += $(FATE_HAP-yes)
+fate-hap: $(FATE_HAP-yes)
 
 
 #Test bsf conversion
@@ -42,6 +44,7 @@ fate-hapqa-extract-snappy1-to-hapalphaonly: CMD = framecrc -i $(TARGET_SAMPLES)/
 FATE_HAPQA_EXTRACT_BSF += fate-hapqa-extract-snappy16-to-hapalphaonly
 fate-hapqa-extract-snappy16-to-hapalphaonly: CMD = framecrc -i $(TARGET_SAMPLES)/hap/HAPQA_Snappy_16chunk_127x1.mov -c:v copy -bsf:v hapqa_extract=texture=alpha -tag:v HapA -metadata:s:v:0 encoder="HAPAlphaOnly"
 
+FATE_HAPQA_EXTRACT_BSF-$(call REMUX, FRAMECRC MOV, HAPQA_EXTRACT_BSF) += $(FATE_HAPQA_EXTRACT_BSF)
 
 #Test bsf conversion and mov
 tests/data/hapq_nosnappy.mov: TAG = GEN
@@ -65,8 +68,8 @@ FATE_HAPQA_EXTRACT_BSF_FFPROBE += fate-hapqa-extract-nosnappy-to-hapalphaonly-mo
 fate-hapqa-extract-nosnappy-to-hapalphaonly-mov: tests/data/hapalphaonly_nosnappy.mov
 fate-hapqa-extract-nosnappy-to-hapalphaonly-mov: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -show_data_hash adler32 -bitexact -show_streams -select_streams v -v 0 $(TARGET_PATH)/tests/data/hapalphaonly_nosnappy.mov
 
+FATE_HAPQA_EXTRACT_BSF_FFPROBE-$(call DEMMUX, MOV, MOV, HAPQA_EXTRACT_BSF HAP_DECODER) += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE)
 
-FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER HAPQA_EXTRACT_BSF MOV_MUXER) += $(FATE_HAPQA_EXTRACT_BSF)
-FATE_SAMPLES_FFPROBE += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE)
-
-fate-hapqa-extract-bsf: $(FATE_HAPQA_EXTRACT_BSF) $(FATE_HAPQA_EXTRACT_BSF_FFPROBE)
+FATE_SAMPLES_FFMPEG += $(FATE_HAPQA_EXTRACT_BSF-yes)
+FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_HAPQA_EXTRACT_BSF_FFPROBE-yes)
+fate-hapqa-extract-bsf: $(FATE_HAPQA_EXTRACT_BSF-yes) $(FATE_HAPQA_EXTRACT_BSF_FFPROBE-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 24/24] fate/h264: Fix test requirements

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 tests/fate/h264.mak | 69 +++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index e075b6f67f..44e20f7259 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -1,3 +1,21 @@
+FATE_H264_HIGH_BIT_DEPTH :=                                             \
+            frext-hi422fr13_sony_b                                      \
+            frext-hi422fr6_sony_a                                       \
+            frext-pph10i1_panasonic_a                                   \
+            frext-pph10i2_panasonic_a                                   \
+            frext-pph10i3_panasonic_a                                   \
+            frext-pph10i4_panasonic_a                                   \
+            frext-pph10i5_panasonic_a                                   \
+            frext-pph10i6_panasonic_a                                   \
+            frext-pph10i7_panasonic_a                                   \
+            frext-pph422i1_panasonic_a                                  \
+            frext-pph422i2_panasonic_a                                  \
+            frext-pph422i3_panasonic_a                                  \
+            frext-pph422i4_panasonic_a                                  \
+            frext-pph422i5_panasonic_a                                  \
+            frext-pph422i6_panasonic_a                                  \
+            frext-pph422i7_panasonic_a                                  \
+
 FATE_H264 = aud_mw_e                                                    \
             ba1_ft_c                                                    \
             ba1_sony_d                                                  \
@@ -115,9 +133,7 @@ FATE_H264 = aud_mw_e                                                    \
             frext-hcafr4_hhi_a                                          \
             frext-hcamff1_hhi_b                                         \
             frext-hi422fr10_sony_b                                      \
-            frext-hi422fr13_sony_b                                      \
             frext-hi422fr1_sony_a                                       \
-            frext-hi422fr6_sony_a                                       \
             frext-hpca_brcm_c                                           \
             frext-hpcadq_brcm_b                                         \
             frext-hpcafl_bcrm_c                                         \
@@ -132,20 +148,6 @@ FATE_H264 = aud_mw_e                                                    \
             frext-hpcvflnl_bcrm_a                                       \
             frext-hpcvmolq_brcm_b                                       \
             frext-hpcvnl_brcm_a                                         \
-            frext-pph10i1_panasonic_a                                   \
-            frext-pph10i2_panasonic_a                                   \
-            frext-pph10i3_panasonic_a                                   \
-            frext-pph10i4_panasonic_a                                   \
-            frext-pph10i5_panasonic_a                                   \
-            frext-pph10i6_panasonic_a                                   \
-            frext-pph10i7_panasonic_a                                   \
-            frext-pph422i1_panasonic_a                                  \
-            frext-pph422i2_panasonic_a                                  \
-            frext-pph422i3_panasonic_a                                  \
-            frext-pph422i4_panasonic_a                                  \
-            frext-pph422i5_panasonic_a                                  \
-            frext-pph422i6_panasonic_a                                  \
-            frext-pph422i7_panasonic_a                                  \
             hcbp2_hhi_a                                                 \
             hcmp1_hhi_a                                                 \
             ls_sva_d                                                    \
@@ -182,6 +184,7 @@ FATE_H264 = aud_mw_e                                                    \
             sva_fm1_e                                                   \
             sva_nl1_b                                                   \
             sva_nl2_e                                                   \
+            $(if $(CONFIG_SCALE_FILTER),$(FATE_H264_HIGH_BIT_DEPTH))
 
 FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8                    \
                           small_420_8-to-large_444_10                   \
@@ -189,44 +192,44 @@ FATE_H264_REINIT_TESTS := large_420_8-to-small_420_8                    \
                           small_422_9-to-small_420_9                    \
 
 FATE_H264  := $(FATE_H264:%=fate-h264-conformance-%)                    \
-              $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%)            \
-              fate-h264-extreme-plane-pred                              \
               fate-h264-intra-refresh-recovery                          \
               fate-h264-lossless                                        \
               fate-h264-3386                                            \
               fate-h264-missing-frame                                   \
               fate-h264-ref-pic-mod-overflow                            \
               fate-h264-timecode                                        \
-              fate-h264-encparams
 
-FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264)
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-crop-to-container
+FATE_H264-$(call FRAMECRC, H264, H264, H264_PARSER SCALE_FILTER) += $(FATE_H264_REINIT_TESTS:%=fate-h264-reinit-%)
+FATE_H264-$(call FRAMECRC, H264, H264, H264_PARSER) += $(FATE_H264)
+FATE_H264-$(call FRAMEMD5, H264, H264, H264_PARSER) += fate-h264-extreme-plane-pred
+FATE_H264-$(call FRAMEMD5, MOV,  H264) += fate-h264-crop-to-container
+FATE_H264-$(call DEMDEC,   H264, H264, H264_PARSER)   += fate-h264-encparams
 
 # this sample has two stsd entries and needs to reload extradata
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-extradata-reload
+FATE_H264-$(call FRAMEMD5, MOV, H264, SCALE_FILTER) += fate-h264-extradata-reload
 
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-interlace-crop
+FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-interlace-crop
 
 # this sample has invalid reference list modification, but decodes fine
 # by using a previous ref frame instead of a missing one
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-invalid-ref-mod
+FATE_H264-$(call FRAMECRC, MOV, H264, SCALE_FILTER) += fate-h264-invalid-ref-mod
 
 # this sample gives an explicit size for a single NAL unit, but contains
 # several NAL units
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-mixed-nal-coding
+FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-mixed-nal-coding
 
 # this sample has invalid extradata that is not escaped
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-unescaped-extradata
+FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-unescaped-extradata
 
 # this sample contains field-coded frames, with both fields in a single packet
-FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-twofields-packet
+FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-twofields-packet
 
-FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF H264_MUXER) += fate-h264-bsf-mp4toannexb
-FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff
-FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580
-FATE_H264-$(call DEMDEC, MXF, H264) += fate-h264-xavc-4389
-FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-attachment-631
-FATE_H264-$(call DEMDEC, MPEGTS, H264) += fate-h264-skip-nokey fate-h264-skip-nointra
+FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb
+FATE_H264-$(call FRAMECRC, MATROSKA, H264) += fate-h264-direct-bff
+FATE_H264-$(call FRAMECRC, FLV, H264, SCALE_FILTER) += fate-h264-brokensps-2580
+FATE_H264-$(call FRAMECRC, MXF, H264, PCM_S24LE_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-xavc-4389
+FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-attachment-631
+FATE_H264-$(call FRAMECRC, MPEGTS, H264, H264_PARSER MP3_DECODER SCALE_FILTER ARESAMPLE_FILTER) += fate-h264-skip-nokey fate-h264-skip-nointra
 FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames
 
 FATE_SAMPLES_AVCONV += $(FATE_H264-yes)
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".