Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c'

* commit 'eb8a8115994434b548523cf0bca6a4a74784e79c':
  tests: Convert audio-only lavf tests to non-legacy test scripts

Merged-by: James Almer <jamrial@gmail.com>

27 files changed, 60 insertions, 59 deletions

diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index c504c18c4a..d72ec85150 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif
-88270 ./tests/data/lavf/lavf.aif
-./tests/data/lavf/lavf.aif CRC=0x3a1da17e
+2c129d88acef834e32869145fe792b9c *tests/data/lavf/lavf.aiff
+88270 tests/data/lavf/lavf.aiff
+tests/data/lavf/lavf.aiff CRC=0x3a1da17e
diff --git a/tests/ref/lavf/al b/tests/ref/lavf/al
new file mode 100644
index 0000000000..c383c36284
--- /dev/null
+++ b/tests/ref/lavf/al
@@ -0,0 +1,3 @@
+652d96e474869ddb01403743deb35117 *tests/data/lavf/lavf.al
+44100 tests/data/lavf/lavf.al
+tests/data/lavf/lavf.al CRC=0xf9643112
diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/alaw
deleted file mode 100644
index d93d6fc0ee..0000000000
--- a/tests/ref/lavf/alaw
+++ /dev/null
@@ -1,3 +0,0 @@
-652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al
-44100 ./tests/data/lavf/lavf.al
-./tests/data/lavf/lavf.al CRC=0xf9643112
diff --git a/tests/ref/lavf/ast b/tests/ref/lavf/ast
index 513c612e76..2f2e8de46f 100644
--- a/tests/ref/lavf/ast
+++ b/tests/ref/lavf/ast
@@ -1,3 +1,3 @@
-07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast
-177872 ./tests/data/lavf/lavf.ast
-./tests/data/lavf/lavf.ast CRC=0xe61e3bd0
+07f5d23aa8bade984034f7005bd72947 *tests/data/lavf/lavf.ast
+177872 tests/data/lavf/lavf.ast
+tests/data/lavf/lavf.ast CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au
index dcd02f335c..4abedf3095 100644
--- a/tests/ref/lavf/au
+++ b/tests/ref/lavf/au
@@ -1,3 +1,3 @@
-5228ad3783888c45a08dac5ab6118794 *./tests/data/lavf/lavf.au
-88240 ./tests/data/lavf/lavf.au
-./tests/data/lavf/lavf.au CRC=0x3a1da17e
+5228ad3783888c45a08dac5ab6118794 *tests/data/lavf/lavf.au
+88240 tests/data/lavf/lavf.au
+tests/data/lavf/lavf.au CRC=0x3a1da17e
diff --git a/tests/ref/lavf/caf b/tests/ref/lavf/caf
index 7b2a67d1c0..8488f3fee2 100644
--- a/tests/ref/lavf/caf
+++ b/tests/ref/lavf/caf
@@ -1,3 +1,3 @@
-c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf
-88323 ./tests/data/lavf/lavf.caf
-./tests/data/lavf/lavf.caf CRC=0x3a1da17e
+c3c38cba600722c87c0e75bd0688b7fc *tests/data/lavf/lavf.caf
+88323 tests/data/lavf/lavf.caf
+tests/data/lavf/lavf.caf CRC=0x3a1da17e
diff --git a/tests/ref/lavf/ircam b/tests/ref/lavf/ircam
index 47e07098e5..7a17fb232b 100644
--- a/tests/ref/lavf/ircam
+++ b/tests/ref/lavf/ircam
@@ -1,3 +1,3 @@
-45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam
-89224 ./tests/data/lavf/lavf.ircam
-./tests/data/lavf/lavf.ircam CRC=0x3a1da17e
+45d9a4667030e95d1d8fb6ab012f1aa0 *tests/data/lavf/lavf.ircam
+89224 tests/data/lavf/lavf.ircam
+tests/data/lavf/lavf.ircam CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka
index ac0f6cf316..87f5ad8c97 100644
--- a/tests/ref/lavf/mka
+++ b/tests/ref/lavf/mka
@@ -1,3 +1,3 @@
-2d9722c0691e140237af0036e3a178b0 *./tests/data/lavf/lavf.mka
-43684 ./tests/data/lavf/lavf.mka
-./tests/data/lavf/lavf.mka CRC=0x3a1da17e
+2d9722c0691e140237af0036e3a178b0 *tests/data/lavf/lavf.mka
+43684 tests/data/lavf/lavf.mka
+tests/data/lavf/lavf.mka CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf
index fae95cadd5..36094bc900 100644
--- a/tests/ref/lavf/mmf
+++ b/tests/ref/lavf/mmf
@@ -1,3 +1,3 @@
-643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf
-22611 ./tests/data/lavf/lavf.mmf
-./tests/data/lavf/lavf.mmf CRC=0x8dea1388
+643fadf7482f6d937ed75ec4f508e4f1 *tests/data/lavf/lavf.mmf
+22611 tests/data/lavf/lavf.mmf
+tests/data/lavf/lavf.mmf CRC=0x8dea1388
diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/mulaw
deleted file mode 100644
index bd540847de..0000000000
--- a/tests/ref/lavf/mulaw
+++ /dev/null
@@ -1,3 +0,0 @@
-ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul
-44100 ./tests/data/lavf/lavf.ul
-./tests/data/lavf/lavf.ul CRC=0x4515fa26
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index a08fb5ed82..3ac10e6f7c 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
-13516 ./tests/data/lavf/lavf.ogg
-./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
+81b9366cacb23644c2803585dced9996 *tests/data/lavf/lavf.ogg
+13516 tests/data/lavf/lavf.ogg
+tests/data/lavf/lavf.ogg CRC=0x3a1da17e
diff --git a/tests/ref/lavf/peak.wav b/tests/ref/lavf/peak.wav
new file mode 100644
index 0000000000..573d53221f
--- /dev/null
+++ b/tests/ref/lavf/peak.wav
@@ -0,0 +1,3 @@
+105805963fb767d00da056f42f32d9f3 *tests/data/lavf/lavf.peak.wav
+89094 tests/data/lavf/lavf.peak.wav
+tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/peak_only.wav b/tests/ref/lavf/peak_only.wav
new file mode 100644
index 0000000000..c468731b00
--- /dev/null
+++ b/tests/ref/lavf/peak_only.wav
@@ -0,0 +1,3 @@
+f1a8aeeae8069f3992c4d780436c3d23 *tests/data/lavf/lavf.peak_only.wav
+832 tests/data/lavf/lavf.peak_only.wav
+tests/data/lavf/lavf.peak_only.wav
diff --git a/tests/ref/lavf/rso b/tests/ref/lavf/rso
index 5878f434a1..6b2f03e181 100644
--- a/tests/ref/lavf/rso
+++ b/tests/ref/lavf/rso
@@ -1,3 +1,3 @@
-443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso
-44108 ./tests/data/lavf/lavf.rso
-./tests/data/lavf/lavf.rso CRC=0x298fd284
+443b72346065d6318ca18c8395aa1d87 *tests/data/lavf/lavf.rso
+44108 tests/data/lavf/lavf.rso
+tests/data/lavf/lavf.rso CRC=0x298fd284
diff --git a/tests/ref/lavf/s16.voc b/tests/ref/lavf/s16.voc
new file mode 100644
index 0000000000..9b17a4c9b9
--- /dev/null
+++ b/tests/ref/lavf/s16.voc
@@ -0,0 +1,3 @@
+db9fa22ff71992bd8b6cc80047223c92 *tests/data/lavf/lavf.s16.voc
+176615 tests/data/lavf/lavf.s16.voc
+tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/sox b/tests/ref/lavf/sox
index fc368b1357..fc3953e128 100644
--- a/tests/ref/lavf/sox
+++ b/tests/ref/lavf/sox
@@ -1,3 +1,3 @@
-683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox
-176432 ./tests/data/lavf/lavf.sox
-./tests/data/lavf/lavf.sox CRC=0x3a1da17e
+683635d5cb1344e44fa96df90c3a993c *tests/data/lavf/lavf.sox
+176432 tests/data/lavf/lavf.sox
+tests/data/lavf/lavf.sox CRC=0x3a1da17e
diff --git a/tests/ref/lavf/tta b/tests/ref/lavf/tta
index d86d097e3d..f6fe9d84ff 100644
--- a/tests/ref/lavf/tta
+++ b/tests/ref/lavf/tta
@@ -1,3 +1,3 @@
-d86c5cccb2554143d34d1786ab460a31 *./tests/data/lavf/lavf.tta
-43200 ./tests/data/lavf/lavf.tta
-./tests/data/lavf/lavf.tta CRC=0x3a1da17e
+d86c5cccb2554143d34d1786ab460a31 *tests/data/lavf/lavf.tta
+43200 tests/data/lavf/lavf.tta
+tests/data/lavf/lavf.tta CRC=0x3a1da17e
diff --git a/tests/ref/lavf/ul b/tests/ref/lavf/ul
new file mode 100644
index 0000000000..cf025937b3
--- /dev/null
+++ b/tests/ref/lavf/ul
@@ -0,0 +1,3 @@
+ad492935e361f830f2f8302aa102701d *tests/data/lavf/lavf.ul
+44100 tests/data/lavf/lavf.ul
+tests/data/lavf/lavf.ul CRC=0x4515fa26
diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc
index ded8af7227..0ac933e2f1 100644
--- a/tests/ref/lavf/voc
+++ b/tests/ref/lavf/voc
@@ -1,3 +1,3 @@
-bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc
-44305 ./tests/data/lavf/lavf.voc
-./tests/data/lavf/lavf.voc CRC=0x298fd284
+bb5ad96a5e1b35683d50bf18115db821 *tests/data/lavf/lavf.voc
+44305 tests/data/lavf/lavf.voc
+tests/data/lavf/lavf.voc CRC=0x298fd284
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
deleted file mode 100644
index d026090aff..0000000000
--- a/tests/ref/lavf/voc_s16
+++ /dev/null
@@ -1,3 +0,0 @@
-db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc
-176615 ./tests/data/lavf/lavf.s16.voc
-./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/w64 b/tests/ref/lavf/w64
index 26c68688e5..2b6bc23aef 100644
--- a/tests/ref/lavf/w64
+++ b/tests/ref/lavf/w64
@@ -1,3 +1,3 @@
-82c75c9cb61924fda68d9602ea69c445 *./tests/data/lavf/lavf.w64
-88304 ./tests/data/lavf/lavf.w64
-./tests/data/lavf/lavf.w64 CRC=0x3a1da17e
+82c75c9cb61924fda68d9602ea69c445 *tests/data/lavf/lavf.w64
+88304 tests/data/lavf/lavf.w64
+tests/data/lavf/lavf.w64 CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav
index da3bfc24ed..0540eab07c 100644
--- a/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@ -1,3 +1,3 @@
-fc958a32b4fca7b1c40cbdaef2d1416e *./tests/data/lavf/lavf.wav
-88274 ./tests/data/lavf/lavf.wav
-./tests/data/lavf/lavf.wav CRC=0x3a1da17e
+fc958a32b4fca7b1c40cbdaef2d1416e *tests/data/lavf/lavf.wav
+88274 tests/data/lavf/lavf.wav
+tests/data/lavf/lavf.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav_peak b/tests/ref/lavf/wav_peak
deleted file mode 100644
index 861b246d72..0000000000
--- a/tests/ref/lavf/wav_peak
+++ /dev/null
@@ -1,3 +0,0 @@
-105805963fb767d00da056f42f32d9f3 *./tests/data/lavf/lavf.peak.wav
-89094 ./tests/data/lavf/lavf.peak.wav
-./tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav_peak_only b/tests/ref/lavf/wav_peak_only
deleted file mode 100644
index b203d0345b..0000000000
--- a/tests/ref/lavf/wav_peak_only
+++ /dev/null
@@ -1,2 +0,0 @@
-f1a8aeeae8069f3992c4d780436c3d23 *./tests/data/lavf/lavf.peak_only.wav
-832 ./tests/data/lavf/lavf.peak_only.wav
diff --git a/tests/ref/lavf/wv b/tests/ref/lavf/wv
index 323c5df6d5..07205093f3 100644
--- a/tests/ref/lavf/wv
+++ b/tests/ref/lavf/wv
@@ -1,3 +1,3 @@
-47d9a381d9c3f99b8b059f3b17f1dc11 *./tests/data/lavf/lavf.wv
-59560 ./tests/data/lavf/lavf.wv
-./tests/data/lavf/lavf.wv CRC=0x3a1da17e
+47d9a381d9c3f99b8b059f3b17f1dc11 *tests/data/lavf/lavf.wv
+59560 tests/data/lavf/lavf.wv
+tests/data/lavf/lavf.wv CRC=0x3a1da17e
diff --git a/tests/ref/seek/lavf-alaw b/tests/ref/seek/lavf-al
index 8d517fa2bb..8d517fa2bb 100644
--- a/tests/ref/seek/lavf-alaw
+++ b/tests/ref/seek/lavf-al
diff --git a/tests/ref/seek/lavf-mulaw b/tests/ref/seek/lavf-ul
index 8d517fa2bb..8d517fa2bb 100644
--- a/tests/ref/seek/lavf-mulaw
+++ b/tests/ref/seek/lavf-ul