tests/fate: replace all -f md5 by framemd5

also limit dcinema-encode to 20 frames to avoid huge reference checksum lists

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

8 files changed, 90 insertions, 12 deletions

diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index 9ba4be50d0..e6502aae69 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -25,7 +25,7 @@ fate-w64: CMD = crc -i $(TARGET_SAMPLES)/w64/w64-pcm16.w64
 FATE_PCM-$(call ENCMUX, PCM_S24DAUD, DAUD) += fate-dcinema-encode
 fate-dcinema-encode: tests/data/asynth-96000-6.wav
 fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav
-fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud
+fate-dcinema-encode: CMD = enc_dec_pcm daud framemd5 s16le $(SRC) -c:a pcm_s24daud -aframes 20
 
 FATE_FFMPEG += $(FATE_PCM-yes)
 FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes)
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 44b5b932a7..7389c43c13 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -4,7 +4,7 @@ fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722
 FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode
 fate-g722-encode: tests/data/asynth-16000-1.wav
 fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
-fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722
+fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722
 
 FATE_VOICE-yes += $(FATE_G722-yes)
 fate-g722: $(FATE_G722)
@@ -38,16 +38,16 @@ FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes)
 fate-g723_1: $(FATE_G723_1)
 
 FATE_G726 += fate-g726-encode-2bit
-fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k
+fate-g726-encode-2bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 16k
 
 FATE_G726 += fate-g726-encode-3bit
-fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k
+fate-g726-encode-3bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 24k
 
 FATE_G726 += fate-g726-encode-4bit
-fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k
+fate-g726-encode-4bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 32k
 
 FATE_G726 += fate-g726-encode-5bit
-fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
+fate-g726-encode-5bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 40k
 
 $(FATE_G726): tests/data/asynth-8000-1.wav
 $(FATE_G726): SRC = tests/data/asynth-8000-1.wav
