From c3a06615bdf00fcf64747f12a0ba1a2c7fb2e576 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 18 Jan 2012 13:09:43 -0500 Subject: bethsoftvideo: fix palette reading. Return the correct number of consumed bytes and set *data_size = 0. Returned size is 1 too small, leading to that 1 byte being read as the next frame, which results in an extra blank frame at the beginning of the stream. --- tests/ref/fate/bethsoft-vid | 141 ++++++++++++++++++++++---------------------- 1 file changed, 70 insertions(+), 71 deletions(-) (limited to 'tests') diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid index 0886bfcf48..92c694b19e 100644 --- a/tests/ref/fate/bethsoft-vid +++ b/tests/ref/fate/bethsoft-vid @@ -1,91 +1,90 @@ -0, 0, 192000, 0xdecc683b +0, 0, 192000, 0x00000000 1, 0, 1480, 0x00000000 -0, 1500, 192000, 0x00000000 -0, 3000, 192000, 0x01a6cf45 -0, 4500, 192000, 0xd07d57e9 +0, 1500, 192000, 0x01a6cf45 +0, 3000, 192000, 0xd07d57e9 +0, 4500, 192000, 0x3cb1dff5 1, 5994, 1480, 0x20a92bd4 -0, 6000, 192000, 0x3cb1dff5 -0, 7500, 192000, 0xd1aaa8fb -0, 9000, 192000, 0x75f526cd -0, 10500, 192000, 0x0f673577 +0, 6000, 192000, 0xd1aaa8fb +0, 7500, 192000, 0x75f526cd +0, 9000, 192000, 0x0f673577 +0, 10500, 192000, 0x897b6781 1, 11988, 1850, 0xa9e48a74 -0, 12000, 192000, 0x897b6781 -0, 13500, 192000, 0x81e6b7f7 -0, 15000, 192000, 0x1f45ce61 -0, 16500, 192000, 0x5a0772a6 -0, 18000, 192000, 0xf78732b3 +0, 12000, 192000, 0x81e6b7f7 +0, 13500, 192000, 0x1f45ce61 +0, 15000, 192000, 0x5a0772a6 +0, 16500, 192000, 0xf78732b3 +0, 18000, 192000, 0x8427f9e5 1, 19481, 1480, 0x23ecd018 -0, 19500, 192000, 0x8427f9e5 -0, 21000, 192000, 0x40473f11 -0, 22500, 192000, 0x173ceebe -0, 24000, 192000, 0x136b9516 +0, 19500, 192000, 0x40473f11 +0, 21000, 192000, 0x173ceebe +0, 22500, 192000, 0x136b9516 +0, 24000, 192000, 0x138d11ae 1, 25475, 1480, 0x206bb915 -0, 25500, 192000, 0x138d11ae -0, 27000, 192000, 0x063dbff3 -0, 28500, 192000, 0x5280852f -0, 30000, 192000, 0x99943a8f +0, 25500, 192000, 0x063dbff3 +0, 27000, 192000, 0x5280852f +0, 28500, 192000, 0x99943a8f +0, 30000, 192000, 0x0330a728 1, 31469, 1850, 0xb0e10e75 -0, 31500, 192000, 0x0330a728 -0, 33000, 192000, 0x5d35467d -0, 34500, 192000, 0xfd436343 -0, 36000, 192000, 0xc323fcfe -0, 37500, 192000, 0x2a1530a0 +0, 31500, 192000, 0x5d35467d +0, 33000, 192000, 0xfd436343 +0, 34500, 192000, 0xc323fcfe +0, 36000, 192000, 0x2a1530a0 +0, 37500, 192000, 0xbd43bb60 1, 38961, 1480, 0x8d9baedd -0, 39000, 192000, 0xbd43bb60 -0, 40500, 192000, 0xa47f5eab -0, 42000, 192000, 0xff17f5f7 -0, 43500, 192000, 0xb4140b55 +0, 39000, 192000, 0xa47f5eab +0, 40500, 192000, 0xff17f5f7 +0, 42000, 192000, 0xb4140b55 +0, 43500, 192000, 0xb8782cc4 1, 44955, 1480, 0xb802aae1 -0, 45000, 192000, 0xb8782cc4 -0, 46500, 192000, 0x92975b8b -0, 48000, 192000, 0xf42a64d6 -0, 49500, 192000, 0x2cc7077d +0, 45000, 192000, 0x92975b8b +0, 46500, 192000, 0xf42a64d6 +0, 48000, 192000, 0x2cc7077d +0, 49500, 192000, 0x00080cc8 1, 50950, 1480, 0xecd7b5cc -0, 51000, 192000, 0x00080cc8 -0, 52500, 192000, 0x584b48f3 -0, 54000, 192000, 0xd68f57da -0, 55500, 192000, 0x60158422 +0, 51000, 192000, 0x584b48f3 +0, 52500, 192000, 0xd68f57da +0, 54000, 192000, 0x60158422 +0, 55500, 192000, 0xd7fb89e6 1, 56944, 1850, 0x16861355 -0, 57000, 192000, 0xd7fb89e6 -0, 58500, 192000, 0x97f1c76a -0, 60000, 192000, 0x46c4bb9e -0, 61500, 192000, 0xd32f9b66 -0, 63000, 192000, 0x74f43886 +0, 57000, 192000, 0x97f1c76a +0, 58500, 192000, 0x46c4bb9e +0, 60000, 192000, 0xd32f9b66 +0, 61500, 192000, 0x74f43886 +0, 63000, 192000, 0x3c4e47df 1, 64436, 1480, 0xa51690bd -0, 64500, 192000, 0x3c4e47df -0, 66000, 192000, 0xb5ac0a58 -0, 67500, 192000, 0xcc572b31 -0, 69000, 192000, 0xb1739d26 +0, 64500, 192000, 0xb5ac0a58 +0, 66000, 192000, 0xcc572b31 +0, 67500, 192000, 0xb1739d26 +0, 69000, 192000, 0x73da5473 1, 70430, 1480, 0xdd0b90d1 -0, 70500, 192000, 0x73da5473 -0, 72000, 192000, 0x5f79f5bc -0, 73500, 192000, 0x0affc0a0 -0, 75000, 192000, 0x2b4d5c1c +0, 70500, 192000, 0x5f79f5bc +0, 72000, 192000, 0x0affc0a0 +0, 73500, 192000, 0x2b4d5c1c +0, 75000, 192000, 0x309b41bc 1, 76424, 1850, 0x3ce6e333 -0, 76500, 192000, 0x309b41bc -0, 78000, 192000, 0xd42b6424 -0, 79500, 192000, 0x4795c948 -0, 81000, 192000, 0xbc1a3a8b -0, 82500, 192000, 0x16529c5b +0, 76500, 192000, 0xd42b6424 +0, 78000, 192000, 0x4795c948 +0, 79500, 192000, 0xbc1a3a8b +0, 81000, 192000, 0x16529c5b +0, 82500, 192000, 0x6b1b31ba 1, 83917, 1480, 0xf8ce8ea3 -0, 84000, 192000, 0x6b1b31ba -0, 85500, 192000, 0x569182ce -0, 87000, 192000, 0xe6ea9866 -0, 88500, 192000, 0x102c6076 +0, 84000, 192000, 0x569182ce +0, 85500, 192000, 0xe6ea9866 +0, 87000, 192000, 0x102c6076 +0, 88500, 192000, 0xb29f527a 1, 89911, 1480, 0xda4597af -0, 90000, 192000, 0xb29f527a -0, 91500, 192000, 0x040b4eee -0, 93000, 192000, 0x92574f4a -0, 94500, 192000, 0x1e8acdce +0, 90000, 192000, 0x040b4eee +0, 91500, 192000, 0x92574f4a +0, 93000, 192000, 0x1e8acdce +0, 94500, 192000, 0x1becf516 1, 95905, 1480, 0x918f7cb3 -0, 96000, 192000, 0x1becf516 -0, 97500, 192000, 0xb62e9776 -0, 99000, 192000, 0xed37a08e -0, 100500, 192000, 0xc0719912 +0, 96000, 192000, 0xb62e9776 +0, 97500, 192000, 0xed37a08e +0, 99000, 192000, 0xc0719912 +0, 100500, 192000, 0x24cf7a7e 1, 101899, 1850, 0xca6edb15 -0, 102000, 192000, 0x24cf7a7e -0, 103500, 192000, 0x0307f62f -0, 105000, 192000, 0x79b7417b +0, 102000, 192000, 0x0307f62f +0, 103500, 192000, 0x79b7417b 1, 109392, 1480, 0xba279597 1, 115386, 1480, 0xc5a38a9e 1, 121380, 1850, 0x8147eef5 -- cgit v1.2.3 From 2c98f407c8803da3002747f3a8d43696e8744dc7 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 2 Feb 2012 01:46:05 +0000 Subject: 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 --- 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(-) create mode 100644 tests/ref/seek/ac3_ac3 delete mode 100644 tests/ref/seek/ac3_rm (limited to 'tests') diff --git a/configure b/configure index 49f9af2e73..38c8457a46 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 faa61e65fb..21b53b7a63 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 dba2dfc5e7..0c2f9b7214 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 0000000000..167dc8d716 --- /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 b38758bb2c..0000000000 --- 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 -- cgit v1.2.3