[FFmpeg-cvslog] fate: make acodec-ac3_fixed test output raw AC3

Mans Rullgard git at videolan.org
Fri Feb 3 04:15:59 CET 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Thu Feb  2 01:46:05 2012 +0000| [2c98f407c8803da3002747f3a8d43696e8744dc7] | committer: Mans Rullgard

fate: make acodec-ac3_fixed test output raw AC3

There is no point in this test using the RM format.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c98f407c8803da3002747f3a8d43696e8744dc7
---

 configure                  |    2 +-
 tests/codec-regression.sh  |    2 +-
 tests/ref/acodec/ac3_fixed |    4 +-
 tests/ref/seek/ac3_ac3     |   49 ++++++++++++++++++++++++++++++++++++++++++++
 tests/ref/seek/ac3_rm      |   44 ---------------------------------------
 5 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/configure b/configure
index 49f9af2..38c8457 100755
--- a/configure
+++ b/configure
@@ -1630,7 +1630,7 @@ test_deps _muxer _demuxer                                               \
     wav                                                                 \
     yuv4mpegpipe=yuv4mpeg                                               \
 
-ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder rm_muxer rm_demuxer"
+ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder"
 mpg_test_deps="mpeg1system_muxer mpegps_demuxer"
 
 # default parameters
diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index faa61e6..21b53b7 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -295,7 +295,7 @@ $tiny_psnr $pcm_dst $pcm_ref 2 1924
 fi
 
 if [ -n "$do_ac3_fixed" ] ; then
-do_audio_encoding ac3.rm "-vn -acodec ac3_fixed"
+do_audio_encoding ac3.ac3 "-vn -acodec ac3_fixed"
 # binaries configured with --disable-sse decode ac3 differently
 #do_audio_decoding
 #$tiny_psnr $pcm_dst $pcm_ref 2 1024
diff --git a/tests/ref/acodec/ac3_fixed b/tests/ref/acodec/ac3_fixed
index dba2dfc..0c2f9b7 100644
--- a/tests/ref/acodec/ac3_fixed
+++ b/tests/ref/acodec/ac3_fixed
@@ -1,2 +1,2 @@
-e7fa185030a56d9db8663ad9e38c6c94 *./tests/data/acodec/ac3.rm
-98751 ./tests/data/acodec/ac3.rm
+a1d1fc116463b771abf5aef7ed37d7b1 *./tests/data/acodec/ac3.ac3
+96408 ./tests/data/acodec/ac3.ac3
diff --git a/tests/ref/seek/ac3_ac3 b/tests/ref/seek/ac3_ac3
new file mode 100644
index 0000000..167dc8d
--- /dev/null
+++ b/tests/ref/seek/ac3_ac3
@@ -0,0 +1,49 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880400 pts: 1.880400 pos:  30092 size:   558
+ret: 0         st: 0 flags:0  ts: 0.788333
+ret: 0         st: 0 flags:1 dts: 0.800911 pts: 0.800911 pos:  12818 size:   556
+ret:-1         st: 0 flags:1  ts:-0.317500
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.576844 pts: 2.576844 pos:  41238 size:   558
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.462533 pts: 1.462533 pos:  23406 size:   556
+ret: 0         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1 dts: 0.383044 pts: 0.383044 pos:   6130 size:   558
+ret:-1         st: 0 flags:1  ts:-0.740833
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.158978 pts: 2.158978 pos:  34552 size:   556
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.044667 pts: 1.044667 pos:  16718 size:   558
+ret: 0         st: 0 flags:0  ts:-0.058333
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
+ret: 0         st: 0 flags:1  ts: 2.835833
+ret: 0         st: 0 flags:1 dts: 2.820600 pts: 2.820600 pos:  45140 size:   556
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.741111 pts: 1.741111 pos:  27864 size:   556
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.591978 pts: 0.591978 pos:   9474 size:   556
+ret: 0         st: 0 flags:0  ts:-0.481667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
+ret: 0         st: 0 flags:1  ts: 2.412500
+ret: 0         st: 0 flags:1 dts: 2.402733 pts: 2.402733 pos:  38452 size:   558
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.323244 pts: 1.323244 pos:  21176 size:   558
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.174111 pts: 0.174111 pos:   2786 size:   558
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:   556
+ret: 0         st: 0 flags:1  ts: 1.989178
+ret: 0         st: 0 flags:1 dts: 1.984867 pts: 1.984867 pos:  31764 size:   558
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.905378 pts: 0.905378 pos:  14488 size:   558
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 2.681311 pts: 2.681311 pos:  42910 size:   558
+ret: 0         st: 0 flags:1  ts: 1.565844
+ret: 0         st: 0 flags:1 dts: 1.532178 pts: 1.532178 pos:  24520 size:   558
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.487511 pts: 0.487511 pos:   7802 size:   556
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/ac3_rm b/tests/ref/seek/ac3_rm
deleted file mode 100644
index b38758b..0000000
--- a/tests/ref/seek/ac3_rm
+++ /dev/null
@@ -1,44 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret:-1         st:-1 flags:1  ts: 1.894167
-ret:-1         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret:-1         st:-1 flags:1  ts: 1.470835
-ret:-1         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret:-1         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret:-1         st: 0 flags:1  ts: 2.836000
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts:8589.800000 pts:8589.800000 pos:  65950 size: 32801
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.256000 pts: 0.256000 pos:  65337 size:   400
-ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret:-1         st: 0 flags:1  ts: 2.413000
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts:8589.800000 pts:8589.800000 pos:  65950 size: 32801
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.034000 pts: 0.034000 pos:    839 size:   558
-ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 0.256000 pts: 0.256000 pos:  65337 size:   400
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 3.378000 pts: 3.378000 pos:  55491 size:   558
-ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556
-ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 3.378000 pts: 3.378000 pos:  55491 size:   558
-ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 0.256000 pts: 0.256000 pos:  65337 size:   400
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 3.378000 pts: 3.378000 pos:  55491 size:   558
-ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    271 size:   556



More information about the ffmpeg-cvslog mailing list