diff --git a/tests/ref/fate/dcinema-encode b/tests/ref/fate/dcinema-encode
index 8aeb21526c..93ac17206e 100644
--- a/tests/ref/fate/dcinema-encode
+++ b/tests/ref/fate/dcinema-encode
@@ -1 +1,25 @@
-MD5=2d7c6897c315493647db159f4bfd6edc
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/96000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      341,     4092, 697cddfcd0e21f24782af0705b7048f3
+0,        341,        341,      341,     4092, a057b18cd493923fed33c18578f61e0b
+0,        682,        682,      341,     4092, f4eacfd888566040067b8e5ce7d276c6
+0,       1023,       1023,      341,     4092, 4de78d332ce2047014880a110c160dc2
+0,       1364,       1364,      341,     4092, 138ee3fc206538feca6de3d6d62d08eb
+0,       1705,       1705,      341,     4092, 187a2f2998aa1c0ba0130c57dd1d6c86
+0,       2046,       2046,      341,     4092, 54e6c3db8a5f8c09b47f025659a36b17
+0,       2387,       2387,      341,     4092, 8abfdf44a24c158429c71e01cee31e20
+0,       2728,       2728,      341,     4092, bd08f5018edc5dc4520739e913ed89a3
+0,       3069,       3069,      341,     4092, 9f60ba4275646344e4a9b3c647efffe9
+0,       3410,       3410,      341,     4092, 00cefc1f27230cdd06ecd43132e16327
+0,       3751,       3751,      341,     4092, d4d13047cd639ed722a4ae1bc1f06991
+0,       4092,       4092,      341,     4092, 16b227e4f968c11cba279506f00d5172
+0,       4433,       4433,      341,     4092, 70f4046f709fdd4d80e2f2ffc862f21a
+0,       4774,       4774,      341,     4092, adbef4b4ef728f0c2a31b4b0baba50a0
+0,       5115,       5115,      341,     4092, fe009b6cc96b9d1098dcc5fba0e6b3fa
+0,       5456,       5456,      341,     4092, 4462b2f1654c9b31fdd7ab04ffb84192
+0,       5797,       5797,      341,     4092, 2e96ba3bd13de03f9cfdc2b8c3ea0620
+0,       6138,       6138,      341,     4092, 395c920f10cce6670029a98095eba027
+0,       6479,       6479,      341,     4092, 28d4c2f6364f31cb61f4aa144badc734
diff --git a/tests/ref/fate/g722-encode b/tests/ref/fate/g722-encode
index c7198cf83c..3f6b3cffea 100644
--- a/tests/ref/fate/g722-encode
+++ b/tests/ref/fate/g722-encode
@@ -1 +1,17 @@
-MD5=7106189574186051c0497b287e2e5f19
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/16000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     8192,    16384, 1dd9c285eb608038f3257d1a8e02eb75
+0,       8192,       8192,     8192,    16384, f7459334cbe70c06bc0897edfe64e840
+0,      16384,      16384,     8192,    16384, 486e7d07c8879ccd304689ad61911e5d
+0,      24576,      24576,     8192,    16384, 5178262fdeff11dc025c72a2678e420d
+0,      32768,      32768,     8192,    16384, 913f8208615dcd643edafda7db1eb943
+0,      40960,      40960,     8192,    16384, 0b8dc719670feac586db87bf3a92cc2a
+0,      49152,      49152,     8192,    16384, 075dc5022f5e9f1cb2fcd066e590fed1
+0,      57344,      57344,     8192,    16384, a6494307ecb1359ff42d6e05cf40ca4c
+0,      65536,      65536,     8192,    16384, 5b28d3b0d6d2bfe7100daeefcb3010ec
+0,      73728,      73728,     8192,    16384, b3cf1952b8a0d2e6a2741867e9fa8e24
+0,      81920,      81920,     8192,    16384, f0981f8fa28bbc0ba6a527b041468951
+0,      90112,      90112,     5888,    11776, 1e3d1b3d0da71aa2cdc00175cc47433a
diff --git a/tests/ref/fate/g726-encode-2bit b/tests/ref/fate/g726-encode-2bit
index 26a12190fc..2e613107ab 100644
--- a/tests/ref/fate/g726-encode-2bit
+++ b/tests/ref/fate/g726-encode-2bit
@@ -1 +1,8 @@
-MD5=215eaef5778a16e2bf4f3725a557f355
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/8000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,    16384,    32768, b28b116d2315323aeba6b66b58b7f4ed
+0,      16384,      16384,    16384,    32768, e9cfbebe99490bd4987341ee748291c4
+0,      32768,      32768,    15232,    30464, f890e7f29bc76ca6c214fac0cedd7a49
diff --git a/tests/ref/fate/g726-encode-3bit b/tests/ref/fate/g726-encode-3bit
index f9c6940217..ce43d325d4 100644
--- a/tests/ref/fate/g726-encode-3bit
+++ b/tests/ref/fate/g726-encode-3bit
@@ -1 +1,10 @@
-MD5=0bebd949dfd5ac0ae3f2c3ceb2e3fac1
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/8000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,    10920,    21840, 517dd6d1ce566b998251f0d215fa69c0
+0,      10920,      10920,    10920,    21840, b0268e2bcc67acb524753790123c65fd
+0,      21840,      21840,    10920,    21840, a072a222a4910642f12e127b95a4d640
+0,      32760,      32760,    10920,    21840, 83bcd3c91cc3b57afdab0cb79a83d7b7
+0,      43680,      43680,     4320,     8640, 0125e504113997ac7bcc027616edad55
diff --git a/tests/ref/fate/g726-encode-4bit b/tests/ref/fate/g726-encode-4bit
index 6d03517164..1ccc180874 100644
--- a/tests/ref/fate/g726-encode-4bit
+++ b/tests/ref/fate/g726-encode-4bit
@@ -1 +1,11 @@
-MD5=a21cfea116ab2179eabe5d84b6bfc09a
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/8000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     8192,    16384, a0cf3a0953adce1a1032a4fd2da00a52
+0,       8192,       8192,     8192,    16384, c750c1b76a203556dd60d73d261529e9
+0,      16384,      16384,     8192,    16384, 4c116836487c05f259168f63883d6496
+0,      24576,      24576,     8192,    16384, 3e4f96c06d4c33c97829f962a5b4b443
+0,      32768,      32768,     8192,    16384, 55d73226120bcd01e4c0ea22a360e2ef
+0,      40960,      40960,     7040,    14080, de8f12a49e673ce923c2512b36e0ce8f
diff --git a/tests/ref/fate/g726-encode-5bit b/tests/ref/fate/g726-encode-5bit
index 459ebb39f2..219c73d98d 100644
--- a/tests/ref/fate/g726-encode-5bit
+++ b/tests/ref/fate/g726-encode-5bit
@@ -1 +1,13 @@
-MD5=9cad98cf5205bf76d6e9d1241e56141a
+#format: frame checksums
+#version: 1
+#hash: MD5
+#tb 0: 1/8000
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     6552,    13104, 6fe3f75df1262c5f956887de9c32df40
+0,       6552,       6552,     6552,    13104, f955518de6f61f94253280d11d64d68b
+0,      13104,      13104,     6552,    13104, a3f2db5d35e0d923787b71aa352466de
+0,      19656,      19656,     6552,    13104, 90c41dc1338579e2e19edb811f8d58a9
+0,      26208,      26208,     6552,    13104, 4fbcd13f77e8cc0e61a7c9010e42adf1
+0,      32760,      32760,     6552,    13104, 82ef661e2afc2a1d6996005f17c1618c
+0,      39312,      39312,     6552,    13104, 1f5e9875ddcf88063e4adf910a8f0fa6
+0,      45864,      45864,     2136,     4272, 9a1cdf7ec6b06762047cdb1320d9d32e