From a6c8cca2a82c8cd9ffdaaa2af8b922b15ab035a7 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Mon, 16 Apr 2012 21:49:11 -0400
Subject: [PATCH] FATE: replace current g722 encoding tests with an
 encode/decode test

Avoids resampling and channel mixing. This only tests the behavior
with respect to input and output audio rather than also testing changes
to the encoder or muxer that do not affect the resulting decoded output.
---
 tests/Makefile             |  3 ---
 tests/codec-regression.sh  |  5 -----
 tests/fate/voice.mak       | 12 ++++++++----
 tests/ref/acodec/g722      |  4 ----
 tests/ref/fate/g722-encode |  1 +
 tests/ref/fate/g722enc     |  1 -
 6 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 tests/ref/acodec/g722
 create mode 100644 tests/ref/fate/g722-encode
 delete mode 100644 tests/ref/fate/g722enc

diff --git a/tests/Makefile b/tests/Makefile
index 07c7b9dd6e..19fbe11fd2 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -16,9 +16,6 @@ tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF) | tests/vsynth2
 tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data
 	$(M)./$< $@
 
-tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) | tests/data
-	$(M)./$< $@ 16000 1
-
 tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data
 	$(M)./$< $@ $(subst -, ,$*)
 
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index f3932d4c29..50e45032ff 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -311,11 +311,6 @@ do_audio_encoding ac3.ac3 "-vn -acodec ac3_fixed"
 #$tiny_psnr $pcm_dst $pcm_ref 2 1024
 fi
 
-if [ -n "$do_g722" ] ; then
-do_audio_encoding g722.wav "-b 64k -ac 1 -ar 16000 -acodec g722"
-do_audio_decoding
-fi
-
 if [ -n "$do_g726" ] ; then
 do_audio_encoding g726.wav "-b 32k -ac 1 -ar 8000 -acodec g726"
 do_audio_decoding
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 834b0ffc1f..8e5f86b083 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -1,9 +1,13 @@
-FATE_TESTS += fate-g722dec-1
+FATE_G722 += fate-g722dec-1
 fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
 
-FATE_TESTS += fate-g722enc
-fate-g722enc: tests/data/asynth-16000-1.sw
-fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
+FATE_G722 += 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_TESTS += $(FATE_G722)
+fate-g722: $(FATE_G722)
 
 FATE_GSM += fate-gsm-ms
 fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
diff --git a/tests/ref/acodec/g722 b/tests/ref/acodec/g722
deleted file mode 100644
index e3a5af3d7a..0000000000
--- a/tests/ref/acodec/g722
+++ /dev/null
@@ -1,4 +0,0 @@
-f30e8e99cfd3f38ba66f1d4131602a19 *./tests/data/acodec/g722.wav
-48053 ./tests/data/acodec/g722.wav
-b5568e0e3930ff563824156e8e1015f0 *./tests/data/g722.acodec.out.wav
-stddev: 8939.44 PSNR: 17.30 MAXDIFF:40370 bytes:   191980/  1058400
diff --git a/tests/ref/fate/g722-encode b/tests/ref/fate/g722-encode
new file mode 100644
index 0000000000..c7198cf83c
--- /dev/null
+++ b/tests/ref/fate/g722-encode
@@ -0,0 +1 @@
+MD5=7106189574186051c0497b287e2e5f19
diff --git a/tests/ref/fate/g722enc b/tests/ref/fate/g722enc
deleted file mode 100644
index 9b8e469a8b..0000000000
--- a/tests/ref/fate/g722enc
+++ /dev/null
@@ -1 +0,0 @@
-94e2f200d6e05b47cec4aa3e94571cf3