From 10e3dd15a5ce3d9ce6466d5f3e06c44e48753100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 7 Apr 2012 13:22:51 +0200
Subject: [PATCH] Remove AAC and nellymoser tests that do not work.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
---
 tests/codec-regression.sh   | 13 ++-----------
 tests/ref/acodec/aac        |  5 -----
 tests/ref/acodec/nellymoser |  5 -----
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 tests/ref/acodec/aac
 delete mode 100644 tests/ref/acodec/nellymoser

diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 76059bb681..54d206e89c 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -439,12 +439,6 @@ do_audio_encoding flac.flac "-acodec flac -compression_level 2"
 do_audio_decoding
 fi
 
-if [ -n "$do_aac" ] ; then
-do_audio_encoding aac.aac "-b:a 512k -strict -2 -acodec aac"
-do_audio_decoding
-$tiny_psnr $pcm_dst $pcm_ref 2 4096
-fi
-
 if [ -n "$do_dca" ] ; then
 do_audio_encoding dca.dts "-strict -2 -channel_layout 3 -acodec dca"
 do_audio_decoding
@@ -457,11 +451,8 @@ do_audio_decoding "-ac 2"
 $tiny_psnr $pcm_dst $pcm_ref 2 640
 fi
 
-if [ -n "$do_nellymoser" ] ; then
-do_audio_encoding nellymoser.flv "-ac 1 -acodec nellymoser"
-do_audio_decoding "-ac 2"
-$tiny_psnr $pcm_dst $pcm_ref 2 252
-fi
+# AAC and nellymoser are not bit-exact across platforms,
+# they were moved to enc_dec_pcm tests instead.
 
 #if [ -n "$do_vorbis" ] ; then
 # vorbis
diff --git a/tests/ref/acodec/aac b/tests/ref/acodec/aac
deleted file mode 100644
index c4c9a6f262..0000000000
--- a/tests/ref/acodec/aac
+++ /dev/null
@@ -1,5 +0,0 @@
-021a46cb2d8edd42b8c4e1afa31b3896 *./tests/data/acodec/aac.aac
-206625 ./tests/data/acodec/aac.aac
-17bff7905bed1a3defb62febf64b7532 *./tests/data/aac.acodec.out.wav
-stddev:10838.47 PSNR: 15.63 MAXDIFF:65356 bytes:  1064960/  1058400
-stddev: 1862.44 PSNR: 30.93 MAXDIFF:43902 bytes:  1060864/  1058400
diff --git a/tests/ref/acodec/nellymoser b/tests/ref/acodec/nellymoser
deleted file mode 100644
index fa04f83ee2..0000000000
--- a/tests/ref/acodec/nellymoser
+++ /dev/null
@@ -1,5 +0,0 @@
-46830431216729f78e15c634e91e6ebf *./tests/data/acodec/nellymoser.flv
-82916 ./tests/data/acodec/nellymoser.flv
-ae1e5ec9f206e0e665e54c1c4559fc61 *./tests/data/nellymoser.acodec.out.wav
-stddev:10148.84 PSNR: 16.20 MAXDIFF:55923 bytes:  1058816/  1058400
-stddev: 8398.32 PSNR: 17.85 MAXDIFF:55915 bytes:  1058564/  1058400