From d19f3e9a2a4919a2beb55930b510282999197ec3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 10 May 2012 14:18:10 +0200 Subject: [PATCH 01/25] doc: misc improvements for the Windows section Fix some orthography, wording and grammar issues; update the SDL section with more current instructions; simplify lib.exe example command line; drop outdated comments about libnut. --- doc/platform.texi | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/doc/platform.texi b/doc/platform.texi index 97e97c218c..c095f525d0 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -84,7 +84,7 @@ instructions in the download section and the FAQ. Libav does not build out-of-the-box with the packages the automated MinGW installer provides. It also requires coreutils to be installed and many other -packages updated to the latest version. The minimum version for some packages +packages updated to the latest version. The minimum versions for some packages are listed below: @itemize @@ -104,17 +104,14 @@ Notes: @item Building natively using MSYS can be sped up by disabling implicit rules in the Makefile by calling @code{make -r} instead of plain @code{make}. This speed up is close to non-existent for normal one-off builds and is only -noticeable when running make for a second time (for example in +noticeable when running make for a second time (for example during @code{make install}). @item In order to compile AVplay, you must have the MinGW development library -of @uref{http://www.libsdl.org/, SDL}. -Edit the @file{bin/sdl-config} script so that it points to the correct prefix -where SDL was installed. Verify that @file{sdl-config} can be launched from -the MSYS command line. +of @uref{http://www.libsdl.org/, SDL} and @code{pkg-config} installed. @item By using @code{./configure --enable-shared} when configuring Libav, -you can build libavutil, libavcodec and libavformat as DLLs. +you can build all libraries as DLLs. @end itemize @@ -134,7 +131,7 @@ you might have to modify the procedures slightly. @subsection Using static libraries -Assuming you have just built and installed Libav in @file{/usr/local}. +Assuming you have just built and installed Libav in @file{/usr/local}: @enumerate @@ -257,14 +254,11 @@ are stored. @item Generate new import libraries with @file{lib.exe}: @example -lib /machine:i386 /def:..\lib\avcodec-53.def /out:avcodec.lib -lib /machine:i386 /def:..\lib\avdevice-53.def /out:avdevice.lib -lib /machine:i386 /def:..\lib\avfilter-2.def /out:avfilter.lib -lib /machine:i386 /def:..\lib\avformat-53.def /out:avformat.lib -lib /machine:i386 /def:..\lib\avutil-51.def /out:avutil.lib -lib /machine:i386 /def:..\lib\swscale-2.def /out:swscale.lib +lib /machine:i386 /def:..\lib\foo-version.def /out:foo.lib @end example +Replace @code{foo-version} and @code{foo} with the respective library names. + @end enumerate @anchor{Cross compilation for Windows with Linux} @@ -306,8 +300,8 @@ Then run to make a static build. -The current @code{gcc4-core} package is buggy and needs this flag to build -shared libraries: +To build shared libraries add a special compiler flag to work around current +@code{gcc4-core} package bugs in addition to the normal configure flags: @example ./configure --enable-shared --disable-static --extra-cflags=-fno-reorder-functions @@ -327,11 +321,8 @@ yasm, libSDL-devel, libfaac-devel, libgsm-devel, libmp3lame-devel, libschroedinger1.0-devel, speex-devel, libtheora-devel, libxvidcore-devel @end example -The recommendation for libnut and x264 is to build them from source by -yourself, as they evolve too quickly for Cygwin Ports to be up to date. - -Cygwin 1.7.x has IPv6 support. You can add IPv6 to Cygwin 1.5.x by means -of the @code{libgetaddrinfo-devel} package, available at Cygwin Ports. +The recommendation for x264 is to build it from source, as it evolves too +quickly for Cygwin Ports to be up to date. @section Crosscompilation for Windows under Cygwin From 1c0e8b94ad737744a48c0baed6605945b3205197 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 15:47:37 +0100 Subject: [PATCH 02/25] fate: mtv: disable video decoding This test contains raw rgb565le video. Converting to rgb24 serves no useful purpose here. Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 2 +- tests/ref/fate/mtv | 79 ++++++++++++++++++++++---------------------- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 86500bb7f7..c67b2c4f8f 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -41,7 +41,7 @@ FATE_AVCONV += fate-maxis-xa fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy FATE_AVCONV += fate-mtv -fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -acodec copy -pix_fmt rgb24 +fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy FATE_AVCONV += fate-mxf-demux fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy diff --git a/tests/ref/fate/mtv b/tests/ref/fate/mtv index e32f16e848..2e88bd8333 100644 --- a/tests/ref/fate/mtv +++ b/tests/ref/fate/mtv @@ -1,137 +1,138 @@ #tb 0: 1/16 #tb 1: 1/44100 -0, 0, 0, 1, 18432, 0xbd7e0ac8 +0, 0, 0, 1, 12288, 0x80398ebc 1, 0, 0, 1152, 417, 0xae1cc66a 1, 1152, 1152, 1152, 418, 0xdc3ec850 1, 2304, 2304, 1152, 418, 0x4e8ed05f -0, 1, 1, 1, 18432, 0xbd7e0ac8 +0, 1, 1, 1, 12288, 0x80398ebc 1, 3456, 3456, 1152, 418, 0xeb43d574 1, 4608, 4608, 1152, 418, 0x9357c91d -0, 2, 2, 1, 18432, 0x902e0ab4 +0, 2, 2, 1, 12288, 0x6678829c 1, 5760, 5760, 1152, 418, 0x5306d16b 1, 6912, 6912, 1152, 418, 0x46e0d4da 1, 8064, 8064, 1152, 418, 0xac11ce79 -0, 3, 3, 1, 18432, 0xf1940b28 +0, 3, 3, 1, 12288, 0xda08884a 1, 9216, 9216, 1152, 418, 0xffdfc4ad 1, 10368, 10368, 1152, 418, 0xf8a8c2ff -0, 4, 4, 1, 18432, 0x2c180ac8 +0, 4, 4, 1, 12288, 0x45ae8046 1, 11520, 11520, 1152, 418, 0x2d66d83f 1, 12672, 12672, 1152, 418, 0x65c0da12 -0, 5, 5, 1, 18432, 0x2eae0b34 +0, 5, 5, 1, 12288, 0x926c886b 1, 13824, 13824, 1152, 418, 0x0eafd20f 1, 14976, 14976, 1152, 418, 0x8c6dd949 1, 16128, 16128, 1152, 418, 0x9094c02d -0, 6, 6, 1, 18432, 0x2eae0b34 +0, 6, 6, 1, 12288, 0x926c886b 1, 17280, 17280, 1152, 418, 0xb47bd944 1, 18432, 18432, 1152, 418, 0x935ccce7 -0, 7, 7, 1, 18432, 0x2eae0b34 +0, 7, 7, 1, 12288, 0x926c886b 1, 19584, 19584, 1152, 418, 0x6e3ed020 1, 20736, 20736, 1152, 418, 0x8922cd6c 1, 21888, 21888, 1152, 418, 0xe811c8f8 -0, 8, 8, 1, 18432, 0x2eae0b34 +0, 8, 8, 1, 12288, 0x926c886b 1, 23040, 23040, 1152, 418, 0xb84adc72 1, 24192, 24192, 1152, 418, 0xa2bbc5f4 -0, 9, 9, 1, 18432, 0x2eae0b34 +0, 9, 9, 1, 12288, 0x926c886b 1, 25344, 25344, 1152, 418, 0xec0cb67d 1, 26496, 26496, 1152, 418, 0x89d1d014 -0, 10, 10, 1, 18432, 0x2eae0b34 +0, 10, 10, 1, 12288, 0x926c886b 1, 27648, 27648, 1152, 418, 0xfb5bc872 1, 28800, 28800, 1152, 417, 0x8bfcc7a0 1, 29952, 29952, 1152, 418, 0xeb4ac61b -0, 11, 11, 1, 18432, 0x2eae0b34 +0, 11, 11, 1, 12288, 0x926c886b 1, 31104, 31104, 1152, 418, 0xd3cbc3c4 1, 32256, 32256, 1152, 418, 0xa272d092 -0, 12, 12, 1, 18432, 0x2eae0b34 +0, 12, 12, 1, 12288, 0x926c886b 1, 33408, 33408, 1152, 418, 0x611ec37e 1, 34560, 34560, 1152, 418, 0x70a3d423 1, 35712, 35712, 1152, 418, 0xeff9ccf4 -0, 13, 13, 1, 18432, 0x2eae0b34 +0, 13, 13, 1, 12288, 0x926c886b 1, 36864, 36864, 1152, 418, 0x9788c65b 1, 38016, 38016, 1152, 418, 0xe9a8cb8c -0, 14, 14, 1, 18432, 0x2eae0b34 +0, 14, 14, 1, 12288, 0x926c886b 1, 39168, 39168, 1152, 418, 0x5834c300 1, 40320, 40320, 1152, 418, 0xa4b8cd3a -0, 15, 15, 1, 18432, 0x2eae0b34 +0, 15, 15, 1, 12288, 0x926c886b 1, 41472, 41472, 1152, 418, 0x6de2c7f9 1, 42624, 42624, 1152, 418, 0x961bbbf3 1, 43776, 43776, 1152, 418, 0x53edc13a -0, 16, 16, 1, 18432, 0x2c180ac8 +0, 16, 16, 1, 12288, 0x45ae8046 1, 44928, 44928, 1152, 418, 0x2fedc4b0 1, 46080, 46080, 1152, 418, 0xb756c18b -0, 17, 17, 1, 18432, 0x2eae0b34 +0, 17, 17, 1, 12288, 0x926c886b 1, 47232, 47232, 1152, 418, 0xaf0ed0e4 1, 48384, 48384, 1152, 418, 0x019fd3f0 1, 49536, 49536, 1152, 418, 0x6e29d83e -0, 18, 18, 1, 18432, 0x2c180ac8 +0, 18, 18, 1, 12288, 0x45ae8046 1, 50688, 50688, 1152, 418, 0x2ddad6bb 1, 51840, 51840, 1152, 418, 0xafefca99 -0, 19, 19, 1, 18432, 0x2eae0b34 +0, 19, 19, 1, 12288, 0x926c886b 1, 52992, 52992, 1152, 418, 0x366ed013 1, 54144, 54144, 1152, 418, 0x532ac7e0 -0, 20, 20, 1, 18432, 0x2c180ac8 +0, 20, 20, 1, 12288, 0x45ae8046 1, 55296, 55296, 1152, 418, 0x1d0cd1ce 1, 56448, 56448, 1152, 417, 0x572ad1e3 1, 57600, 57600, 1152, 418, 0x858cd91f -0, 21, 21, 1, 18432, 0x2eae0b34 +0, 21, 21, 1, 12288, 0x926c886b 1, 58752, 58752, 1152, 418, 0x82cacdfd 1, 59904, 59904, 1152, 418, 0xf4dcc6ed -0, 22, 22, 1, 18432, 0x2c180ac8 +0, 22, 22, 1, 12288, 0x45ae8046 1, 61056, 61056, 1152, 418, 0x2cf3ca72 1, 62208, 62208, 1152, 418, 0x5963c859 1, 63360, 63360, 1152, 418, 0xa667c53d -0, 23, 23, 1, 18432, 0x2eae0b34 +0, 23, 23, 1, 12288, 0x926c886b 1, 64512, 64512, 1152, 418, 0xb2f1d09c 1, 65664, 65664, 1152, 418, 0x2ec1c8d3 -0, 24, 24, 1, 18432, 0x2eae0b34 +0, 24, 24, 1, 12288, 0x926c886b 1, 66816, 66816, 1152, 418, 0x5754d2e8 1, 67968, 67968, 1152, 418, 0x1956bdba -0, 25, 25, 1, 18432, 0x2eae0b34 +0, 25, 25, 1, 12288, 0x926c886b 1, 69120, 69120, 1152, 418, 0x3e18bd55 1, 70272, 70272, 1152, 418, 0xe4cfc339 1, 71424, 71424, 1152, 418, 0xb426c835 -0, 26, 26, 1, 18432, 0x2eae0b34 +0, 26, 26, 1, 12288, 0x926c886b 1, 72576, 72576, 1152, 418, 0xd7b6cbcf 1, 73728, 73728, 1152, 418, 0x340ec315 -0, 27, 27, 1, 18432, 0x2eae0b34 +0, 27, 27, 1, 12288, 0x926c886b 1, 74880, 74880, 1152, 418, 0x23a9baec 1, 76032, 76032, 1152, 418, 0x9f04cd01 -0, 28, 28, 1, 18432, 0x2eae0b34 +0, 28, 28, 1, 12288, 0x926c886b 1, 77184, 77184, 1152, 418, 0xa80ec223 1, 78336, 78336, 1152, 418, 0x23d6bd5d 1, 79488, 79488, 1152, 418, 0xcb25cf5b -0, 29, 29, 1, 18432, 0x2eae0b34 +0, 29, 29, 1, 12288, 0x926c886b 1, 80640, 80640, 1152, 418, 0xccccc217 1, 81792, 81792, 1152, 418, 0x757abbfe -0, 30, 30, 1, 18432, 0x2eae0b34 +0, 30, 30, 1, 12288, 0x926c886b 1, 82944, 82944, 1152, 418, 0xa2e6cc68 1, 84096, 84096, 1152, 418, 0xdf77cc05 1, 85248, 85248, 1152, 417, 0xe9d2c5d5 -0, 31, 31, 1, 18432, 0x2eae0b34 +0, 31, 31, 1, 12288, 0x926c886b 1, 86400, 86400, 1152, 418, 0x50dec174 1, 87552, 87552, 1152, 418, 0xf654b27e -0, 32, 32, 1, 18432, 0x2c180ac8 +0, 32, 32, 1, 12288, 0x45ae8046 1, 88704, 88704, 1152, 418, 0x4d8bc26e 1, 89856, 89856, 1152, 418, 0xccd2bf37 -0, 33, 33, 1, 18432, 0x2eae0b34 +0, 33, 33, 1, 12288, 0x926c886b 1, 91008, 91008, 1152, 418, 0x6ce2c18a 1, 92160, 92160, 1152, 418, 0xb3cdcf0c 1, 93312, 93312, 1152, 418, 0x55eebe9a -0, 34, 34, 1, 18432, 0x2c180ac8 +0, 34, 34, 1, 12288, 0x45ae8046 1, 94464, 94464, 1152, 418, 0x9031c9ec 1, 95616, 95616, 1152, 418, 0xb037c49d -0, 35, 35, 1, 18432, 0x2eae0b34 +0, 35, 35, 1, 12288, 0x926c886b 1, 96768, 96768, 1152, 418, 0x377bcc78 1, 97920, 97920, 1152, 418, 0x3762c725 1, 99072, 99072, 1152, 418, 0x39afbd4d -0, 36, 36, 1, 18432, 0x2c180ac8 +0, 36, 36, 1, 12288, 0x45ae8046 1, 100224, 100224, 1152, 418, 0x655ed6cd 1, 101376, 101376, 1152, 418, 0x09aec202 -0, 37, 37, 1, 18432, 0x2eae0b34 +0, 37, 37, 1, 12288, 0x926c886b 1, 102528, 102528, 1152, 418, 0xf2d2ce55 1, 103680, 103680, 1152, 418, 0x254ebf04 -0, 38, 38, 1, 18432, 0x2c180ac8 +0, 38, 38, 1, 12288, 0x45ae8046 1, 104832, 104832, 1152, 418, 0xa105cdcc 1, 105984, 105984, 1152, 418, 0x1477ba58 1, 107136, 107136, 1152, 418, 0x8d0dcdb2 +0, 39, 39, 1, 3584, 0xba46c435 1, 108288, 108288, 1152, 418, 0x0d7cbef4 1, 109440, 109440, 1152, 294, 0x5e2b87c4 From 0c26380f4fbf8b65c4b32aecdac74f769bb6e368 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 13:49:13 +0100 Subject: [PATCH 03/25] fate: pcm-planar: disable video This file has eamad video which is tested elsewhere. Also rename the test to reflect this change. Signed-off-by: Mans Rullgard --- tests/fate/pcm.mak | 6 +- tests/ref/fate/ea-mad-pcm-planar | 294 ------------------------------- tests/ref/fate/pcm-planar | 143 +++++++++++++++ 3 files changed, 146 insertions(+), 297 deletions(-) delete mode 100644 tests/ref/fate/ea-mad-pcm-planar create mode 100644 tests/ref/fate/pcm-planar diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index d0acc23d4f..536fb3e6d6 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -1,6 +1,3 @@ -FATE_PCM += fate-ea-mad-pcm-planar -fate-ea-mad-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad - FATE_PCM += fate-film-cvid-pcm-stereo-8bit fate-film-cvid-pcm-stereo-8bit: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk @@ -10,6 +7,9 @@ fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le FATE_PCM += fate-pcm_dvd fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn +FATE_PCM += fate-pcm-planar +fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn + FATE_PCM += fate-pcm_s16be-stereo fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le diff --git a/tests/ref/fate/ea-mad-pcm-planar b/tests/ref/fate/ea-mad-pcm-planar deleted file mode 100644 index 3c767fa6ae..0000000000 --- a/tests/ref/fate/ea-mad-pcm-planar +++ /dev/null @@ -1,294 +0,0 @@ -#tb 0: 1/90000 -#tb 1: 1/44100 -0, 0, 0, 0, 196608, 0x75d22292 -1, 0, 0, 1471, 5884, 0x00000000 -0, 2970, 2970, 0, 196608, 0x75d22292 -1, 1471, 1471, 1471, 5884, 0x00000000 -0, 5940, 5940, 0, 196608, 0x75d22292 -1, 2942, 2942, 1472, 5888, 0x00000000 -0, 8910, 8910, 0, 196608, 0x75d22292 -1, 4414, 4414, 1471, 5884, 0x00000000 -0, 11880, 11880, 0, 196608, 0x75d22292 -1, 5885, 5885, 1472, 5888, 0x00000000 -0, 14850, 14850, 0, 196608, 0x75d22292 -1, 7357, 7357, 1471, 5884, 0x00000000 -0, 17820, 17820, 0, 196608, 0x75d22292 -1, 8828, 8828, 1472, 5888, 0x00000000 -0, 20790, 20790, 0, 196608, 0x75d22292 -1, 10300, 10300, 1471, 5884, 0x00000000 -0, 23760, 23760, 0, 196608, 0x75d22292 -1, 11771, 11771, 1472, 5888, 0x00000000 -0, 26730, 26730, 0, 196608, 0xd3f66981 -1, 13243, 13243, 1471, 5884, 0x00000000 -0, 29700, 29700, 0, 196608, 0xed37c4c3 -1, 14714, 14714, 1472, 5888, 0x174b2bd4 -0, 32670, 32670, 0, 196608, 0x6ce01dc4 -1, 16186, 16186, 1471, 5884, 0xfab9563d -0, 35640, 35640, 0, 196608, 0x2874fc9a -1, 17657, 17657, 1472, 5888, 0x0129a4f5 -0, 38610, 38610, 0, 196608, 0x9b65bbc8 -1, 19129, 19129, 1471, 5884, 0xf12b15dd -0, 41580, 41580, 0, 196608, 0x8f9af811 -1, 20600, 20600, 1472, 5888, 0x60c8c922 -0, 44550, 44550, 0, 196608, 0x04aeb0b0 -1, 22072, 22072, 1471, 5884, 0x85693c81 -0, 47520, 47520, 0, 196608, 0x0df037a1 -1, 23543, 23543, 1472, 5888, 0xcefcf0e0 -0, 50490, 50490, 0, 196608, 0xa32c5515 -1, 25015, 25015, 1471, 5884, 0x243974ff -0, 53460, 53460, 0, 196608, 0xf3b11a1b -1, 26486, 26486, 1471, 5884, 0x9101b901 -0, 56430, 56430, 0, 196608, 0xaf945190 -1, 27957, 27957, 1472, 5888, 0xe3c68cb9 -0, 59400, 59400, 0, 196608, 0xabee8b24 -1, 29429, 29429, 1471, 5884, 0x80f2ff5f -0, 62370, 62370, 0, 196608, 0x1d7b3df0 -1, 30900, 30900, 1472, 5888, 0xfc2d19dc -0, 65340, 65340, 0, 196608, 0x1347d787 -1, 32372, 32372, 1471, 5884, 0xb6e0af21 -0, 68310, 68310, 0, 196608, 0x654c4a9b -1, 33843, 33843, 1472, 5888, 0x476e74ff -0, 71280, 71280, 0, 196608, 0xa2a6596a -1, 35315, 35315, 1471, 5884, 0x3921bc7f -0, 74250, 74250, 0, 196608, 0x50d04d8e -1, 36786, 36786, 1472, 5888, 0x44180a3f -0, 77220, 77220, 0, 196608, 0x4f9f9352 -1, 38258, 38258, 1471, 5884, 0x01b5a119 -0, 80190, 80190, 0, 196608, 0xbb358281 -1, 39729, 39729, 1472, 5888, 0xdd7ad621 -0, 83160, 83160, 0, 196608, 0xcd91a50a -1, 41201, 41201, 1471, 5884, 0xadabe898 -0, 86130, 86130, 0, 196608, 0xb665bb76 -1, 42672, 42672, 1472, 5888, 0x2141ff8e -0, 89100, 89100, 0, 196608, 0xec924ee7 -1, 44144, 44144, 1471, 5884, 0xfb5118fb -0, 92070, 92070, 0, 196608, 0x9c4aa4ad -1, 45615, 45615, 1472, 5888, 0x06d31461 -0, 95040, 95040, 0, 196608, 0x27ccdf86 -1, 47087, 47087, 1471, 5884, 0x80ce34c1 -0, 98010, 98010, 0, 196608, 0x93778cc8 -1, 48558, 48558, 1472, 5888, 0x72bf392f -0, 100980, 100980, 0, 196608, 0x3d68e826 -1, 50030, 50030, 1471, 5884, 0x9d9237cf -0, 103950, 103950, 0, 196608, 0x9240b751 -1, 51501, 51501, 1471, 5884, 0xf5c9ce23 -0, 106920, 106920, 0, 196608, 0xd77ec46b -1, 52972, 52972, 1472, 5888, 0x12a05dc5 -0, 109890, 109890, 0, 196608, 0x4a303ef1 -1, 54444, 54444, 1471, 5884, 0xd3ed5d4b -0, 112860, 112860, 0, 196608, 0x2508bacf -1, 55915, 55915, 1472, 5888, 0x06557401 -0, 115830, 115830, 0, 196608, 0xb74cb5bf -1, 57387, 57387, 1471, 5884, 0x53d81662 -0, 118800, 118800, 0, 196608, 0x9c4a9719 -1, 58858, 58858, 1472, 5888, 0xd7e0d98d -0, 121770, 121770, 0, 196608, 0xc34a7924 -1, 60330, 60330, 1471, 5884, 0xdf00752e -0, 124740, 124740, 0, 196608, 0x9d8428bd -1, 61801, 61801, 1472, 5888, 0x82f1d7a9 -0, 127710, 127710, 0, 196608, 0x019eebf7 -1, 63273, 63273, 1471, 5884, 0x9cb3aba9 -0, 130680, 130680, 0, 196608, 0x36e58d6b -1, 64744, 64744, 1472, 5888, 0xd6f98e91 -0, 133650, 133650, 0, 196608, 0xc7038ceb -1, 66216, 66216, 1471, 5884, 0xaa7f7c09 -0, 136620, 136620, 0, 196608, 0xb041fd50 -1, 67687, 67687, 1472, 5888, 0xb97a82a7 -0, 139590, 139590, 0, 196608, 0x76934674 -1, 69159, 69159, 1471, 5884, 0x375a3d53 -0, 142560, 142560, 0, 196608, 0x22afa88b -1, 70630, 70630, 1472, 5888, 0xa0a460cb -0, 145530, 145530, 0, 196608, 0x22158960 -1, 72102, 72102, 1471, 5884, 0xe05efbab -0, 148500, 148500, 0, 196608, 0x75ab0895 -1, 73573, 73573, 1472, 5888, 0x95e151f0 -0, 151470, 151470, 0, 196608, 0xcaab6c6d -1, 75045, 75045, 1471, 5884, 0x44ac688d -0, 154440, 154440, 0, 196608, 0xe64d8b91 -1, 76516, 76516, 1471, 5884, 0xfc6d929f -0, 157410, 157410, 0, 196608, 0x1e8aa17a -1, 77987, 77987, 1472, 5888, 0x6406c5f1 -0, 160380, 160380, 0, 196608, 0x7dd94fdb -1, 79459, 79459, 1471, 5884, 0x4ee9e48c -0, 163350, 163350, 0, 196608, 0xab74566c -1, 80930, 80930, 1472, 5888, 0xd55d43d0 -0, 166320, 166320, 0, 196608, 0xec962966 -1, 82402, 82402, 1471, 5884, 0xcae69baf -0, 169290, 169290, 0, 196608, 0xf5bfd751 -1, 83873, 83873, 1472, 5888, 0x4c01f1f5 -0, 172260, 172260, 0, 196608, 0xc7f46e0e -1, 85345, 85345, 1471, 5884, 0xf7d6dab6 -0, 175230, 175230, 0, 196608, 0xe641f676 -1, 86816, 86816, 1472, 5888, 0x1affdeb5 -0, 178200, 178200, 0, 196608, 0xea7c7b75 -1, 88288, 88288, 1471, 5884, 0x6db72487 -0, 181170, 181170, 0, 196608, 0x69120371 -1, 89759, 89759, 1472, 5888, 0x4f344e49 -0, 184140, 184140, 0, 196608, 0xb2319175 -1, 91231, 91231, 1471, 5884, 0x2df3827b -0, 187110, 187110, 0, 196608, 0xd2d73b56 -1, 92702, 92702, 1472, 5888, 0x1d1fc283 -0, 190080, 190080, 0, 196608, 0x74aafac0 -1, 94174, 94174, 1471, 5884, 0x22eb1dd5 -0, 193050, 193050, 0, 196608, 0x15e8ddbc -1, 95645, 95645, 1472, 5888, 0x734e7093 -0, 196020, 196020, 0, 196608, 0xd4e2c90c -1, 97117, 97117, 1471, 5884, 0x357c9531 -0, 198990, 198990, 0, 196608, 0x86eaf31c -1, 98588, 98588, 1472, 5888, 0x108c102d -0, 201960, 201960, 0, 196608, 0x8004291b -1, 100060, 100060, 1471, 5884, 0x96ad26c6 -0, 204930, 204930, 0, 196608, 0xbbf6954a -1, 101531, 101531, 1472, 5888, 0x7bea1996 -0, 207900, 207900, 0, 196608, 0x2f24f0e1 -1, 103003, 103003, 1471, 5884, 0x124a1f8e -0, 210870, 210870, 0, 196608, 0x59d56dfb -1, 104474, 104474, 1471, 5884, 0x08d272fb -0, 213840, 213840, 0, 196608, 0x1377c9cb -1, 105945, 105945, 1472, 5888, 0x88832c6b -0, 216810, 216810, 0, 196608, 0x07582cc3 -1, 107417, 107417, 1471, 5884, 0xedf41493 -0, 219780, 219780, 0, 196608, 0xa5a853fc -1, 108888, 108888, 1472, 5888, 0xc4f226d7 -0, 222750, 222750, 0, 196608, 0x3b01856a -1, 110360, 110360, 1471, 5884, 0x97730397 -0, 225720, 225720, 0, 196608, 0x64927496 -1, 111831, 111831, 1472, 5888, 0xbc3540e9 -0, 228690, 228690, 0, 196608, 0xf24c6f8a -1, 113303, 113303, 1471, 5884, 0x8adfa135 -0, 231660, 231660, 0, 196608, 0xc92c3c46 -1, 114774, 114774, 1472, 5888, 0x6d4be121 -0, 234630, 234630, 0, 196608, 0xa50d07fb -1, 116246, 116246, 1471, 5884, 0xc3daea85 -0, 237600, 237600, 0, 196608, 0xb1d4a092 -1, 117717, 117717, 1472, 5888, 0x5498e9f0 -0, 240570, 240570, 0, 196608, 0x20c5526b -1, 119189, 119189, 1471, 5884, 0xa0eb691f -0, 243540, 243540, 0, 196608, 0x6127fbbd -1, 120660, 120660, 1472, 5888, 0x775c7c59 -0, 246510, 246510, 0, 196608, 0xc168a747 -1, 122132, 122132, 1471, 5884, 0x9f108fd1 -0, 249480, 249480, 0, 196608, 0x9c0d3241 -1, 123603, 123603, 1472, 5888, 0x72d53062 -0, 252450, 252450, 0, 196608, 0x5466dd21 -1, 125075, 125075, 1471, 5884, 0x13a93faa -0, 255420, 255420, 0, 196608, 0x5bba67cc -1, 126546, 126546, 1472, 5888, 0x64773c8e -0, 258390, 258390, 0, 196608, 0x4c1a1c18 -1, 128018, 128018, 1471, 5884, 0xaf696999 -0, 261360, 261360, 0, 196608, 0x22c0a537 -1, 129489, 129489, 1471, 5884, 0xf45e7e81 -0, 264330, 264330, 0, 196608, 0x4ffc5ea6 -1, 130960, 130960, 1472, 5888, 0x00000000 -0, 267300, 267300, 0, 196608, 0x7e8e2395 -1, 132432, 132432, 1471, 5884, 0x00000000 -0, 270270, 270270, 0, 196608, 0xa3b6f198 -0, 273240, 273240, 0, 196608, 0xf6aac4d1 -1, 133903, 133903, 1472, 5888, 0x00000000 -0, 276210, 276210, 0, 196608, 0x1a6ea9ee -1, 135375, 135375, 1471, 5884, 0x00000000 -0, 279180, 279180, 0, 196608, 0xfd729443 -1, 136846, 136846, 1472, 5888, 0x00000000 -0, 282150, 282150, 0, 196608, 0xc6a69012 -1, 138318, 138318, 1471, 5884, 0x00000000 -0, 285120, 285120, 0, 196608, 0x576f9270 -1, 139789, 139789, 1472, 5888, 0x00000000 -0, 288090, 288090, 0, 196608, 0x0d539fe5 -1, 141261, 141261, 1471, 5884, 0x00000000 -0, 291060, 291060, 0, 196608, 0x191db7d6 -1, 142732, 142732, 1472, 5888, 0x00000000 -0, 294030, 294030, 0, 196608, 0x80cddedd -1, 144204, 144204, 1471, 5884, 0x00000000 -0, 297000, 297000, 0, 196608, 0xccf5fd39 -1, 145675, 145675, 1472, 5888, 0x00000000 -0, 299970, 299970, 0, 196608, 0x521d33b6 -1, 147147, 147147, 1471, 5884, 0x00000000 -0, 302940, 302940, 0, 196608, 0xb75e59ee -1, 148618, 148618, 1472, 5888, 0x00000000 -0, 305910, 305910, 0, 196608, 0xbba68972 -1, 150090, 150090, 1471, 5884, 0x00000000 -0, 308880, 308880, 0, 196608, 0x368fb86a -1, 151561, 151561, 1472, 5888, 0x00000000 -0, 311850, 311850, 0, 196608, 0x99e6e94a -1, 153033, 153033, 1471, 5884, 0x00000000 -0, 314820, 314820, 0, 196608, 0xe4021296 -1, 154504, 154504, 1471, 5884, 0x00000000 -0, 317790, 317790, 0, 196608, 0xbc993b10 -1, 155975, 155975, 1472, 5888, 0x00000000 -0, 320760, 320760, 0, 196608, 0xf2765d22 -1, 157447, 157447, 1471, 5884, 0x00000000 -0, 323730, 323730, 0, 196608, 0xc6257db5 -1, 158918, 158918, 1472, 5888, 0x00000000 -0, 326700, 326700, 0, 196608, 0xa832782f -1, 160390, 160390, 1471, 5884, 0x00000000 -0, 329670, 329670, 0, 196608, 0xa832782f -1, 161861, 161861, 1472, 5888, 0x00000000 -0, 332640, 332640, 0, 196608, 0xa832782f -1, 163333, 163333, 1471, 5884, 0x00000000 -0, 335610, 335610, 0, 196608, 0xa832782f -1, 164804, 164804, 1472, 5888, 0x00000000 -0, 338580, 338580, 0, 196608, 0xa832782f -1, 166276, 166276, 1471, 5884, 0x00000000 -0, 341550, 341550, 0, 196608, 0xa832782f -1, 167747, 167747, 1472, 5888, 0x00000000 -0, 344520, 344520, 0, 196608, 0xa832782f -1, 169219, 169219, 1471, 5884, 0x00000000 -0, 347490, 347490, 0, 196608, 0xa832782f -1, 170690, 170690, 1472, 5888, 0x00000000 -0, 350460, 350460, 0, 196608, 0xa832782f -1, 172162, 172162, 1471, 5884, 0xfe4b2bd4 -0, 353430, 353430, 0, 196608, 0xa832782f -1, 173633, 173633, 1472, 5888, 0x00000000 -0, 356400, 356400, 0, 196608, 0xa832782f -1, 175105, 175105, 1471, 5884, 0x00000000 -0, 359370, 359370, 0, 196608, 0xa832782f -1, 176576, 176576, 1472, 5888, 0x00000000 -0, 362340, 362340, 0, 196608, 0xa832782f -1, 178048, 178048, 1471, 5884, 0x00000000 -0, 365310, 365310, 0, 196608, 0xa832782f -1, 179519, 179519, 1471, 5884, 0x00000000 -0, 368280, 368280, 0, 196608, 0xa832782f -1, 180990, 180990, 1472, 5888, 0x00000000 -0, 371250, 371250, 0, 196608, 0xa832782f -1, 182462, 182462, 1471, 5884, 0x00000000 -0, 374220, 374220, 0, 196608, 0xa832782f -1, 183933, 183933, 1472, 5888, 0x00000000 -0, 377190, 377190, 0, 196608, 0xa832782f -1, 185405, 185405, 1471, 5884, 0x00000000 -0, 380160, 380160, 0, 196608, 0xa832782f -1, 186876, 186876, 1472, 5888, 0x00000000 -0, 383130, 383130, 0, 196608, 0xa832782f -1, 188348, 188348, 1471, 5884, 0x00000000 -0, 386100, 386100, 0, 196608, 0xa832782f -1, 189819, 189819, 1472, 5888, 0x00000000 -0, 389070, 389070, 0, 196608, 0xa832782f -1, 191291, 191291, 1471, 5884, 0x00000000 -0, 392040, 392040, 0, 196608, 0xa832782f -1, 192762, 192762, 1472, 5888, 0x00000000 -0, 395010, 395010, 0, 196608, 0xa832782f -1, 194234, 194234, 1471, 5884, 0x00000000 -0, 397980, 397980, 0, 196608, 0xa832782f -1, 195705, 195705, 1472, 5888, 0x00000000 -0, 400950, 400950, 0, 196608, 0xa832782f -1, 197177, 197177, 1471, 5884, 0x00000000 -0, 403920, 403920, 0, 196608, 0xa832782f -1, 198648, 198648, 1472, 5888, 0x00000000 -0, 406890, 406890, 0, 196608, 0xa832782f -1, 200120, 200120, 1471, 5884, 0x00000000 -0, 409860, 409860, 0, 196608, 0xa832782f -1, 201591, 201591, 1472, 5888, 0x00000000 -0, 412830, 412830, 0, 196608, 0xa832782f -1, 203063, 203063, 1471, 5884, 0x00000000 -0, 415800, 415800, 0, 196608, 0xa832782f -1, 204534, 204534, 1472, 5888, 0x00000000 -0, 418770, 418770, 0, 196608, 0xa832782f -1, 206006, 206006, 1471, 5884, 0x00000000 -0, 421740, 421740, 0, 196608, 0xa832782f -1, 207477, 207477, 1262, 5048, 0x00000000 -0, 424710, 424710, 0, 196608, 0xa832782f -0, 427680, 427680, 0, 196608, 0xa832782f -0, 430650, 430650, 0, 196608, 0xa832782f -0, 433620, 433620, 0, 196608, 0xa832782f -0, 436590, 436590, 0, 196608, 0xa832782f -0, 439560, 439560, 0, 196608, 0xa832782f -0, 442530, 442530, 0, 196608, 0xa832782f diff --git a/tests/ref/fate/pcm-planar b/tests/ref/fate/pcm-planar new file mode 100644 index 0000000000..91b4a78cd4 --- /dev/null +++ b/tests/ref/fate/pcm-planar @@ -0,0 +1,143 @@ +#tb 0: 1/44100 +0, 0, 0, 1471, 5884, 0x00000000 +0, 1471, 1471, 1471, 5884, 0x00000000 +0, 2942, 2942, 1472, 5888, 0x00000000 +0, 4414, 4414, 1471, 5884, 0x00000000 +0, 5885, 5885, 1472, 5888, 0x00000000 +0, 7357, 7357, 1471, 5884, 0x00000000 +0, 8828, 8828, 1472, 5888, 0x00000000 +0, 10300, 10300, 1471, 5884, 0x00000000 +0, 11771, 11771, 1472, 5888, 0x00000000 +0, 13243, 13243, 1471, 5884, 0x00000000 +0, 14714, 14714, 1472, 5888, 0x174b2bd4 +0, 16186, 16186, 1471, 5884, 0xfab9563d +0, 17657, 17657, 1472, 5888, 0x0129a4f5 +0, 19129, 19129, 1471, 5884, 0xf12b15dd +0, 20600, 20600, 1472, 5888, 0x60c8c922 +0, 22072, 22072, 1471, 5884, 0x85693c81 +0, 23543, 23543, 1472, 5888, 0xcefcf0e0 +0, 25015, 25015, 1471, 5884, 0x243974ff +0, 26486, 26486, 1471, 5884, 0x9101b901 +0, 27957, 27957, 1472, 5888, 0xe3c68cb9 +0, 29429, 29429, 1471, 5884, 0x80f2ff5f +0, 30900, 30900, 1472, 5888, 0xfc2d19dc +0, 32372, 32372, 1471, 5884, 0xb6e0af21 +0, 33843, 33843, 1472, 5888, 0x476e74ff +0, 35315, 35315, 1471, 5884, 0x3921bc7f +0, 36786, 36786, 1472, 5888, 0x44180a3f +0, 38258, 38258, 1471, 5884, 0x01b5a119 +0, 39729, 39729, 1472, 5888, 0xdd7ad621 +0, 41201, 41201, 1471, 5884, 0xadabe898 +0, 42672, 42672, 1472, 5888, 0x2141ff8e +0, 44144, 44144, 1471, 5884, 0xfb5118fb +0, 45615, 45615, 1472, 5888, 0x06d31461 +0, 47087, 47087, 1471, 5884, 0x80ce34c1 +0, 48558, 48558, 1472, 5888, 0x72bf392f +0, 50030, 50030, 1471, 5884, 0x9d9237cf +0, 51501, 51501, 1471, 5884, 0xf5c9ce23 +0, 52972, 52972, 1472, 5888, 0x12a05dc5 +0, 54444, 54444, 1471, 5884, 0xd3ed5d4b +0, 55915, 55915, 1472, 5888, 0x06557401 +0, 57387, 57387, 1471, 5884, 0x53d81662 +0, 58858, 58858, 1472, 5888, 0xd7e0d98d +0, 60330, 60330, 1471, 5884, 0xdf00752e +0, 61801, 61801, 1472, 5888, 0x82f1d7a9 +0, 63273, 63273, 1471, 5884, 0x9cb3aba9 +0, 64744, 64744, 1472, 5888, 0xd6f98e91 +0, 66216, 66216, 1471, 5884, 0xaa7f7c09 +0, 67687, 67687, 1472, 5888, 0xb97a82a7 +0, 69159, 69159, 1471, 5884, 0x375a3d53 +0, 70630, 70630, 1472, 5888, 0xa0a460cb +0, 72102, 72102, 1471, 5884, 0xe05efbab +0, 73573, 73573, 1472, 5888, 0x95e151f0 +0, 75045, 75045, 1471, 5884, 0x44ac688d +0, 76516, 76516, 1471, 5884, 0xfc6d929f +0, 77987, 77987, 1472, 5888, 0x6406c5f1 +0, 79459, 79459, 1471, 5884, 0x4ee9e48c +0, 80930, 80930, 1472, 5888, 0xd55d43d0 +0, 82402, 82402, 1471, 5884, 0xcae69baf +0, 83873, 83873, 1472, 5888, 0x4c01f1f5 +0, 85345, 85345, 1471, 5884, 0xf7d6dab6 +0, 86816, 86816, 1472, 5888, 0x1affdeb5 +0, 88288, 88288, 1471, 5884, 0x6db72487 +0, 89759, 89759, 1472, 5888, 0x4f344e49 +0, 91231, 91231, 1471, 5884, 0x2df3827b +0, 92702, 92702, 1472, 5888, 0x1d1fc283 +0, 94174, 94174, 1471, 5884, 0x22eb1dd5 +0, 95645, 95645, 1472, 5888, 0x734e7093 +0, 97117, 97117, 1471, 5884, 0x357c9531 +0, 98588, 98588, 1472, 5888, 0x108c102d +0, 100060, 100060, 1471, 5884, 0x96ad26c6 +0, 101531, 101531, 1472, 5888, 0x7bea1996 +0, 103003, 103003, 1471, 5884, 0x124a1f8e +0, 104474, 104474, 1471, 5884, 0x08d272fb +0, 105945, 105945, 1472, 5888, 0x88832c6b +0, 107417, 107417, 1471, 5884, 0xedf41493 +0, 108888, 108888, 1472, 5888, 0xc4f226d7 +0, 110360, 110360, 1471, 5884, 0x97730397 +0, 111831, 111831, 1472, 5888, 0xbc3540e9 +0, 113303, 113303, 1471, 5884, 0x8adfa135 +0, 114774, 114774, 1472, 5888, 0x6d4be121 +0, 116246, 116246, 1471, 5884, 0xc3daea85 +0, 117717, 117717, 1472, 5888, 0x5498e9f0 +0, 119189, 119189, 1471, 5884, 0xa0eb691f +0, 120660, 120660, 1472, 5888, 0x775c7c59 +0, 122132, 122132, 1471, 5884, 0x9f108fd1 +0, 123603, 123603, 1472, 5888, 0x72d53062 +0, 125075, 125075, 1471, 5884, 0x13a93faa +0, 126546, 126546, 1472, 5888, 0x64773c8e +0, 128018, 128018, 1471, 5884, 0xaf696999 +0, 129489, 129489, 1471, 5884, 0xf45e7e81 +0, 130960, 130960, 1472, 5888, 0x00000000 +0, 132432, 132432, 1471, 5884, 0x00000000 +0, 133903, 133903, 1472, 5888, 0x00000000 +0, 135375, 135375, 1471, 5884, 0x00000000 +0, 136846, 136846, 1472, 5888, 0x00000000 +0, 138318, 138318, 1471, 5884, 0x00000000 +0, 139789, 139789, 1472, 5888, 0x00000000 +0, 141261, 141261, 1471, 5884, 0x00000000 +0, 142732, 142732, 1472, 5888, 0x00000000 +0, 144204, 144204, 1471, 5884, 0x00000000 +0, 145675, 145675, 1472, 5888, 0x00000000 +0, 147147, 147147, 1471, 5884, 0x00000000 +0, 148618, 148618, 1472, 5888, 0x00000000 +0, 150090, 150090, 1471, 5884, 0x00000000 +0, 151561, 151561, 1472, 5888, 0x00000000 +0, 153033, 153033, 1471, 5884, 0x00000000 +0, 154504, 154504, 1471, 5884, 0x00000000 +0, 155975, 155975, 1472, 5888, 0x00000000 +0, 157447, 157447, 1471, 5884, 0x00000000 +0, 158918, 158918, 1472, 5888, 0x00000000 +0, 160390, 160390, 1471, 5884, 0x00000000 +0, 161861, 161861, 1472, 5888, 0x00000000 +0, 163333, 163333, 1471, 5884, 0x00000000 +0, 164804, 164804, 1472, 5888, 0x00000000 +0, 166276, 166276, 1471, 5884, 0x00000000 +0, 167747, 167747, 1472, 5888, 0x00000000 +0, 169219, 169219, 1471, 5884, 0x00000000 +0, 170690, 170690, 1472, 5888, 0x00000000 +0, 172162, 172162, 1471, 5884, 0xfe4b2bd4 +0, 173633, 173633, 1472, 5888, 0x00000000 +0, 175105, 175105, 1471, 5884, 0x00000000 +0, 176576, 176576, 1472, 5888, 0x00000000 +0, 178048, 178048, 1471, 5884, 0x00000000 +0, 179519, 179519, 1471, 5884, 0x00000000 +0, 180990, 180990, 1472, 5888, 0x00000000 +0, 182462, 182462, 1471, 5884, 0x00000000 +0, 183933, 183933, 1472, 5888, 0x00000000 +0, 185405, 185405, 1471, 5884, 0x00000000 +0, 186876, 186876, 1472, 5888, 0x00000000 +0, 188348, 188348, 1471, 5884, 0x00000000 +0, 189819, 189819, 1472, 5888, 0x00000000 +0, 191291, 191291, 1471, 5884, 0x00000000 +0, 192762, 192762, 1472, 5888, 0x00000000 +0, 194234, 194234, 1471, 5884, 0x00000000 +0, 195705, 195705, 1472, 5888, 0x00000000 +0, 197177, 197177, 1471, 5884, 0x00000000 +0, 198648, 198648, 1472, 5888, 0x00000000 +0, 200120, 200120, 1471, 5884, 0x00000000 +0, 201591, 201591, 1472, 5888, 0x00000000 +0, 203063, 203063, 1471, 5884, 0x00000000 +0, 204534, 204534, 1472, 5888, 0x00000000 +0, 206006, 206006, 1471, 5884, 0x00000000 +0, 207477, 207477, 1262, 5048, 0x00000000 From 63322d8c894fa359c31a91bae067f8816c95ca62 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 16:30:00 +0100 Subject: [PATCH 04/25] fate: qtrle: disable audio in all tests These files contain mace6 audio which is tested elsewhere. Signed-off-by: Mans Rullgard --- tests/fate/qtrle.mak | 4 +-- tests/ref/fate/qtrle-1bit | 70 --------------------------------------- tests/ref/fate/qtrle-2bit | 70 --------------------------------------- 3 files changed, 2 insertions(+), 142 deletions(-) diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak index 8e14c3c028..2f47c29105 100644 --- a/tests/fate/qtrle.mak +++ b/tests/fate/qtrle.mak @@ -1,8 +1,8 @@ FATE_QTRLE += fate-qtrle-1bit -fate-qtrle-1bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-Monochrome.mov +fate-qtrle-1bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-Monochrome.mov -an FATE_QTRLE += fate-qtrle-2bit -fate-qtrle-2bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 +fate-qtrle-2bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an FATE_QTRLE += fate-qtrle-4bit fate-qtrle-4bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an diff --git a/tests/ref/fate/qtrle-1bit b/tests/ref/fate/qtrle-1bit index 230cae6191..1cbaa9c5af 100644 --- a/tests/ref/fate/qtrle-1bit +++ b/tests/ref/fate/qtrle-1bit @@ -1,109 +1,39 @@ #tb 0: 1/1200 -#tb 1: 1/22050 0, 0, 0, 0, 9600, 0xc1632102 -1, 0, 0, 1020, 2040, 0x0a157db4 -1, 1020, 1020, 1020, 2040, 0x00c63e08 0, 100, 100, 0, 9600, 0x0f6c0521 -1, 2040, 2040, 1020, 2040, 0xacf2a25b -1, 3060, 3060, 1020, 2040, 0xd6189e85 0, 200, 200, 0, 9600, 0x04b90b5a -1, 4080, 4080, 1020, 2040, 0x8276f843 -1, 5100, 5100, 1020, 2040, 0xadebae73 0, 300, 300, 0, 9600, 0x2ebd4500 -1, 6120, 6120, 1020, 2040, 0x5da76697 -1, 7140, 7140, 1020, 2040, 0x469d0ea7 0, 400, 400, 0, 9600, 0x726f46f4 -1, 8160, 8160, 1020, 2040, 0x0d7412e1 -1, 9180, 9180, 1020, 2040, 0x2f2cc63f 0, 500, 500, 0, 9600, 0x37f6968e -1, 10200, 10200, 1020, 2040, 0x10106eb7 0, 600, 600, 0, 9600, 0x7305872e -1, 11220, 11220, 1020, 2040, 0x300124c7 -1, 12240, 12240, 1020, 2040, 0xa329f8e8 0, 700, 700, 0, 9600, 0x222eff5e -1, 13260, 13260, 1020, 2040, 0xcea35ca5 -1, 14280, 14280, 1020, 2040, 0x55105aef 0, 800, 800, 0, 9600, 0x9317e227 -1, 15300, 15300, 1020, 2040, 0x08980ce1 -1, 16320, 16320, 1020, 2040, 0x367faf24 0, 900, 900, 0, 9600, 0x421eee9d -1, 17340, 17340, 1020, 2040, 0x75bfef06 -1, 18360, 18360, 1020, 2040, 0x34f1daf4 0, 1000, 1000, 0, 9600, 0xcbcfaaff -1, 19380, 19380, 1020, 2040, 0x97050317 0, 1100, 1100, 0, 9600, 0xe7d43be2 -1, 20400, 20400, 1020, 2040, 0xd297c536 -1, 21420, 21420, 1020, 2040, 0xa8abad5a 0, 1200, 1200, 0, 9600, 0x0b71e28c -1, 22440, 22440, 1020, 2040, 0x445ce8e0 -1, 23460, 23460, 1020, 2040, 0xa3f4d940 0, 1300, 1300, 0, 9600, 0xd6a050ca -1, 24480, 24480, 1020, 2040, 0x0ebb7b26 -1, 25500, 25500, 1020, 2040, 0x4372f6f6 0, 1400, 1400, 0, 9600, 0x0ac6dbf5 -1, 26520, 26520, 1020, 2040, 0xd4365079 -1, 27540, 27540, 1020, 2040, 0x56f902f7 0, 1500, 1500, 0, 9600, 0x5c036038 -1, 28560, 28560, 1020, 2040, 0x4153938a 0, 1600, 1600, 0, 9600, 0x6e417ed6 -1, 29580, 29580, 1020, 2040, 0x14996d86 -1, 30600, 30600, 1020, 2040, 0x3f99c318 0, 1700, 1700, 0, 9600, 0x8bd0dc22 -1, 31620, 31620, 1020, 2040, 0x939978a5 -1, 32640, 32640, 1020, 2040, 0x7086bd44 0, 1800, 1800, 0, 9600, 0xdf3b0877 -1, 33660, 33660, 138, 276, 0x25b89d22 -1, 33798, 33798, 1020, 2040, 0xf3edb106 -1, 34818, 34818, 1020, 2040, 0x0ca61430 0, 1900, 1900, 0, 9600, 0xae6e7823 -1, 35838, 35838, 1020, 2040, 0x7229c458 0, 2000, 2000, 0, 9600, 0x8ff0ac32 -1, 36858, 36858, 1020, 2040, 0xc37edd31 -1, 37878, 37878, 1020, 2040, 0xa3da98b4 0, 2100, 2100, 0, 9600, 0xa2d9e2ce -1, 38898, 38898, 1020, 2040, 0x69704803 -1, 39918, 39918, 1020, 2040, 0xa79bf334 0, 2200, 2200, 0, 9600, 0x5fd92b65 -1, 40938, 40938, 1020, 2040, 0x59d8d4c4 -1, 41958, 41958, 1020, 2040, 0xf9ff0271 0, 2300, 2300, 0, 9600, 0x81c1c824 -1, 42978, 42978, 1020, 2040, 0xc4ced9d6 -1, 43998, 43998, 1020, 2040, 0x859f1912 0, 2400, 2400, 0, 9600, 0xb8a2ace4 -1, 45018, 45018, 1020, 2040, 0xe7955aa6 0, 2500, 2500, 0, 9600, 0x65b70404 -1, 46038, 46038, 1020, 2040, 0x374624fd -1, 47058, 47058, 1020, 2040, 0x52121097 0, 2600, 2600, 0, 9600, 0xc5349eb2 -1, 48078, 48078, 1020, 2040, 0x660fe645 -1, 49098, 49098, 1020, 2040, 0xf624176a 0, 2700, 2700, 0, 9600, 0xf60cc2b8 -1, 50118, 50118, 1020, 2040, 0x1f2246dd -1, 51138, 51138, 1020, 2040, 0x940e0a32 0, 2800, 2800, 0, 9600, 0x31474595 -1, 52158, 52158, 1020, 2040, 0x9c6d338c -1, 53178, 53178, 1020, 2040, 0xfce0d30a 0, 2900, 2900, 0, 9600, 0xf602635b -1, 54198, 54198, 1020, 2040, 0xd0ec9aa5 0, 3000, 3000, 0, 9600, 0x873cbd87 -1, 55218, 55218, 1020, 2040, 0x58012141 -1, 56238, 56238, 1020, 2040, 0xde67fc43 0, 3100, 3100, 0, 9600, 0xb9793ffe -1, 57258, 57258, 1020, 2040, 0x6baa0450 -1, 58278, 58278, 1020, 2040, 0xf4f80252 0, 3200, 3200, 0, 9600, 0x42eb2831 -1, 59298, 59298, 1020, 2040, 0x0cd47ee3 -1, 60318, 60318, 1020, 2040, 0x129cbaa7 0, 3300, 3300, 0, 9600, 0x44cc1dab -1, 61338, 61338, 1020, 2040, 0x5ef5c0a1 -1, 62358, 62358, 1020, 2040, 0xf660baa7 0, 3400, 3400, 0, 9600, 0xbdcbbb87 -1, 63378, 63378, 1020, 2040, 0xe48bc0a1 0, 3500, 3500, 0, 9600, 0x29c22df7 -1, 64398, 64398, 1020, 2040, 0xdfeabaa7 -1, 65418, 65418, 1020, 2040, 0xed04c0a1 0, 3600, 3600, 0, 9600, 0xde502ef5 -1, 66438, 66438, 1020, 2040, 0xd771baa7 -1, 67458, 67458, 150, 300, 0x521f24e9 -1, 67608, 67608, 738, 1476, 0x9b9394b1 0, 3700, 3700, 0, 9600, 0xaf311aeb diff --git a/tests/ref/fate/qtrle-2bit b/tests/ref/fate/qtrle-2bit index 2a43a84c00..5866db5955 100644 --- a/tests/ref/fate/qtrle-2bit +++ b/tests/ref/fate/qtrle-2bit @@ -1,109 +1,39 @@ #tb 0: 1/1200 -#tb 1: 1/22050 0, 0, 0, 0, 230400, 0xb1ee55dc -1, 0, 0, 1020, 2040, 0x0a157db4 -1, 1020, 1020, 1020, 2040, 0x00c63e08 0, 100, 100, 0, 230400, 0x97c580bf -1, 2040, 2040, 1020, 2040, 0xacf2a25b -1, 3060, 3060, 1020, 2040, 0xd6189e85 0, 200, 200, 0, 230400, 0xd4bd57e8 -1, 4080, 4080, 1020, 2040, 0x8276f843 -1, 5100, 5100, 1020, 2040, 0xadebae73 0, 300, 300, 0, 230400, 0x412b79aa -1, 6120, 6120, 1020, 2040, 0x5da76697 -1, 7140, 7140, 1020, 2040, 0x469d0ea7 0, 400, 400, 0, 230400, 0x928a44d1 -1, 8160, 8160, 1020, 2040, 0x0d7412e1 -1, 9180, 9180, 1020, 2040, 0x2f2cc63f 0, 500, 500, 0, 230400, 0x6bbdc0e4 -1, 10200, 10200, 1020, 2040, 0x10106eb7 0, 600, 600, 0, 230400, 0x382e960f -1, 11220, 11220, 1020, 2040, 0x300124c7 -1, 12240, 12240, 1020, 2040, 0xa329f8e8 0, 700, 700, 0, 230400, 0x62c863ea -1, 13260, 13260, 1020, 2040, 0xcea35ca5 -1, 14280, 14280, 1020, 2040, 0x55105aef 0, 800, 800, 0, 230400, 0xbfccd3ce -1, 15300, 15300, 1020, 2040, 0x08980ce1 -1, 16320, 16320, 1020, 2040, 0x367faf24 0, 900, 900, 0, 230400, 0x1987cdd4 -1, 17340, 17340, 1020, 2040, 0x75bfef06 -1, 18360, 18360, 1020, 2040, 0x34f1daf4 0, 1000, 1000, 0, 230400, 0x40279727 -1, 19380, 19380, 1020, 2040, 0x97050317 0, 1100, 1100, 0, 230400, 0x9d4f6746 -1, 20400, 20400, 1020, 2040, 0xd297c536 -1, 21420, 21420, 1020, 2040, 0xa8abad5a 0, 1200, 1200, 0, 230400, 0x7b8a77ec -1, 22440, 22440, 1020, 2040, 0x445ce8e0 -1, 23460, 23460, 1020, 2040, 0xa3f4d940 0, 1300, 1300, 0, 230400, 0x2ce7a781 -1, 24480, 24480, 1020, 2040, 0x0ebb7b26 -1, 25500, 25500, 1020, 2040, 0x4372f6f6 0, 1400, 1400, 0, 230400, 0xb749815e -1, 26520, 26520, 1020, 2040, 0xd4365079 -1, 27540, 27540, 1020, 2040, 0x56f902f7 0, 1500, 1500, 0, 230400, 0x61c88610 -1, 28560, 28560, 1020, 2040, 0x4153938a 0, 1600, 1600, 0, 230400, 0x8449114d -1, 29580, 29580, 1020, 2040, 0x14996d86 -1, 30600, 30600, 1020, 2040, 0x3f99c318 0, 1700, 1700, 0, 230400, 0x5f73e666 -1, 31620, 31620, 1020, 2040, 0x939978a5 -1, 32640, 32640, 1020, 2040, 0x7086bd44 0, 1800, 1800, 0, 230400, 0xbde53ce6 -1, 33660, 33660, 138, 276, 0x25b89d22 -1, 33798, 33798, 1020, 2040, 0xf3edb106 -1, 34818, 34818, 1020, 2040, 0x0ca61430 0, 1900, 1900, 0, 230400, 0x8c7406fd -1, 35838, 35838, 1020, 2040, 0x7229c458 0, 2000, 2000, 0, 230400, 0xf9e9a3ef -1, 36858, 36858, 1020, 2040, 0xc37edd31 -1, 37878, 37878, 1020, 2040, 0xa3da98b4 0, 2100, 2100, 0, 230400, 0x7e0a3077 -1, 38898, 38898, 1020, 2040, 0x69704803 -1, 39918, 39918, 1020, 2040, 0xa79bf334 0, 2200, 2200, 0, 230400, 0xd9245c5f -1, 40938, 40938, 1020, 2040, 0x59d8d4c4 -1, 41958, 41958, 1020, 2040, 0xf9ff0271 0, 2300, 2300, 0, 230400, 0x6d077ea2 -1, 42978, 42978, 1020, 2040, 0xc4ced9d6 -1, 43998, 43998, 1020, 2040, 0x859f1912 0, 2400, 2400, 0, 230400, 0xf622bb2a -1, 45018, 45018, 1020, 2040, 0xe7955aa6 0, 2500, 2500, 0, 230400, 0x35292dc8 -1, 46038, 46038, 1020, 2040, 0x374624fd -1, 47058, 47058, 1020, 2040, 0x52121097 0, 2600, 2600, 0, 230400, 0xc0cea946 -1, 48078, 48078, 1020, 2040, 0x660fe645 -1, 49098, 49098, 1020, 2040, 0xf624176a 0, 2700, 2700, 0, 230400, 0x98b27b60 -1, 50118, 50118, 1020, 2040, 0x1f2246dd -1, 51138, 51138, 1020, 2040, 0x940e0a32 0, 2800, 2800, 0, 230400, 0x668ef6bd -1, 52158, 52158, 1020, 2040, 0x9c6d338c -1, 53178, 53178, 1020, 2040, 0xfce0d30a 0, 2900, 2900, 0, 230400, 0x6c07a31c -1, 54198, 54198, 1020, 2040, 0xd0ec9aa5 0, 3000, 3000, 0, 230400, 0x0b4a6ae1 -1, 55218, 55218, 1020, 2040, 0x58012141 -1, 56238, 56238, 1020, 2040, 0xde67fc43 0, 3100, 3100, 0, 230400, 0x945b9878 -1, 57258, 57258, 1020, 2040, 0x6baa0450 -1, 58278, 58278, 1020, 2040, 0xf4f80252 0, 3200, 3200, 0, 230400, 0xab28031c -1, 59298, 59298, 1020, 2040, 0x0cd47ee3 -1, 60318, 60318, 1020, 2040, 0x129cbaa7 0, 3300, 3300, 0, 230400, 0x977252b0 -1, 61338, 61338, 1020, 2040, 0x5ef5c0a1 -1, 62358, 62358, 1020, 2040, 0xf660baa7 0, 3400, 3400, 0, 230400, 0x6c3d9706 -1, 63378, 63378, 1020, 2040, 0xe48bc0a1 0, 3500, 3500, 0, 230400, 0xe053bc2a -1, 64398, 64398, 1020, 2040, 0xdfeabaa7 -1, 65418, 65418, 1020, 2040, 0xed04c0a1 0, 3600, 3600, 0, 230400, 0x4cf2fc7c -1, 66438, 66438, 1020, 2040, 0xd771baa7 -1, 67458, 67458, 150, 300, 0x521f24e9 -1, 67608, 67608, 738, 1476, 0x9b9394b1 0, 3700, 3700, 0, 230400, 0x610beda7 From f4d2b93be402411df1cc5197f02c025e8b1bcf82 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 17:16:58 +0100 Subject: [PATCH 05/25] fate: truemotion1: disable audio These tests include adpcm-ima-dk3 audio which is tested elsewhere. Signed-off-by: Mans Rullgard --- tests/fate/video.mak | 4 +- tests/ref/fate/truemotion1-15 | 114 ---------------------------------- tests/ref/fate/truemotion1-24 | 29 --------- 3 files changed, 2 insertions(+), 145 deletions(-) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 319eae86b5..8545f2e8cc 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -74,10 +74,10 @@ FATE_AVCONV += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 FATE_TRUEMOTION1 += fate-truemotion1-15 -fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 +fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 -an FATE_TRUEMOTION1 += fate-truemotion1-24 -fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 +fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an FATE_AVCONV += $(FATE_TRUEMOTION1) fate-truemotion1: $(FATE_TRUEMOTION1) diff --git a/tests/ref/fate/truemotion1-15 b/tests/ref/fate/truemotion1-15 index 9a5d3894b0..6b5281decf 100644 --- a/tests/ref/fate/truemotion1-15 +++ b/tests/ref/fate/truemotion1-15 @@ -1,220 +1,106 @@ #tb 0: 1/15 -#tb 1: 1/44100 0, 0, 0, 1, 161280, 0x7041748d -1, 0, 0, 2708, 10832, 0xe1a811fa -1, 2708, 2708, 2708, 10832, 0xb47841f9 0, 1, 1, 1, 161280, 0x3cc4dfb5 -1, 5416, 5416, 2708, 10832, 0x839eedf1 0, 2, 2, 1, 161280, 0xca3af22d -1, 8124, 8124, 2708, 10832, 0xb48b1f60 0, 3, 3, 1, 161280, 0x23ad1d85 -1, 10832, 10832, 2708, 10832, 0x743936c0 0, 4, 4, 1, 161280, 0x9c9cf364 -1, 13540, 13540, 2708, 10832, 0xe1f039fb 0, 5, 5, 1, 161280, 0x1551d6a8 -1, 16248, 16248, 2708, 10832, 0xef00751a 0, 6, 6, 1, 161280, 0xc39f6b95 -1, 18956, 18956, 2708, 10832, 0x401ed099 0, 7, 7, 1, 161280, 0x3b036dcc -1, 21665, 21665, 2708, 10832, 0x432a53bd 0, 8, 8, 1, 161280, 0xa6fac1db -1, 24373, 24373, 2708, 10832, 0xc4276bfd 0, 9, 9, 1, 161280, 0x67656b62 -1, 27081, 27081, 2708, 10832, 0x51f0fa8c 0, 10, 10, 1, 161280, 0xb41f47d1 -1, 29789, 29789, 2708, 10832, 0xcebae622 0, 11, 11, 1, 161280, 0xc207249e -1, 32497, 32497, 2708, 10832, 0xe9f6dc1f -1, 35205, 35205, 2708, 10832, 0xda087fee 0, 12, 12, 1, 161280, 0xbee8f843 -1, 37913, 37913, 2708, 10832, 0x67a621bb 0, 13, 13, 1, 161280, 0x092acf46 -1, 40621, 40621, 2708, 10832, 0xd7be207f 0, 14, 14, 1, 161280, 0x8d9e2680 -1, 43329, 43329, 2708, 10832, 0x19d32507 0, 15, 15, 1, 161280, 0x8becc20c -1, 46037, 46037, 2708, 10832, 0xe1a3fbfa 0, 16, 16, 1, 161280, 0x655e444e -1, 48745, 48745, 2708, 10832, 0xd10df779 0, 17, 17, 1, 161280, 0x5c112da0 -1, 51453, 51453, 2708, 10832, 0x4428e1a7 0, 18, 18, 1, 161280, 0x232fa9eb -1, 54161, 54161, 2708, 10832, 0x7ea9b33d 0, 19, 19, 1, 161280, 0x9721745d -1, 56869, 56869, 2708, 10832, 0x6852a5a5 0, 20, 20, 1, 161280, 0x92f1d880 -1, 59578, 59578, 2708, 10832, 0xfeb78863 0, 21, 21, 1, 161280, 0x16233978 -1, 62286, 62286, 2708, 10832, 0xf157f928 0, 22, 22, 1, 161280, 0x19a27e69 -1, 64994, 64994, 2708, 10832, 0x86414b3e 0, 23, 23, 1, 161280, 0x7b6ad73a -1, 67702, 67702, 2708, 10832, 0x2e28cdf6 -1, 70410, 70410, 2708, 10832, 0x00212e44 0, 24, 24, 1, 161280, 0xa7a674aa -1, 73118, 73118, 2708, 10832, 0x2d7f9378 0, 25, 25, 1, 161280, 0x4e434abb -1, 75826, 75826, 2708, 10832, 0x84cb25d7 0, 26, 26, 1, 161280, 0xb96eea14 -1, 78534, 78534, 2708, 10832, 0x3aca41fa 0, 27, 27, 1, 161280, 0x1350188c -1, 81242, 81242, 2708, 10832, 0x27ad34b9 0, 28, 28, 1, 161280, 0x79c6f305 -1, 83950, 83950, 2708, 10832, 0xe665144a 0, 29, 29, 1, 161280, 0xa9c7782d -1, 86658, 86658, 2708, 10832, 0xf9546626 0, 30, 30, 1, 161280, 0x40a4f456 -1, 89366, 89366, 2708, 10832, 0xe71c4f22 0, 31, 31, 1, 161280, 0xaf291ed6 -1, 92074, 92074, 2708, 10832, 0x5e61869c 0, 32, 32, 1, 161280, 0xab29b4e1 -1, 94782, 94782, 2708, 10832, 0x571d2c10 0, 33, 33, 1, 161280, 0xbfcd2712 -1, 97490, 97490, 2708, 10832, 0xf0e08cd5 0, 34, 34, 1, 161280, 0xff22a0d7 -1, 100199, 100199, 2708, 10832, 0x66650e49 0, 35, 35, 1, 161280, 0xb0ae88a9 -1, 102907, 102907, 2708, 10832, 0x4024deaf -1, 105615, 105615, 2708, 10832, 0xda7bdb14 0, 36, 36, 1, 161280, 0x811d1259 -1, 108323, 108323, 2708, 10832, 0xc27a342f 0, 37, 37, 1, 161280, 0x593c39a1 -1, 111031, 111031, 2708, 10832, 0x574fe679 0, 38, 38, 1, 161280, 0x5a5a97f8 -1, 113739, 113739, 2708, 10832, 0x37db464e 0, 39, 39, 1, 161280, 0xa5639ecf -1, 116447, 116447, 2708, 10832, 0xb1fa2a83 0, 40, 40, 1, 161280, 0x543920c6 -1, 119155, 119155, 2708, 10832, 0x3d98d9b7 0, 41, 41, 1, 161280, 0xb41689ee -1, 121863, 121863, 2708, 10832, 0xb7c908e2 0, 42, 42, 1, 161280, 0xc0ad83de -1, 124571, 124571, 2708, 10832, 0x9f7e44d8 0, 43, 43, 1, 161280, 0x9e9e7456 -1, 127279, 127279, 2708, 10832, 0xae9b8774 0, 44, 44, 1, 161280, 0x777ccbfe -1, 129987, 129987, 2708, 10832, 0x36916e3f 0, 45, 45, 1, 161280, 0x9c2df916 -1, 132695, 132695, 2708, 10832, 0xd785f5ef 0, 46, 46, 1, 161280, 0xe0c13b35 -1, 135403, 135403, 2708, 10832, 0x2a3a5673 -1, 138112, 138112, 2708, 10832, 0x7320e379 0, 47, 47, 1, 161280, 0x39bfa5a5 -1, 140820, 140820, 2708, 10832, 0xec787be5 0, 48, 48, 1, 161280, 0x35dfb264 -1, 143528, 143528, 2708, 10832, 0xd0d13aa0 0, 49, 49, 1, 161280, 0x43018613 -1, 146236, 146236, 2708, 10832, 0x34dfcb17 0, 50, 50, 1, 161280, 0x43584b8a -1, 148944, 148944, 2708, 10832, 0x1a9c29f1 0, 51, 51, 1, 161280, 0xa5cd230a -1, 151652, 151652, 2708, 10832, 0x3e73dcc1 0, 52, 52, 1, 161280, 0x6fe2cfb3 -1, 154360, 154360, 2708, 10832, 0x7855b053 0, 53, 53, 1, 161280, 0x88a7c0db -1, 157068, 157068, 2708, 10832, 0x5588df8f 0, 54, 54, 1, 161280, 0x476f1cd2 -1, 159776, 159776, 2708, 10832, 0x6f621299 0, 55, 55, 1, 161280, 0x96401d49 -1, 162484, 162484, 2708, 10832, 0xce7f39c2 0, 56, 56, 1, 161280, 0x7d932919 -1, 165192, 165192, 2708, 10832, 0xd88e6552 0, 57, 57, 1, 161280, 0x06465481 -1, 167900, 167900, 2708, 10832, 0xddc63597 0, 58, 58, 1, 161280, 0x39631520 -1, 170608, 170608, 2708, 10832, 0xe3071865 -1, 173316, 173316, 2708, 10832, 0x2a44a123 0, 59, 59, 1, 161280, 0xc3fff780 -1, 176024, 176024, 2708, 10832, 0x08d85d45 0, 60, 60, 1, 161280, 0xa81faf28 -1, 178733, 178733, 2708, 10832, 0x4dc5f83a 0, 61, 61, 1, 161280, 0x7a311f4f -1, 181441, 181441, 2708, 10832, 0x89497812 0, 62, 62, 1, 161280, 0x52f9b931 -1, 184149, 184149, 2708, 10832, 0x9ee1db54 0, 63, 63, 1, 161280, 0x938cf016 -1, 186857, 186857, 2708, 10832, 0x5277d611 0, 64, 64, 1, 161280, 0xf8f6e19c -1, 189565, 189565, 2708, 10832, 0x570a619c 0, 65, 65, 1, 161280, 0xca90561b -1, 192273, 192273, 2708, 10832, 0xa217d70f 0, 66, 66, 1, 161280, 0x8594d06b -1, 194981, 194981, 2708, 10832, 0x6f0ecbf4 0, 67, 67, 1, 161280, 0xea32bf3b -1, 197689, 197689, 2708, 10832, 0x2704b114 0, 68, 68, 1, 161280, 0x4646111a -1, 200397, 200397, 2708, 10832, 0xf24e679f 0, 69, 69, 1, 161280, 0xee891162 -1, 203105, 203105, 2708, 10832, 0x05572099 0, 70, 70, 1, 161280, 0xcfc32082 -1, 205813, 205813, 2708, 10832, 0x33942d0c -1, 208521, 208521, 2708, 10832, 0xa77ea674 0, 71, 71, 1, 161280, 0x863c281a -1, 211229, 211229, 2708, 10832, 0xeba663bc 0, 72, 72, 1, 161280, 0x01b591aa -1, 213937, 213937, 2708, 10832, 0x1338524a 0, 73, 73, 1, 161280, 0x211fbc62 -1, 216645, 216645, 2708, 10832, 0x6182b0b3 0, 74, 74, 1, 161280, 0xae2bafe2 -1, 219354, 219354, 2708, 10832, 0xa410a364 0, 75, 75, 1, 161280, 0xcfe46dca -1, 222062, 222062, 2708, 10832, 0x2f4374b0 0, 76, 76, 1, 161280, 0xcf8fe8a3 -1, 224770, 224770, 2708, 10832, 0xf41f3a07 0, 77, 77, 1, 161280, 0x3f8474eb -1, 227478, 227478, 2708, 10832, 0x2b1c50c6 0, 78, 78, 1, 161280, 0x06da345a -1, 230186, 230186, 2708, 10832, 0x3692ac89 0, 79, 79, 1, 161280, 0xbd4d3280 -1, 232894, 232894, 2708, 10832, 0x5d6bc87e 0, 80, 80, 1, 161280, 0xb5e70fea -1, 235602, 235602, 2708, 10832, 0x1b1cda0c 0, 81, 81, 1, 161280, 0x0c99c804 -1, 238310, 238310, 2708, 10832, 0x11eaa15f -1, 241018, 241018, 2708, 10832, 0x73c7d7ef 0, 82, 82, 1, 161280, 0x19841ed4 -1, 243726, 243726, 2708, 10832, 0x65d7e3be 0, 83, 83, 1, 161280, 0xf81dea50 -1, 246434, 246434, 2708, 10832, 0xb9c00688 0, 84, 84, 1, 161280, 0x7777d81c -1, 249142, 249142, 2708, 10832, 0x0b98c125 0, 85, 85, 1, 161280, 0x0497cfd8 -1, 251850, 251850, 2708, 10832, 0x331ed413 0, 86, 86, 1, 161280, 0x50b6eb64 -1, 254558, 254558, 2708, 10832, 0x9b68f485 0, 87, 87, 1, 161280, 0x5071fc07 -1, 257267, 257267, 2708, 10832, 0x1b865c55 0, 88, 88, 1, 161280, 0xbb7527fb -1, 259975, 259975, 2708, 10832, 0x68cef565 0, 89, 89, 1, 161280, 0x13054f1f -1, 262683, 262683, 2708, 10832, 0x3a605f15 0, 90, 90, 1, 161280, 0x4b78fb27 -1, 265391, 265391, 2708, 10832, 0xd72ff22e 0, 91, 91, 1, 161280, 0xf504968f -1, 268099, 268099, 2708, 10832, 0x1c672b67 0, 92, 92, 1, 161280, 0x555b10b7 -1, 270807, 270807, 2708, 10832, 0xfd1a7e7e 0, 93, 93, 1, 161280, 0xcc0dde40 -1, 273515, 273515, 2708, 10832, 0x9bf20ead -1, 276223, 276223, 2708, 10832, 0x00000000 0, 94, 94, 1, 161280, 0xcc0dde40 -1, 278931, 278931, 2708, 10832, 0x00000000 0, 95, 95, 1, 161280, 0x367f60c8 -1, 281639, 281639, 2708, 10832, 0x00000000 0, 96, 96, 1, 161280, 0x367f60c8 -1, 284347, 284347, 2708, 10832, 0x00000000 0, 97, 97, 1, 161280, 0x367f60c8 -1, 287055, 287055, 2708, 10832, 0x00000000 0, 98, 98, 1, 161280, 0x367f60c8 -1, 289763, 289763, 2708, 10832, 0x00000000 0, 99, 99, 1, 161280, 0x367f60c8 -1, 292471, 292471, 2708, 10832, 0x00000000 0, 100, 100, 1, 161280, 0x367f60c8 -1, 295179, 295179, 2708, 10832, 0x00000000 0, 101, 101, 1, 161280, 0x367f60c8 -1, 297888, 297888, 2708, 10832, 0x00000000 0, 102, 102, 1, 161280, 0x367f60c8 -1, 300596, 300596, 2708, 10832, 0x00000000 0, 103, 103, 1, 161280, 0x367f60c8 -1, 303304, 303304, 2708, 10832, 0x00000000 0, 104, 104, 1, 161280, 0x367f60c8 diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24 index 8d9b150b8e..f097ed0e28 100644 --- a/tests/ref/fate/truemotion1-24 +++ b/tests/ref/fate/truemotion1-24 @@ -1,45 +1,16 @@ #tb 0: 1/15 -#tb 1: 1/44100 0, 0, 0, 1, 69120, 0x68beb30f -1, 0, 0, 2708, 10832, 0x1597b4c8 -1, 2708, 2708, 2708, 10832, 0xf9479f8b 0, 1, 1, 1, 69120, 0x3976f5cf -1, 5416, 5416, 2708, 10832, 0x8db50e74 0, 2, 2, 1, 69120, 0xf815bc3c -1, 8124, 8124, 2708, 10832, 0x2b33ecbb 0, 3, 3, 1, 69120, 0xa7cc0ae6 -1, 10832, 10832, 2708, 10832, 0x8d0f537b 0, 4, 4, 1, 69120, 0xd85ac282 -1, 13540, 13540, 2708, 10832, 0x922081c7 0, 5, 5, 1, 69120, 0xf7fd7edb -1, 16248, 16248, 2708, 10832, 0x40291f19 0, 6, 6, 1, 69120, 0x433bb6f6 -1, 18956, 18956, 2708, 10832, 0x88f5271a 0, 7, 7, 1, 69120, 0xdbac8bee -1, 21665, 21665, 2708, 10832, 0x55c6bbe5 0, 8, 8, 1, 69120, 0x88e2a799 -1, 24373, 24373, 2708, 10832, 0x9b51ae82 0, 9, 9, 1, 69120, 0x49617b26 -1, 27081, 27081, 2708, 10832, 0xcdf2409b 0, 10, 10, 1, 69120, 0xeb44ca01 -1, 29789, 29789, 2708, 10832, 0x0933b1a4 0, 11, 11, 1, 69120, 0x6fea37e8 -1, 32497, 32497, 2708, 10832, 0x24b77006 -1, 35205, 35205, 2708, 10832, 0xf612fa8a 0, 12, 12, 1, 69120, 0xf55d74c7 -1, 37913, 37913, 2708, 10832, 0x99884b06 0, 13, 13, 1, 69120, 0xb5082ca7 -1, 40621, 40621, 2708, 10832, 0x3c746fbe 0, 14, 14, 1, 69120, 0x5876d758 -1, 43329, 43329, 2708, 10832, 0x05f3b08a -1, 46037, 46037, 2708, 10832, 0xa6560483 -1, 48745, 48745, 2708, 10832, 0xd98a8e19 -1, 51453, 51453, 2708, 10832, 0xf98a0b2e -1, 54161, 54161, 2708, 10832, 0xb1039582 -1, 56869, 56869, 2708, 10832, 0x85dd5c3f -1, 59578, 59578, 2708, 10832, 0x19fc801a -1, 62286, 62286, 2708, 10832, 0x95805089 -1, 64994, 64994, 2708, 10832, 0x576fdec3 -1, 67702, 67702, 2708, 10832, 0x704a0905 -1, 70410, 70410, 2708, 10832, 0xf87ce1fa -1, 73118, 73118, 2708, 10832, 0xfc0076b9 From bd7ac952b132adac16f02d5e30737db45dc5ee2b Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 04:11:43 +0100 Subject: [PATCH 06/25] fate: separate delphine-cin audio and video tests Signed-off-by: Mans Rullgard --- tests/fate/audio.mak | 3 + tests/fate/video.mak | 4 +- tests/ref/fate/delphine-cin-audio | 92 +++++++++++++++++++ .../fate/{delphine-cin => delphine-cin-video} | 92 ------------------- 4 files changed, 97 insertions(+), 94 deletions(-) create mode 100644 tests/ref/fate/delphine-cin-audio rename tests/ref/fate/{delphine-cin => delphine-cin-video} (50%) diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 364ebf1581..804b6fdcd4 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -13,6 +13,9 @@ fate-binkaudio-rdft: FUZZ = 2 FATE_AVCONV += $(FATE_BINKAUDIO) fate-binkaudio: $(FATE_BINKAUDIO) +FATE_AVCONV += fate-delphine-cin-audio +fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn + FATE_AVCONV += fate-dts fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts fate-dts: CMP = oneoff diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 8545f2e8cc..c2b25648c1 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -67,8 +67,8 @@ fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_ FATE_AVCONV += fate-cyuv fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi -FATE_AVCONV += fate-delphine-cin -fate-delphine-cin: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 +FATE_AVCONV += fate-delphine-cin-video +fate-delphine-cin-video: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an FATE_AVCONV += fate-deluxepaint-anm fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 diff --git a/tests/ref/fate/delphine-cin-audio b/tests/ref/fate/delphine-cin-audio new file mode 100644 index 0000000000..1a94a6be0a --- /dev/null +++ b/tests/ref/fate/delphine-cin-audio @@ -0,0 +1,92 @@ +#tb 0: 1/22050 +0, 0, 0, 88224, 176448, 0x541ddc55 +0, 88224, 88224, 1838, 3676, 0xaf455081 +0, 90062, 90062, 1838, 3676, 0x27ef4e91 +0, 91900, 91900, 1838, 3676, 0xd1d986a3 +0, 93738, 93738, 1838, 3676, 0xaaa2b589 +0, 95576, 95576, 1838, 3676, 0x6e794ff9 +0, 97414, 97414, 1838, 3676, 0x266351f1 +0, 99252, 99252, 1838, 3676, 0xdeae50b2 +0, 101090, 101090, 1838, 3676, 0x90f1f96a +0, 102928, 102928, 1838, 3676, 0xea07adf9 +0, 104766, 104766, 1838, 3676, 0xb80a8925 +0, 106604, 106604, 1838, 3676, 0xc392a1da +0, 108442, 108442, 1838, 3676, 0xa076bdda +0, 110280, 110280, 1838, 3676, 0x8f40b4cc +0, 112118, 112118, 1838, 3676, 0x4227fe30 +0, 113956, 113956, 1838, 3676, 0x82b31ec8 +0, 115794, 115794, 1838, 3676, 0x3ba04042 +0, 117632, 117632, 1838, 3676, 0x6fe7440a +0, 119470, 119470, 1838, 3676, 0x23e33177 +0, 121308, 121308, 1838, 3676, 0x1f14242c +0, 123146, 123146, 1838, 3676, 0x72931fb0 +0, 124984, 124984, 1838, 3676, 0x2b1351c2 +0, 126822, 126822, 1838, 3676, 0x6aee7070 +0, 128660, 128660, 1838, 3676, 0x237658fa +0, 130498, 130498, 1838, 3676, 0xac001143 +0, 132336, 132336, 1838, 3676, 0x1921ee21 +0, 134174, 134174, 1838, 3676, 0x80186091 +0, 136012, 136012, 1838, 3676, 0xb7f37ede +0, 137850, 137850, 1838, 3676, 0x355227ef +0, 139688, 139688, 1838, 3676, 0xb0411f35 +0, 141526, 141526, 1838, 3676, 0xe7c4fe0e +0, 143364, 143364, 1838, 3676, 0x0425984d +0, 145202, 145202, 1838, 3676, 0xfd59dea1 +0, 147040, 147040, 1838, 3676, 0xa53d5aab +0, 148878, 148878, 1838, 3676, 0x8bc403c2 +0, 150716, 150716, 1838, 3676, 0x7dd638c2 +0, 152554, 152554, 1838, 3676, 0x284913eb +0, 154392, 154392, 1838, 3676, 0xec17e83c +0, 156230, 156230, 1838, 3676, 0x40543463 +0, 158068, 158068, 1838, 3676, 0x92d81bf8 +0, 159906, 159906, 1838, 3676, 0x44ef161d +0, 161744, 161744, 1838, 3676, 0x499df3d5 +0, 163582, 163582, 1838, 3676, 0xf98f4d75 +0, 165420, 165420, 1838, 3676, 0x8ffe2681 +0, 167258, 167258, 1838, 3676, 0x84093bfd +0, 169096, 169096, 1838, 3676, 0x5f9c2e32 +0, 170934, 170934, 1838, 3676, 0x8f93c29b +0, 172772, 172772, 1838, 3676, 0xf0ada687 +0, 174610, 174610, 1838, 3676, 0x30019db2 +0, 176448, 176448, 1838, 3676, 0x06ebace3 +0, 178286, 178286, 1838, 3676, 0xc293d944 +0, 180124, 180124, 1838, 3676, 0x789ff65e +0, 181962, 181962, 1838, 3676, 0xa2ae13c1 +0, 183800, 183800, 1838, 3676, 0xb64f1cd9 +0, 185638, 185638, 1838, 3676, 0x18f4e36a +0, 187476, 187476, 1838, 3676, 0xe9ccd0f0 +0, 189314, 189314, 1838, 3676, 0xc215b4ab +0, 191152, 191152, 1838, 3676, 0x45b5c410 +0, 192990, 192990, 1838, 3676, 0xf84a9939 +0, 194828, 194828, 1838, 3676, 0xc8aff71e +0, 196666, 196666, 1838, 3676, 0x76cc3afc +0, 198504, 198504, 1838, 3676, 0x524e1dd6 +0, 200342, 200342, 1838, 3676, 0x115a3f10 +0, 202180, 202180, 1838, 3676, 0xd2bb51d1 +0, 204018, 204018, 1838, 3676, 0xe1dbfca5 +0, 205856, 205856, 1838, 3676, 0xc428f070 +0, 207694, 207694, 1838, 3676, 0x6aa4dddf +0, 209532, 209532, 1838, 3676, 0xa0428f08 +0, 211370, 211370, 1838, 3676, 0x8fd7e256 +0, 213208, 213208, 1838, 3676, 0x41cb1787 +0, 215046, 215046, 1838, 3676, 0xe348568e +0, 216884, 216884, 1838, 3676, 0x79091a0c +0, 218722, 218722, 1838, 3676, 0x592f6f2e +0, 220560, 220560, 1838, 3676, 0xa151448f +0, 222398, 222398, 1838, 3676, 0xb3402e7a +0, 224236, 224236, 1838, 3676, 0x74112e27 +0, 226074, 226074, 1838, 3676, 0xba090659 +0, 227912, 227912, 1838, 3676, 0xa0451f81 +0, 229750, 229750, 1838, 3676, 0x09c7393a +0, 231588, 231588, 1838, 3676, 0xceb4e340 +0, 233426, 233426, 1838, 3676, 0x0440291a +0, 235264, 235264, 1838, 3676, 0xb7b930c4 +0, 237102, 237102, 1838, 3676, 0x1a2afa4a +0, 238940, 238940, 1838, 3676, 0x414fee56 +0, 240778, 240778, 1838, 3676, 0x5e26bc97 +0, 242616, 242616, 1838, 3676, 0x780e0481 +0, 244454, 244454, 1838, 3676, 0xb6dfb9c5 +0, 246292, 246292, 1838, 3676, 0x447b36ca +0, 248130, 248130, 1838, 3676, 0x601c3067 +0, 249968, 249968, 1838, 3676, 0x199f2f8d +0, 251806, 251806, 1838, 3676, 0x98645b08 diff --git a/tests/ref/fate/delphine-cin b/tests/ref/fate/delphine-cin-video similarity index 50% rename from tests/ref/fate/delphine-cin rename to tests/ref/fate/delphine-cin-video index 78034444d4..feaea26d44 100644 --- a/tests/ref/fate/delphine-cin +++ b/tests/ref/fate/delphine-cin-video @@ -1,7 +1,5 @@ #tb 0: 1/12 -#tb 1: 1/22050 0, 0, 0, 1, 153600, 0x00000000 -1, 0, 0, 88224, 176448, 0x541ddc55 0, 1, 1, 1, 153600, 0x9c77862c 0, 2, 2, 1, 153600, 0xd487c33c 0, 3, 3, 1, 153600, 0x5c00c01c @@ -50,136 +48,46 @@ 0, 46, 46, 1, 153600, 0xc0bc6080 0, 47, 47, 1, 153600, 0xb8d968ed 0, 48, 48, 1, 153600, 0x893e2348 -1, 88224, 88224, 1838, 3676, 0xaf455081 0, 49, 49, 1, 153600, 0x6cd01834 -1, 90062, 90062, 1838, 3676, 0x27ef4e91 0, 50, 50, 1, 153600, 0x9e6926c5 -1, 91900, 91900, 1838, 3676, 0xd1d986a3 0, 51, 51, 1, 153600, 0x4b57a4ea -1, 93738, 93738, 1838, 3676, 0xaaa2b589 0, 52, 52, 1, 153600, 0xaab2cfcd -1, 95576, 95576, 1838, 3676, 0x6e794ff9 0, 53, 53, 1, 153600, 0xffbb334d -1, 97414, 97414, 1838, 3676, 0x266351f1 0, 54, 54, 1, 153600, 0x4b37e5a9 -1, 99252, 99252, 1838, 3676, 0xdeae50b2 0, 55, 55, 1, 153600, 0x3486dee0 -1, 101090, 101090, 1838, 3676, 0x90f1f96a 0, 56, 56, 1, 153600, 0xa7185454 -1, 102928, 102928, 1838, 3676, 0xea07adf9 0, 57, 57, 1, 153600, 0xec29b8c2 -1, 104766, 104766, 1838, 3676, 0xb80a8925 0, 58, 58, 1, 153600, 0x01e562ba -1, 106604, 106604, 1838, 3676, 0xc392a1da 0, 59, 59, 1, 153600, 0xe695cda3 -1, 108442, 108442, 1838, 3676, 0xa076bdda 0, 60, 60, 1, 153600, 0xf6b59dac -1, 110280, 110280, 1838, 3676, 0x8f40b4cc 0, 61, 61, 1, 153600, 0xb308206b -1, 112118, 112118, 1838, 3676, 0x4227fe30 0, 62, 62, 1, 153600, 0xcc6ede4a -1, 113956, 113956, 1838, 3676, 0x82b31ec8 0, 63, 63, 1, 153600, 0xd9f8071c -1, 115794, 115794, 1838, 3676, 0x3ba04042 0, 64, 64, 1, 153600, 0xfb434821 -1, 117632, 117632, 1838, 3676, 0x6fe7440a 0, 65, 65, 1, 153600, 0x84c97077 -1, 119470, 119470, 1838, 3676, 0x23e33177 0, 66, 66, 1, 153600, 0x82dc5217 -1, 121308, 121308, 1838, 3676, 0x1f14242c 0, 67, 67, 1, 153600, 0xdbfd0ba8 -1, 123146, 123146, 1838, 3676, 0x72931fb0 0, 68, 68, 1, 153600, 0x3d71058e -1, 124984, 124984, 1838, 3676, 0x2b1351c2 0, 69, 69, 1, 153600, 0x3027b928 -1, 126822, 126822, 1838, 3676, 0x6aee7070 0, 70, 70, 1, 153600, 0x792ae3bd -1, 128660, 128660, 1838, 3676, 0x237658fa 0, 71, 71, 1, 153600, 0x36db00a7 -1, 130498, 130498, 1838, 3676, 0xac001143 0, 72, 72, 1, 153600, 0x4484e720 -1, 132336, 132336, 1838, 3676, 0x1921ee21 0, 73, 73, 1, 153600, 0xfaa76cdc -1, 134174, 134174, 1838, 3676, 0x80186091 0, 74, 74, 1, 153600, 0x9f1e4c7e -1, 136012, 136012, 1838, 3676, 0xb7f37ede 0, 75, 75, 1, 153600, 0x4b545d88 -1, 137850, 137850, 1838, 3676, 0x355227ef 0, 76, 76, 1, 153600, 0xa11cfd15 -1, 139688, 139688, 1838, 3676, 0xb0411f35 0, 77, 77, 1, 153600, 0x9f5d49c4 -1, 141526, 141526, 1838, 3676, 0xe7c4fe0e 0, 78, 78, 1, 153600, 0x7a496740 -1, 143364, 143364, 1838, 3676, 0x0425984d 0, 79, 79, 1, 153600, 0x98477803 -1, 145202, 145202, 1838, 3676, 0xfd59dea1 0, 80, 80, 1, 153600, 0xa5fc20f8 -1, 147040, 147040, 1838, 3676, 0xa53d5aab 0, 81, 81, 1, 153600, 0x344ff96e -1, 148878, 148878, 1838, 3676, 0x8bc403c2 0, 82, 82, 1, 153600, 0x20c91746 -1, 150716, 150716, 1838, 3676, 0x7dd638c2 0, 83, 83, 1, 153600, 0x7c59b379 -1, 152554, 152554, 1838, 3676, 0x284913eb 0, 84, 84, 1, 153600, 0x38e3b86d -1, 154392, 154392, 1838, 3676, 0xec17e83c 0, 85, 85, 1, 153600, 0xff25a440 -1, 156230, 156230, 1838, 3676, 0x40543463 0, 86, 86, 1, 153600, 0xa1f66533 -1, 158068, 158068, 1838, 3676, 0x92d81bf8 0, 87, 87, 1, 153600, 0xe136260a -1, 159906, 159906, 1838, 3676, 0x44ef161d 0, 88, 88, 1, 153600, 0x048ccf56 -1, 161744, 161744, 1838, 3676, 0x499df3d5 0, 89, 89, 1, 153600, 0x65f68a24 -1, 163582, 163582, 1838, 3676, 0xf98f4d75 0, 90, 90, 1, 153600, 0xf32b385a -1, 165420, 165420, 1838, 3676, 0x8ffe2681 0, 91, 91, 1, 153600, 0x3e930a8f -1, 167258, 167258, 1838, 3676, 0x84093bfd -1, 169096, 169096, 1838, 3676, 0x5f9c2e32 -1, 170934, 170934, 1838, 3676, 0x8f93c29b -1, 172772, 172772, 1838, 3676, 0xf0ada687 -1, 174610, 174610, 1838, 3676, 0x30019db2 -1, 176448, 176448, 1838, 3676, 0x06ebace3 -1, 178286, 178286, 1838, 3676, 0xc293d944 -1, 180124, 180124, 1838, 3676, 0x789ff65e -1, 181962, 181962, 1838, 3676, 0xa2ae13c1 -1, 183800, 183800, 1838, 3676, 0xb64f1cd9 -1, 185638, 185638, 1838, 3676, 0x18f4e36a -1, 187476, 187476, 1838, 3676, 0xe9ccd0f0 -1, 189314, 189314, 1838, 3676, 0xc215b4ab -1, 191152, 191152, 1838, 3676, 0x45b5c410 -1, 192990, 192990, 1838, 3676, 0xf84a9939 -1, 194828, 194828, 1838, 3676, 0xc8aff71e -1, 196666, 196666, 1838, 3676, 0x76cc3afc -1, 198504, 198504, 1838, 3676, 0x524e1dd6 -1, 200342, 200342, 1838, 3676, 0x115a3f10 -1, 202180, 202180, 1838, 3676, 0xd2bb51d1 -1, 204018, 204018, 1838, 3676, 0xe1dbfca5 -1, 205856, 205856, 1838, 3676, 0xc428f070 -1, 207694, 207694, 1838, 3676, 0x6aa4dddf -1, 209532, 209532, 1838, 3676, 0xa0428f08 -1, 211370, 211370, 1838, 3676, 0x8fd7e256 -1, 213208, 213208, 1838, 3676, 0x41cb1787 -1, 215046, 215046, 1838, 3676, 0xe348568e -1, 216884, 216884, 1838, 3676, 0x79091a0c -1, 218722, 218722, 1838, 3676, 0x592f6f2e -1, 220560, 220560, 1838, 3676, 0xa151448f -1, 222398, 222398, 1838, 3676, 0xb3402e7a -1, 224236, 224236, 1838, 3676, 0x74112e27 -1, 226074, 226074, 1838, 3676, 0xba090659 -1, 227912, 227912, 1838, 3676, 0xa0451f81 -1, 229750, 229750, 1838, 3676, 0x09c7393a -1, 231588, 231588, 1838, 3676, 0xceb4e340 -1, 233426, 233426, 1838, 3676, 0x0440291a -1, 235264, 235264, 1838, 3676, 0xb7b930c4 -1, 237102, 237102, 1838, 3676, 0x1a2afa4a -1, 238940, 238940, 1838, 3676, 0x414fee56 -1, 240778, 240778, 1838, 3676, 0x5e26bc97 -1, 242616, 242616, 1838, 3676, 0x780e0481 -1, 244454, 244454, 1838, 3676, 0xb6dfb9c5 -1, 246292, 246292, 1838, 3676, 0x447b36ca -1, 248130, 248130, 1838, 3676, 0x601c3067 -1, 249968, 249968, 1838, 3676, 0x199f2f8d -1, 251806, 251806, 1838, 3676, 0x98645b08 From 35d88a86e342ed388b09636739efcb7f780d22d5 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 14:58:31 +0100 Subject: [PATCH 07/25] fate: separate bmv audio and video tests Signed-off-by: Mans Rullgard --- tests/fate/audio.mak | 3 +++ tests/fate/demux.mak | 3 --- tests/fate/video.mak | 3 +++ tests/ref/fate/bmv | 44 ---------------------------------------- tests/ref/fate/bmv-audio | 22 ++++++++++++++++++++ tests/ref/fate/bmv-video | 22 ++++++++++++++++++++ 6 files changed, 50 insertions(+), 47 deletions(-) delete mode 100644 tests/ref/fate/bmv create mode 100644 tests/ref/fate/bmv-audio create mode 100644 tests/ref/fate/bmv-video diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 804b6fdcd4..7533f20058 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -13,6 +13,9 @@ fate-binkaudio-rdft: FUZZ = 2 FATE_AVCONV += $(FATE_BINKAUDIO) fate-binkaudio: $(FATE_BINKAUDIO) +FATE_AVCONV += fate-bmv-audio +fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn + FATE_AVCONV += fate-delphine-cin-audio fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index c67b2c4f8f..eb706de94c 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -7,9 +7,6 @@ fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy FATE_AVCONV += fate-bink-demux fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy -FATE_AVCONV += fate-bmv -fate-bmv: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 - FATE_AVCONV += fate-caf fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf diff --git a/tests/fate/video.mak b/tests/fate/video.mak index c2b25648c1..0d1ffab48c 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -37,6 +37,9 @@ fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 FATE_AVCONV += fate-bink-video fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik +FATE_AVCONV += fate-bmv-video +fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an + FATE_AVCONV += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1 diff --git a/tests/ref/fate/bmv b/tests/ref/fate/bmv deleted file mode 100644 index 2ea4862ea3..0000000000 --- a/tests/ref/fate/bmv +++ /dev/null @@ -1,44 +0,0 @@ -#tb 0: 1/12 -#tb 1: 1/22050 -0, 0, 0, 1, 823680, 0xddb8a306 -1, 0, 0, 1856, 7424, 0x18540b36 -0, 1, 1, 1, 823680, 0xa95375c8 -1, 1856, 1856, 1824, 7296, 0x5acd2484 -0, 2, 2, 1, 823680, 0xa95375c8 -1, 3680, 3680, 1856, 7424, 0xa1bc5c5a -0, 3, 3, 1, 823680, 0xb6f78afe -1, 5536, 5536, 1824, 7296, 0x71a02ad1 -0, 4, 4, 1, 823680, 0xb6f78afe -1, 7360, 7360, 1856, 7424, 0x09cc32f2 -0, 5, 5, 1, 823680, 0x45b9c8f0 -1, 9216, 9216, 1824, 7296, 0xa3451726 -0, 6, 6, 1, 823680, 0x45b9c8f0 -1, 11040, 11040, 1824, 7296, 0x1eb40a18 -0, 7, 7, 1, 823680, 0x7653d8e9 -1, 12864, 12864, 1856, 7424, 0xc55a2acf -0, 8, 8, 1, 823680, 0x7653d8e9 -1, 14720, 14720, 1824, 7296, 0x5b9fad3f -0, 9, 9, 1, 823680, 0xf1e2fd73 -1, 16544, 16544, 1856, 7424, 0xea651ae7 -0, 10, 10, 1, 823680, 0xf1e2fd73 -1, 18400, 18400, 1824, 7296, 0x2bd5ddb6 -0, 11, 11, 1, 823680, 0x6d2deab3 -1, 20224, 20224, 1856, 7424, 0xde4243b4 -0, 12, 12, 1, 823680, 0x6d2deab3 -1, 22080, 22080, 1824, 7296, 0x358806d3 -0, 13, 13, 1, 823680, 0x37fd33ce -1, 23904, 23904, 1824, 7296, 0x511a144e -0, 14, 14, 1, 823680, 0x37fd33ce -1, 25728, 25728, 1856, 7424, 0x887a3e84 -0, 15, 15, 1, 823680, 0x0a8e0ab9 -1, 27584, 27584, 1824, 7296, 0xfeae2a0c -0, 16, 16, 1, 823680, 0x0a8e0ab9 -1, 29408, 29408, 1856, 7424, 0xa4ea5d22 -0, 17, 17, 1, 823680, 0x991bb2b0 -1, 31264, 31264, 1824, 7296, 0xb3adf7fa -0, 18, 18, 1, 823680, 0x991bb2b0 -1, 33088, 33088, 1856, 7424, 0xce995dcc -0, 19, 19, 1, 823680, 0xb8397c8c -1, 34944, 34944, 1824, 7296, 0x5b4cf574 -0, 20, 20, 1, 823680, 0xb8397c8c -1, 36768, 36768, 1824, 7296, 0x8a70eaf0 diff --git a/tests/ref/fate/bmv-audio b/tests/ref/fate/bmv-audio new file mode 100644 index 0000000000..746bb0cd7a --- /dev/null +++ b/tests/ref/fate/bmv-audio @@ -0,0 +1,22 @@ +#tb 0: 1/22050 +0, 0, 0, 1856, 7424, 0x18540b36 +0, 1856, 1856, 1824, 7296, 0x5acd2484 +0, 3680, 3680, 1856, 7424, 0xa1bc5c5a +0, 5536, 5536, 1824, 7296, 0x71a02ad1 +0, 7360, 7360, 1856, 7424, 0x09cc32f2 +0, 9216, 9216, 1824, 7296, 0xa3451726 +0, 11040, 11040, 1824, 7296, 0x1eb40a18 +0, 12864, 12864, 1856, 7424, 0xc55a2acf +0, 14720, 14720, 1824, 7296, 0x5b9fad3f +0, 16544, 16544, 1856, 7424, 0xea651ae7 +0, 18400, 18400, 1824, 7296, 0x2bd5ddb6 +0, 20224, 20224, 1856, 7424, 0xde4243b4 +0, 22080, 22080, 1824, 7296, 0x358806d3 +0, 23904, 23904, 1824, 7296, 0x511a144e +0, 25728, 25728, 1856, 7424, 0x887a3e84 +0, 27584, 27584, 1824, 7296, 0xfeae2a0c +0, 29408, 29408, 1856, 7424, 0xa4ea5d22 +0, 31264, 31264, 1824, 7296, 0xb3adf7fa +0, 33088, 33088, 1856, 7424, 0xce995dcc +0, 34944, 34944, 1824, 7296, 0x5b4cf574 +0, 36768, 36768, 1824, 7296, 0x8a70eaf0 diff --git a/tests/ref/fate/bmv-video b/tests/ref/fate/bmv-video new file mode 100644 index 0000000000..f19cd45edc --- /dev/null +++ b/tests/ref/fate/bmv-video @@ -0,0 +1,22 @@ +#tb 0: 1/12 +0, 0, 0, 1, 823680, 0xddb8a306 +0, 1, 1, 1, 823680, 0xa95375c8 +0, 2, 2, 1, 823680, 0xa95375c8 +0, 3, 3, 1, 823680, 0xb6f78afe +0, 4, 4, 1, 823680, 0xb6f78afe +0, 5, 5, 1, 823680, 0x45b9c8f0 +0, 6, 6, 1, 823680, 0x45b9c8f0 +0, 7, 7, 1, 823680, 0x7653d8e9 +0, 8, 8, 1, 823680, 0x7653d8e9 +0, 9, 9, 1, 823680, 0xf1e2fd73 +0, 10, 10, 1, 823680, 0xf1e2fd73 +0, 11, 11, 1, 823680, 0x6d2deab3 +0, 12, 12, 1, 823680, 0x6d2deab3 +0, 13, 13, 1, 823680, 0x37fd33ce +0, 14, 14, 1, 823680, 0x37fd33ce +0, 15, 15, 1, 823680, 0x0a8e0ab9 +0, 16, 16, 1, 823680, 0x0a8e0ab9 +0, 17, 17, 1, 823680, 0x991bb2b0 +0, 18, 18, 1, 823680, 0x991bb2b0 +0, 19, 19, 1, 823680, 0xb8397c8c +0, 20, 20, 1, 823680, 0xb8397c8c From cb0713fca23ae681d2b2547d82a79670e340b13e Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 13:33:35 +0100 Subject: [PATCH 08/25] fate: split off adpcm-ima-amv from amv test Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 3 + tests/fate/video.mak | 2 +- tests/ref/fate/adpcm-ima-amv | 161 +++++++++++++++++++++++++++++++++++ tests/ref/fate/amv | 161 ----------------------------------- 4 files changed, 165 insertions(+), 162 deletions(-) create mode 100644 tests/ref/fate/adpcm-ima-amv diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 16fe69efc6..3f84c9e8c2 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -28,6 +28,9 @@ fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames FATE_ADPCM += fate-adpcm-ea-r1 fate-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -vn +FATE_ADPCM += fate-adpcm-ima-amv +fate-adpcm-ima-amv: CMD = framecrc -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn + FATE_ADPCM += fate-adpcm-ima-dk3 fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 0d1ffab48c..f238601a07 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -14,7 +14,7 @@ FATE_AVCONV += fate-alg-mm fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 FATE_AVCONV += fate-amv -fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 +fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an FATE_AVCONV += fate-ansi fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv new file mode 100644 index 0000000000..977c125080 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-amv @@ -0,0 +1,161 @@ +#tb 0: 1/22050 +0, 0, 0, 1378, 2756, 0x0af35034 +0, 1378, 1378, 1378, 2756, 0x8462443f +0, 2756, 2756, 1378, 2756, 0x9f493ba6 +0, 4134, 4134, 1378, 2756, 0x634e5f06 +0, 5512, 5512, 1380, 2760, 0x51f35cd4 +0, 6891, 6891, 1378, 2756, 0x011c51e5 +0, 8269, 8269, 1378, 2756, 0x8c2c198c +0, 9647, 9647, 1378, 2756, 0x2b4a3397 +0, 11025, 11025, 1378, 2756, 0x63794f22 +0, 12403, 12403, 1378, 2756, 0xfc363898 +0, 13781, 13781, 1378, 2756, 0x0da5486e +0, 15159, 15159, 1378, 2756, 0xbae17a5f +0, 16538, 16538, 1380, 2760, 0xba266e1b +0, 17916, 17916, 1378, 2756, 0xdfb61002 +0, 19294, 19294, 1378, 2756, 0x15d029da +0, 20672, 20672, 1378, 2756, 0x7bc82012 +0, 22050, 22050, 1378, 2756, 0x002e6999 +0, 23428, 23428, 1378, 2756, 0x96346ba6 +0, 24806, 24806, 1378, 2756, 0x3d54543b +0, 26184, 26184, 1380, 2760, 0x601786e1 +0, 27562, 27562, 1378, 2756, 0xf22a5793 +0, 28941, 28941, 1378, 2756, 0x21f54d49 +0, 30319, 30319, 1378, 2756, 0x0c6d4399 +0, 31697, 31697, 1378, 2756, 0x17282f8e +0, 33075, 33075, 1378, 2756, 0xeb698f75 +0, 34453, 34453, 1378, 2756, 0x935e1de2 +0, 35831, 35831, 1380, 2760, 0xb6fb4293 +0, 37209, 37209, 1378, 2756, 0x485053dc +0, 38588, 38588, 1378, 2756, 0x24c35027 +0, 39966, 39966, 1378, 2756, 0x09f323ee +0, 41344, 41344, 1378, 2756, 0xbc7d58d5 +0, 42722, 42722, 1378, 2756, 0xaefd487c +0, 44100, 44100, 1378, 2756, 0xaca16cc0 +0, 45478, 45478, 1380, 2760, 0x98a76091 +0, 46856, 46856, 1378, 2756, 0x5d357141 +0, 48234, 48234, 1378, 2756, 0x65ea2657 +0, 49612, 49612, 1378, 2756, 0xb5e1334a +0, 50991, 50991, 1378, 2756, 0x32cd5d91 +0, 52369, 52369, 1378, 2756, 0xdc23722b +0, 53747, 53747, 1378, 2756, 0x2ba34684 +0, 55125, 55125, 1378, 2756, 0xf9755ba8 +0, 56503, 56503, 1380, 2760, 0x24221ddb +0, 57881, 57881, 1378, 2756, 0xef843aa4 +0, 59259, 59259, 1378, 2756, 0x420442fe +0, 60638, 60638, 1378, 2756, 0x5a0933cb +0, 62016, 62016, 1378, 2756, 0xef5f6d61 +0, 63394, 63394, 1378, 2756, 0xe57e6dc0 +0, 64772, 64772, 1378, 2756, 0xc0f0495a +0, 66150, 66150, 1380, 2760, 0x2c3b55df +0, 67528, 67528, 1378, 2756, 0x39c2586c +0, 68906, 68906, 1378, 2756, 0x7ffc46e5 +0, 70284, 70284, 1378, 2756, 0xa2766664 +0, 71662, 71662, 1378, 2756, 0xacb50c6c +0, 73041, 73041, 1378, 2756, 0x7f659084 +0, 74419, 74419, 1378, 2756, 0xc72e6a12 +0, 75797, 75797, 1380, 2760, 0xdb6944df +0, 77175, 77175, 1378, 2756, 0x954f45c1 +0, 78553, 78553, 1378, 2756, 0xa9484240 +0, 79931, 79931, 1378, 2756, 0x1d595349 +0, 81309, 81309, 1378, 2756, 0xcf2a565e +0, 82688, 82688, 1378, 2756, 0x391028d5 +0, 84066, 84066, 1378, 2756, 0x348db7ad +0, 85444, 85444, 1380, 2760, 0xb69b5e3a +0, 86822, 86822, 1378, 2756, 0xe3635fbe +0, 88200, 88200, 1378, 2756, 0xdcad3654 +0, 89578, 89578, 1378, 2756, 0x5c17abef +0, 90956, 90956, 1378, 2756, 0xb3235184 +0, 92334, 92334, 1378, 2756, 0xdabb64a6 +0, 93712, 93712, 1378, 2756, 0xa95dc58d +0, 95091, 95091, 1380, 2760, 0x8e7ac9eb +0, 96469, 96469, 1378, 2756, 0x492b658e +0, 97847, 97847, 1378, 2756, 0x377483ab +0, 99225, 99225, 1378, 2756, 0x2c250279 +0, 100603, 100603, 1378, 2756, 0x704dbdb3 +0, 101981, 101981, 1378, 2756, 0x800d7da2 +0, 103359, 103359, 1378, 2756, 0x872aa32e +0, 104738, 104738, 1378, 2756, 0x2d4837fe +0, 106116, 106116, 1380, 2760, 0xc89ea57e +0, 107494, 107494, 1378, 2756, 0x6447d7ef +0, 108872, 108872, 1378, 2756, 0x144f59cc +0, 110250, 110250, 1378, 2756, 0xc667154e +0, 111628, 111628, 1378, 2756, 0xf0de66ae +0, 113006, 113006, 1378, 2756, 0xeabf3c32 +0, 114384, 114384, 1378, 2756, 0xe98e81d1 +0, 115762, 115762, 1380, 2760, 0x56aa5889 +0, 117141, 117141, 1378, 2756, 0x4fd34c0e +0, 118519, 118519, 1378, 2756, 0x67cf6912 +0, 119897, 119897, 1378, 2756, 0xfa944def +0, 121275, 121275, 1378, 2756, 0xc12f23b2 +0, 122653, 122653, 1378, 2756, 0x5ea325a2 +0, 124031, 124031, 1378, 2756, 0x2b245824 +0, 125409, 125409, 1380, 2760, 0x90ac533e +0, 126788, 126788, 1378, 2756, 0xcca34d26 +0, 128166, 128166, 1378, 2756, 0xb5f820d0 +0, 129544, 129544, 1378, 2756, 0x27f24335 +0, 130922, 130922, 1378, 2756, 0x4a9e87b7 +0, 132300, 132300, 1378, 2756, 0xbd076129 +0, 133678, 133678, 1378, 2756, 0x2e0e3f2e +0, 135056, 135056, 1380, 2760, 0xdf534478 +0, 136434, 136434, 1378, 2756, 0xca000a2e +0, 137812, 137812, 1378, 2756, 0x87472df3 +0, 139191, 139191, 1378, 2756, 0x16733810 +0, 140569, 140569, 1378, 2756, 0xfa0734b4 +0, 141947, 141947, 1378, 2756, 0x5eff3fc4 +0, 143325, 143325, 1378, 2756, 0xf35346bd +0, 144703, 144703, 1378, 2756, 0xac6411c5 +0, 146081, 146081, 1380, 2760, 0x478c3c56 +0, 147459, 147459, 1378, 2756, 0xebd30bdd +0, 148838, 148838, 1378, 2756, 0xaef95a31 +0, 150216, 150216, 1378, 2756, 0x8aad29d1 +0, 151594, 151594, 1378, 2756, 0x626863f0 +0, 152972, 152972, 1378, 2756, 0x68c05707 +0, 154350, 154350, 1378, 2756, 0x437c5e8d +0, 155728, 155728, 1380, 2760, 0x8eca4bdb +0, 157106, 157106, 1378, 2756, 0x62bd4162 +0, 158484, 158484, 1378, 2756, 0x9f744aa4 +0, 159862, 159862, 1378, 2756, 0x0f3f6409 +0, 161241, 161241, 1378, 2756, 0x3fee827a +0, 162619, 162619, 1378, 2756, 0x48a0ac19 +0, 163997, 163997, 1378, 2756, 0x8e4ce0d0 +0, 165375, 165375, 1380, 2760, 0xcda82236 +0, 166753, 166753, 1378, 2756, 0x0e523255 +0, 168131, 168131, 1378, 2756, 0x84103d30 +0, 169509, 169509, 1378, 2756, 0x13941cde +0, 170888, 170888, 1378, 2756, 0x9fc834c5 +0, 172266, 172266, 1378, 2756, 0xc0217a77 +0, 173644, 173644, 1378, 2756, 0x3f643659 +0, 175022, 175022, 1380, 2760, 0x9dbd6002 +0, 176400, 176400, 1378, 2756, 0x94f046fb +0, 177778, 177778, 1378, 2756, 0xab01fb12 +0, 179156, 179156, 1378, 2756, 0x04cffe5c +0, 180534, 180534, 1378, 2756, 0xef661c5e +0, 181912, 181912, 1378, 2756, 0x094c5fc5 +0, 183291, 183291, 1378, 2756, 0xe0c1486a +0, 184669, 184669, 1380, 2760, 0x8c3535b7 +0, 186047, 186047, 1378, 2756, 0x594934aa +0, 187425, 187425, 1378, 2756, 0x74007238 +0, 188803, 188803, 1378, 2756, 0x61f1394d +0, 190181, 190181, 1378, 2756, 0x72584f07 +0, 191559, 191559, 1378, 2756, 0xced9acf9 +0, 192938, 192938, 1378, 2756, 0x7d2e3ea1 +0, 194316, 194316, 1378, 2756, 0x56c06897 +0, 195694, 195694, 1380, 2760, 0x19983bbf +0, 197072, 197072, 1378, 2756, 0x4f884f27 +0, 198450, 198450, 1378, 2756, 0x81ab2f63 +0, 199828, 199828, 1378, 2756, 0x448e681d +0, 201206, 201206, 1378, 2756, 0x0ba9826e +0, 202584, 202584, 1378, 2756, 0x049f36fa +0, 203962, 203962, 1378, 2756, 0x096a2b62 +0, 205341, 205341, 1380, 2760, 0x579e2035 +0, 206719, 206719, 1378, 2756, 0xd13e30e1 +0, 208097, 208097, 1378, 2756, 0x30b6412b +0, 209475, 209475, 1378, 2756, 0xbb1c3268 +0, 210853, 210853, 1378, 2756, 0xbc175b6a +0, 212231, 212231, 1378, 2756, 0xf8d160e2 +0, 213609, 213609, 1378, 2756, 0xc1048154 +0, 214988, 214988, 1380, 2760, 0xb83548f4 +0, 216366, 216366, 1378, 2756, 0x22647962 +0, 217744, 217744, 1378, 2756, 0x14ca54d3 +0, 219122, 219122, 1378, 2756, 0x58754b3a diff --git a/tests/ref/fate/amv b/tests/ref/fate/amv index 768ddaf330..407f077c7e 100644 --- a/tests/ref/fate/amv +++ b/tests/ref/fate/amv @@ -1,322 +1,161 @@ #tb 0: 1/16 -#tb 1: 1/22050 0, 0, 0, 1, 28800, 0x026058a9 -1, 0, 0, 1378, 2756, 0x0af35034 -1, 1378, 1378, 1378, 2756, 0x8462443f 0, 1, 1, 1, 28800, 0x5dc728de -1, 2756, 2756, 1378, 2756, 0x9f493ba6 0, 2, 2, 1, 28800, 0x83e19a2c -1, 4134, 4134, 1378, 2756, 0x634e5f06 0, 3, 3, 1, 28800, 0xb029f94a -1, 5512, 5512, 1380, 2760, 0x51f35cd4 0, 4, 4, 1, 28800, 0x735a6b15 0, 5, 5, 1, 28800, 0xf7e9dc8b -1, 6891, 6891, 1378, 2756, 0x011c51e5 0, 6, 6, 1, 28800, 0xa108b0cf -1, 8269, 8269, 1378, 2756, 0x8c2c198c 0, 7, 7, 1, 28800, 0x3d11c138 -1, 9647, 9647, 1378, 2756, 0x2b4a3397 0, 8, 8, 1, 28800, 0xed23afda -1, 11025, 11025, 1378, 2756, 0x63794f22 -1, 12403, 12403, 1378, 2756, 0xfc363898 0, 9, 9, 1, 28800, 0x713bb2dc -1, 13781, 13781, 1378, 2756, 0x0da5486e 0, 10, 10, 1, 28800, 0x551ad51e -1, 15159, 15159, 1378, 2756, 0xbae17a5f 0, 11, 11, 1, 28800, 0x49dfcf2d 0, 12, 12, 1, 28800, 0x6399d5b3 -1, 16538, 16538, 1380, 2760, 0xba266e1b 0, 13, 13, 1, 28800, 0x520ad812 -1, 17916, 17916, 1378, 2756, 0xdfb61002 0, 14, 14, 1, 28800, 0xc46ad9da -1, 19294, 19294, 1378, 2756, 0x15d029da 0, 15, 15, 1, 28800, 0xe79edb9e -1, 20672, 20672, 1378, 2756, 0x7bc82012 0, 16, 16, 1, 28800, 0xdb1acb30 -1, 22050, 22050, 1378, 2756, 0x002e6999 -1, 23428, 23428, 1378, 2756, 0x96346ba6 0, 17, 17, 1, 28800, 0x050fb669 -1, 24806, 24806, 1378, 2756, 0x3d54543b 0, 18, 18, 1, 28800, 0x096ca687 -1, 26184, 26184, 1380, 2760, 0x601786e1 0, 19, 19, 1, 28800, 0x0054a6bd -1, 27562, 27562, 1378, 2756, 0xf22a5793 0, 20, 20, 1, 28800, 0x6d7daad2 0, 21, 21, 1, 28800, 0x9c10a9dc -1, 28941, 28941, 1378, 2756, 0x21f54d49 0, 22, 22, 1, 28800, 0x89b1a623 -1, 30319, 30319, 1378, 2756, 0x0c6d4399 0, 23, 23, 1, 28800, 0xa0a19c3f -1, 31697, 31697, 1378, 2756, 0x17282f8e 0, 24, 24, 1, 28800, 0x26c898ad -1, 33075, 33075, 1378, 2756, 0xeb698f75 -1, 34453, 34453, 1378, 2756, 0x935e1de2 0, 25, 25, 1, 28800, 0x6f639dae -1, 35831, 35831, 1380, 2760, 0xb6fb4293 0, 26, 26, 1, 28800, 0xa173a9b5 -1, 37209, 37209, 1378, 2756, 0x485053dc 0, 27, 27, 1, 28800, 0xa309aa08 0, 28, 28, 1, 28800, 0x2059b6c4 -1, 38588, 38588, 1378, 2756, 0x24c35027 0, 29, 29, 1, 28800, 0x5ae8c761 -1, 39966, 39966, 1378, 2756, 0x09f323ee 0, 30, 30, 1, 28800, 0xb780c9c5 -1, 41344, 41344, 1378, 2756, 0xbc7d58d5 0, 31, 31, 1, 28800, 0xf58ac8fe -1, 42722, 42722, 1378, 2756, 0xaefd487c 0, 32, 32, 1, 28800, 0x9bb307e7 -1, 44100, 44100, 1378, 2756, 0xaca16cc0 -1, 45478, 45478, 1380, 2760, 0x98a76091 0, 33, 33, 1, 28800, 0xd32c3e81 -1, 46856, 46856, 1378, 2756, 0x5d357141 0, 34, 34, 1, 28800, 0x4edd51d2 -1, 48234, 48234, 1378, 2756, 0x65ea2657 0, 35, 35, 1, 28800, 0x5a88684d -1, 49612, 49612, 1378, 2756, 0xb5e1334a 0, 36, 36, 1, 28800, 0x5bd97f0e 0, 37, 37, 1, 28800, 0x36d67843 -1, 50991, 50991, 1378, 2756, 0x32cd5d91 0, 38, 38, 1, 28800, 0x0e18781d -1, 52369, 52369, 1378, 2756, 0xdc23722b 0, 39, 39, 1, 28800, 0xa3168807 -1, 53747, 53747, 1378, 2756, 0x2ba34684 0, 40, 40, 1, 28800, 0xa7c575b8 -1, 55125, 55125, 1378, 2756, 0xf9755ba8 -1, 56503, 56503, 1380, 2760, 0x24221ddb 0, 41, 41, 1, 28800, 0x86367c37 -1, 57881, 57881, 1378, 2756, 0xef843aa4 0, 42, 42, 1, 28800, 0xb0f79180 -1, 59259, 59259, 1378, 2756, 0x420442fe 0, 43, 43, 1, 28800, 0x61da8c0f 0, 44, 44, 1, 28800, 0x9b11948a -1, 60638, 60638, 1378, 2756, 0x5a0933cb 0, 45, 45, 1, 28800, 0xc53d9b44 -1, 62016, 62016, 1378, 2756, 0xef5f6d61 0, 46, 46, 1, 28800, 0xdc699185 -1, 63394, 63394, 1378, 2756, 0xe57e6dc0 0, 47, 47, 1, 28800, 0x7b4f92b5 -1, 64772, 64772, 1378, 2756, 0xc0f0495a 0, 48, 48, 1, 28800, 0x40469065 -1, 66150, 66150, 1380, 2760, 0x2c3b55df -1, 67528, 67528, 1378, 2756, 0x39c2586c 0, 49, 49, 1, 28800, 0x737ea07e -1, 68906, 68906, 1378, 2756, 0x7ffc46e5 0, 50, 50, 1, 28800, 0x0db49c8b -1, 70284, 70284, 1378, 2756, 0xa2766664 0, 51, 51, 1, 28800, 0x39249f10 -1, 71662, 71662, 1378, 2756, 0xacb50c6c 0, 52, 52, 1, 28800, 0xc182ab99 0, 53, 53, 1, 28800, 0xd8f7a7c9 -1, 73041, 73041, 1378, 2756, 0x7f659084 0, 54, 54, 1, 28800, 0x46789caa -1, 74419, 74419, 1378, 2756, 0xc72e6a12 0, 55, 55, 1, 28800, 0x4759a374 -1, 75797, 75797, 1380, 2760, 0xdb6944df 0, 56, 56, 1, 28800, 0xe621b16a -1, 77175, 77175, 1378, 2756, 0x954f45c1 -1, 78553, 78553, 1378, 2756, 0xa9484240 0, 57, 57, 1, 28800, 0xcf47a999 -1, 79931, 79931, 1378, 2756, 0x1d595349 0, 58, 58, 1, 28800, 0x801dacd4 -1, 81309, 81309, 1378, 2756, 0xcf2a565e 0, 59, 59, 1, 28800, 0xe580af51 0, 60, 60, 1, 28800, 0x03d7a887 -1, 82688, 82688, 1378, 2756, 0x391028d5 0, 61, 61, 1, 28800, 0xa67ea51d -1, 84066, 84066, 1378, 2756, 0x348db7ad 0, 62, 62, 1, 28800, 0x9fee0ec8 -1, 85444, 85444, 1380, 2760, 0xb69b5e3a 0, 63, 63, 1, 28800, 0x7f602a5e -1, 86822, 86822, 1378, 2756, 0xe3635fbe 0, 64, 64, 1, 28800, 0x100d432a -1, 88200, 88200, 1378, 2756, 0xdcad3654 -1, 89578, 89578, 1378, 2756, 0x5c17abef 0, 65, 65, 1, 28800, 0x42164dfb -1, 90956, 90956, 1378, 2756, 0xb3235184 0, 66, 66, 1, 28800, 0x86c05196 -1, 92334, 92334, 1378, 2756, 0xdabb64a6 0, 67, 67, 1, 28800, 0xfc225938 -1, 93712, 93712, 1378, 2756, 0xa95dc58d 0, 68, 68, 1, 28800, 0x81085e87 0, 69, 69, 1, 28800, 0xaa8f5d0a -1, 95091, 95091, 1380, 2760, 0x8e7ac9eb 0, 70, 70, 1, 28800, 0x605a5f9f -1, 96469, 96469, 1378, 2756, 0x492b658e 0, 71, 71, 1, 28800, 0x68dc64b2 -1, 97847, 97847, 1378, 2756, 0x377483ab 0, 72, 72, 1, 28800, 0xd08e710b -1, 99225, 99225, 1378, 2756, 0x2c250279 -1, 100603, 100603, 1378, 2756, 0x704dbdb3 0, 73, 73, 1, 28800, 0xf8567939 -1, 101981, 101981, 1378, 2756, 0x800d7da2 0, 74, 74, 1, 28800, 0x8dad7a4f -1, 103359, 103359, 1378, 2756, 0x872aa32e 0, 75, 75, 1, 28800, 0x1a19813c 0, 76, 76, 1, 28800, 0x8a157f0e -1, 104738, 104738, 1378, 2756, 0x2d4837fe 0, 77, 77, 1, 28800, 0xa4fa7b9d -1, 106116, 106116, 1380, 2760, 0xc89ea57e 0, 78, 78, 1, 28800, 0x093b7b36 -1, 107494, 107494, 1378, 2756, 0x6447d7ef 0, 79, 79, 1, 28800, 0xa925755b -1, 108872, 108872, 1378, 2756, 0x144f59cc 0, 80, 80, 1, 28800, 0xa5968138 -1, 110250, 110250, 1378, 2756, 0xc667154e -1, 111628, 111628, 1378, 2756, 0xf0de66ae 0, 81, 81, 1, 28800, 0xe00877ac -1, 113006, 113006, 1378, 2756, 0xeabf3c32 0, 82, 82, 1, 28800, 0xd736183e -1, 114384, 114384, 1378, 2756, 0xe98e81d1 0, 83, 83, 1, 28800, 0x356f2068 -1, 115762, 115762, 1380, 2760, 0x56aa5889 0, 84, 84, 1, 28800, 0xf9a50f22 0, 85, 85, 1, 28800, 0x92df2ae8 -1, 117141, 117141, 1378, 2756, 0x4fd34c0e 0, 86, 86, 1, 28800, 0x67a43dc8 -1, 118519, 118519, 1378, 2756, 0x67cf6912 0, 87, 87, 1, 28800, 0xf8ce2ead -1, 119897, 119897, 1378, 2756, 0xfa944def 0, 88, 88, 1, 28800, 0xf42f37ee -1, 121275, 121275, 1378, 2756, 0xc12f23b2 -1, 122653, 122653, 1378, 2756, 0x5ea325a2 0, 89, 89, 1, 28800, 0x03611f37 -1, 124031, 124031, 1378, 2756, 0x2b245824 0, 90, 90, 1, 28800, 0xddda2327 -1, 125409, 125409, 1380, 2760, 0x90ac533e 0, 91, 91, 1, 28800, 0xdf073d85 0, 92, 92, 1, 28800, 0xa8331fee -1, 126788, 126788, 1378, 2756, 0xcca34d26 0, 93, 93, 1, 28800, 0x59d3490a -1, 128166, 128166, 1378, 2756, 0xb5f820d0 0, 94, 94, 1, 28800, 0xa8335be6 -1, 129544, 129544, 1378, 2756, 0x27f24335 0, 95, 95, 1, 28800, 0xd5483b43 -1, 130922, 130922, 1378, 2756, 0x4a9e87b7 0, 96, 96, 1, 28800, 0x23422dc9 -1, 132300, 132300, 1378, 2756, 0xbd076129 -1, 133678, 133678, 1378, 2756, 0x2e0e3f2e 0, 97, 97, 1, 28800, 0xc04e4689 -1, 135056, 135056, 1380, 2760, 0xdf534478 0, 98, 98, 1, 28800, 0xd4d96372 -1, 136434, 136434, 1378, 2756, 0xca000a2e 0, 99, 99, 1, 28800, 0x9c814e96 -1, 137812, 137812, 1378, 2756, 0x87472df3 0, 100, 100, 1, 28800, 0x7c4b5d3b 0, 101, 101, 1, 28800, 0x6bf66c04 -1, 139191, 139191, 1378, 2756, 0x16733810 0, 102, 102, 1, 28800, 0x6e8d4bb6 -1, 140569, 140569, 1378, 2756, 0xfa0734b4 0, 103, 103, 1, 28800, 0xad964d00 -1, 141947, 141947, 1378, 2756, 0x5eff3fc4 0, 104, 104, 1, 28800, 0x1ff36bd1 -1, 143325, 143325, 1378, 2756, 0xf35346bd -1, 144703, 144703, 1378, 2756, 0xac6411c5 0, 105, 105, 1, 28800, 0xa4664c76 -1, 146081, 146081, 1380, 2760, 0x478c3c56 0, 106, 106, 1, 28800, 0x50626d82 -1, 147459, 147459, 1378, 2756, 0xebd30bdd 0, 107, 107, 1, 28800, 0x81906c5c 0, 108, 108, 1, 28800, 0x5060543f -1, 148838, 148838, 1378, 2756, 0xaef95a31 0, 109, 109, 1, 28800, 0x231c5a86 -1, 150216, 150216, 1378, 2756, 0x8aad29d1 0, 110, 110, 1, 28800, 0x79775d48 -1, 151594, 151594, 1378, 2756, 0x626863f0 0, 111, 111, 1, 28800, 0xbb893571 -1, 152972, 152972, 1378, 2756, 0x68c05707 0, 112, 112, 1, 28800, 0x794c49ed -1, 154350, 154350, 1378, 2756, 0x437c5e8d -1, 155728, 155728, 1380, 2760, 0x8eca4bdb 0, 113, 113, 1, 28800, 0x70464bac -1, 157106, 157106, 1378, 2756, 0x62bd4162 0, 114, 114, 1, 28800, 0xe79549ce -1, 158484, 158484, 1378, 2756, 0x9f744aa4 0, 115, 115, 1, 28800, 0xa6565555 -1, 159862, 159862, 1378, 2756, 0x0f3f6409 0, 116, 116, 1, 28800, 0x2ef1ad6d 0, 117, 117, 1, 28800, 0xdd22b9aa -1, 161241, 161241, 1378, 2756, 0x3fee827a 0, 118, 118, 1, 28800, 0x26ebaa97 -1, 162619, 162619, 1378, 2756, 0x48a0ac19 0, 119, 119, 1, 28800, 0x32bd979e -1, 163997, 163997, 1378, 2756, 0x8e4ce0d0 0, 120, 120, 1, 28800, 0x4c167c9a -1, 165375, 165375, 1380, 2760, 0xcda82236 -1, 166753, 166753, 1378, 2756, 0x0e523255 0, 121, 121, 1, 28800, 0xfdf76051 -1, 168131, 168131, 1378, 2756, 0x84103d30 0, 122, 122, 1, 28800, 0x966938a8 -1, 169509, 169509, 1378, 2756, 0x13941cde 0, 123, 123, 1, 28800, 0xcea3fbde 0, 124, 124, 1, 28800, 0x29a0c213 -1, 170888, 170888, 1378, 2756, 0x9fc834c5 0, 125, 125, 1, 28800, 0x5633a1c2 -1, 172266, 172266, 1378, 2756, 0xc0217a77 0, 126, 126, 1, 28800, 0xdc0b9af8 -1, 173644, 173644, 1378, 2756, 0x3f643659 0, 127, 127, 1, 28800, 0x92138848 -1, 175022, 175022, 1380, 2760, 0x9dbd6002 0, 128, 128, 1, 28800, 0xd7308da5 -1, 176400, 176400, 1378, 2756, 0x94f046fb -1, 177778, 177778, 1378, 2756, 0xab01fb12 0, 129, 129, 1, 28800, 0x0c8f9b3f -1, 179156, 179156, 1378, 2756, 0x04cffe5c 0, 130, 130, 1, 28800, 0xd059b5d1 -1, 180534, 180534, 1378, 2756, 0xef661c5e 0, 131, 131, 1, 28800, 0xba6ed9cd -1, 181912, 181912, 1378, 2756, 0x094c5fc5 0, 132, 132, 1, 28800, 0x896c1064 0, 133, 133, 1, 28800, 0x986e2fc9 -1, 183291, 183291, 1378, 2756, 0xe0c1486a 0, 134, 134, 1, 28800, 0xcba94e4b -1, 184669, 184669, 1380, 2760, 0x8c3535b7 0, 135, 135, 1, 28800, 0xf3e778ed -1, 186047, 186047, 1378, 2756, 0x594934aa 0, 136, 136, 1, 28800, 0xc6cd7d48 -1, 187425, 187425, 1378, 2756, 0x74007238 -1, 188803, 188803, 1378, 2756, 0x61f1394d 0, 137, 137, 1, 28800, 0xd9bd84d8 -1, 190181, 190181, 1378, 2756, 0x72584f07 0, 138, 138, 1, 28800, 0x391197b4 -1, 191559, 191559, 1378, 2756, 0xced9acf9 0, 139, 139, 1, 28800, 0xf361a1d9 0, 140, 140, 1, 28800, 0x9a1ea54e -1, 192938, 192938, 1378, 2756, 0x7d2e3ea1 0, 141, 141, 1, 28800, 0x551aab57 -1, 194316, 194316, 1378, 2756, 0x56c06897 0, 142, 142, 1, 28800, 0x3af8577d -1, 195694, 195694, 1380, 2760, 0x19983bbf 0, 143, 143, 1, 28800, 0x10f76ed0 -1, 197072, 197072, 1378, 2756, 0x4f884f27 0, 144, 144, 1, 28800, 0x026a7fde -1, 198450, 198450, 1378, 2756, 0x81ab2f63 -1, 199828, 199828, 1378, 2756, 0x448e681d 0, 145, 145, 1, 28800, 0x3e0e8db8 -1, 201206, 201206, 1378, 2756, 0x0ba9826e 0, 146, 146, 1, 28800, 0x22998d2d -1, 202584, 202584, 1378, 2756, 0x049f36fa 0, 147, 147, 1, 28800, 0x05978b12 -1, 203962, 203962, 1378, 2756, 0x096a2b62 0, 148, 148, 1, 28800, 0x38b88294 0, 149, 149, 1, 28800, 0x2ef677d6 -1, 205341, 205341, 1380, 2760, 0x579e2035 0, 150, 150, 1, 28800, 0x0b9a8894 -1, 206719, 206719, 1378, 2756, 0xd13e30e1 0, 151, 151, 1, 28800, 0x2dcb6718 -1, 208097, 208097, 1378, 2756, 0x30b6412b 0, 152, 152, 1, 28800, 0xa31b6679 -1, 209475, 209475, 1378, 2756, 0xbb1c3268 -1, 210853, 210853, 1378, 2756, 0xbc175b6a 0, 153, 153, 1, 28800, 0x262d6a50 -1, 212231, 212231, 1378, 2756, 0xf8d160e2 0, 154, 154, 1, 28800, 0xff3d6d0d -1, 213609, 213609, 1378, 2756, 0xc1048154 0, 155, 155, 1, 28800, 0x159d7045 0, 156, 156, 1, 28800, 0xf0df7800 -1, 214988, 214988, 1380, 2760, 0xb83548f4 0, 157, 157, 1, 28800, 0xbe825ea5 -1, 216366, 216366, 1378, 2756, 0x22647962 0, 158, 158, 1, 28800, 0x80e25d5a -1, 217744, 217744, 1378, 2756, 0x14ca54d3 0, 159, 159, 1, 28800, 0x8cbe263f -1, 219122, 219122, 1378, 2756, 0x58754b3a From 88ae6178b1dc4d59081d59b66a7456b8bf1c8457 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 15:16:43 +0100 Subject: [PATCH 09/25] fate: add adpcm-ima-smjpeg test Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 3 + tests/ref/fate/adpcm-ima-smjpeg | 351 ++++++++++++++++++++++++++++++++ 2 files changed, 354 insertions(+) create mode 100644 tests/ref/fate/adpcm-ima-smjpeg diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 3f84c9e8c2..9bcad90f6a 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -43,6 +43,9 @@ fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV FATE_ADPCM += fate-adpcm-ima-ea-sead fate-adpcm-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -vn +FATE_ADPCM += fate-adpcm-ima-smjpeg +fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn + FATE_ADPCM += fate-adpcm-ima_wav-stereo fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le diff --git a/tests/ref/fate/adpcm-ima-smjpeg b/tests/ref/fate/adpcm-ima-smjpeg new file mode 100644 index 0000000000..287e8a091c --- /dev/null +++ b/tests/ref/fate/adpcm-ima-smjpeg @@ -0,0 +1,351 @@ +#tb 0: 1/22050 +0, 0, 0, 512, 1024, 0x00000000 +0, 507, 507, 512, 1024, 0x00000000 +0, 1014, 1014, 512, 1024, 0xd89a448e +0, 1521, 1521, 512, 1024, 0x695b369c +0, 2029, 2029, 512, 1024, 0xc8ba5707 +0, 2558, 2558, 512, 1024, 0xdf241fc6 +0, 3065, 3065, 512, 1024, 0x61cf4166 +0, 3572, 3572, 512, 1024, 0x97cbc386 +0, 4079, 4079, 512, 1024, 0x44899d04 +0, 4586, 4586, 512, 1024, 0xa7cbaa62 +0, 5116, 5116, 512, 1024, 0xa7aea60c +0, 5623, 5623, 512, 1024, 0xd7b18a89 +0, 6130, 6130, 512, 1024, 0x268e81f6 +0, 6637, 6637, 512, 1024, 0x9cf83a2f +0, 7166, 7166, 512, 1024, 0x5559b508 +0, 7673, 7673, 512, 1024, 0xe1b9e71c +0, 8181, 8181, 512, 1024, 0xdcee733e +0, 8688, 8688, 512, 1024, 0xe5918f60 +0, 9195, 9195, 512, 1024, 0x29dbd209 +0, 9724, 9724, 512, 1024, 0x9bcbcf16 +0, 10231, 10231, 512, 1024, 0x86f5f458 +0, 10738, 10738, 512, 1024, 0xabcbda86 +0, 11246, 11246, 512, 1024, 0xc51f77b9 +0, 11775, 11775, 512, 1024, 0xf6b3a504 +0, 12282, 12282, 512, 1024, 0x1af3e40e +0, 12789, 12789, 512, 1024, 0x3866b03b +0, 13296, 13296, 512, 1024, 0xbc005403 +0, 13803, 13803, 512, 1024, 0xe9dfcc51 +0, 14332, 14332, 512, 1024, 0x83c837cb +0, 14840, 14840, 512, 1024, 0xfa649580 +0, 15347, 15347, 512, 1024, 0x519452ea +0, 15854, 15854, 512, 1024, 0xd4978774 +0, 16383, 16383, 512, 1024, 0xe2a3b1cd +0, 16890, 16890, 512, 1024, 0x9a9472ad +0, 17397, 17397, 512, 1024, 0xa12d4060 +0, 17905, 17905, 512, 1024, 0x31fb0646 +0, 18412, 18412, 512, 1024, 0xfc44343f +0, 18941, 18941, 512, 1024, 0x0847751a +0, 19448, 19448, 512, 1024, 0x227968a2 +0, 19955, 19955, 512, 1024, 0x7cce9f1c +0, 20462, 20462, 512, 1024, 0xb8356713 +0, 20992, 20992, 512, 1024, 0xb29f6e6f +0, 21499, 21499, 512, 1024, 0x9e1430ab +0, 22006, 22006, 512, 1024, 0x26d85423 +0, 22513, 22513, 512, 1024, 0x6496547d +0, 23020, 23020, 512, 1024, 0x316b1a86 +0, 23549, 23549, 512, 1024, 0x3cd83afc +0, 24057, 24057, 512, 1024, 0x993ff633 +0, 24564, 24564, 512, 1024, 0x0708d1a2 +0, 25071, 25071, 512, 1024, 0xd7230db9 +0, 25578, 25578, 512, 1024, 0xbb0779ca +0, 26107, 26107, 512, 1024, 0xc6094e1b +0, 26614, 26614, 512, 1024, 0x15a8b039 +0, 27122, 27122, 512, 1024, 0xd6dbe88c +0, 27629, 27629, 512, 1024, 0x7e8d1140 +0, 28158, 28158, 512, 1024, 0xef88e525 +0, 28665, 28665, 512, 1024, 0x44e21149 +0, 29172, 29172, 512, 1024, 0x65b0f5f4 +0, 29679, 29679, 512, 1024, 0xb955f687 +0, 30186, 30186, 512, 1024, 0xc85fba9c +0, 30716, 30716, 512, 1024, 0xf59655ad +0, 31223, 31223, 512, 1024, 0x6de80bf1 +0, 31730, 31730, 512, 1024, 0x2dcf6e41 +0, 32237, 32237, 512, 1024, 0xd0ddcf8a +0, 32766, 32766, 512, 1024, 0x00135c2d +0, 33273, 33273, 512, 1024, 0x697f8efd +0, 33781, 33781, 512, 1024, 0x7a9bada5 +0, 34288, 34288, 512, 1024, 0x0d22783c +0, 34795, 34795, 512, 1024, 0x7726d07d +0, 35324, 35324, 512, 1024, 0xa2f14f67 +0, 35831, 35831, 512, 1024, 0x7f51060d +0, 36338, 36338, 512, 1024, 0xc4ec6aea +0, 36846, 36846, 512, 1024, 0x9bb37ca4 +0, 37375, 37375, 512, 1024, 0x9b085577 +0, 37882, 37882, 512, 1024, 0x8812f8af +0, 38389, 38389, 512, 1024, 0x788f5221 +0, 38896, 38896, 512, 1024, 0x3a2ce642 +0, 39403, 39403, 512, 1024, 0x72415692 +0, 39933, 39933, 512, 1024, 0xe3dcc105 +0, 40440, 40440, 512, 1024, 0xb26c0599 +0, 40947, 40947, 512, 1024, 0x5c9e55eb +0, 41454, 41454, 512, 1024, 0x8fe88707 +0, 41983, 41983, 512, 1024, 0xc5d7beb6 +0, 42490, 42490, 512, 1024, 0xe1d3a3b4 +0, 42998, 42998, 512, 1024, 0x012da0c6 +0, 43505, 43505, 512, 1024, 0x8d010922 +0, 44012, 44012, 512, 1024, 0x3366eb0d +0, 44541, 44541, 512, 1024, 0xc9381a27 +0, 45048, 45048, 512, 1024, 0x0774f685 +0, 45555, 45555, 512, 1024, 0xc5cae0a5 +0, 46062, 46062, 512, 1024, 0xa6f4737c +0, 46592, 46592, 512, 1024, 0x8fb6d0d1 +0, 47099, 47099, 512, 1024, 0x05f579c2 +0, 47606, 47606, 512, 1024, 0x56905d99 +0, 48113, 48113, 512, 1024, 0x002ee18d +0, 48620, 48620, 512, 1024, 0xeb37ef51 +0, 49149, 49149, 512, 1024, 0x38025635 +0, 49657, 49657, 512, 1024, 0x4fe643c8 +0, 50164, 50164, 512, 1024, 0x11d66ab1 +0, 50671, 50671, 512, 1024, 0xcc3051e9 +0, 51178, 51178, 512, 1024, 0xcd93e854 +0, 51707, 51707, 512, 1024, 0x38f1196d +0, 52214, 52214, 512, 1024, 0x657a15fc +0, 52722, 52722, 512, 1024, 0x669ce2a9 +0, 53229, 53229, 512, 1024, 0x95862dda +0, 53758, 53758, 512, 1024, 0x1726a7b2 +0, 54265, 54265, 512, 1024, 0xd6ece2a1 +0, 54772, 54772, 512, 1024, 0x33ab9553 +0, 55279, 55279, 512, 1024, 0xd50c73a6 +0, 55786, 55786, 512, 1024, 0xfe25b63a +0, 56316, 56316, 512, 1024, 0x7e2959e3 +0, 56823, 56823, 512, 1024, 0xa4c07b34 +0, 57330, 57330, 512, 1024, 0xd6d8f15c +0, 57837, 57837, 512, 1024, 0x1eccddd7 +0, 58366, 58366, 512, 1024, 0x2b69f9cb +0, 58874, 58874, 512, 1024, 0x667b775f +0, 59381, 59381, 512, 1024, 0xad3b84e9 +0, 59888, 59888, 512, 1024, 0x4f29fc67 +0, 60395, 60395, 512, 1024, 0x8d611ab7 +0, 60924, 60924, 512, 1024, 0x278966ea +0, 61431, 61431, 512, 1024, 0xaf33812b +0, 61938, 61938, 512, 1024, 0xa55f4265 +0, 62446, 62446, 512, 1024, 0x023cb51c +0, 62975, 62975, 512, 1024, 0x1d1f1005 +0, 63482, 63482, 512, 1024, 0x874cccf7 +0, 63989, 63989, 512, 1024, 0xda705428 +0, 64496, 64496, 512, 1024, 0x48d9b440 +0, 65003, 65003, 512, 1024, 0xa14e0712 +0, 65533, 65533, 512, 1024, 0x7efbad1f +0, 66040, 66040, 512, 1024, 0xdb82c17f +0, 66547, 66547, 512, 1024, 0xcbe87613 +0, 67054, 67054, 512, 1024, 0x3a63df1d +0, 67583, 67583, 512, 1024, 0xd5636bba +0, 68090, 68090, 512, 1024, 0x9397af23 +0, 68598, 68598, 512, 1024, 0x32a07c98 +0, 69105, 69105, 512, 1024, 0x202ca667 +0, 69612, 69612, 512, 1024, 0xdf969011 +0, 70141, 70141, 512, 1024, 0xc434d238 +0, 70648, 70648, 512, 1024, 0xe9ad7562 +0, 71155, 71155, 512, 1024, 0xb51b6b50 +0, 71662, 71662, 512, 1024, 0xe70aecd3 +0, 72192, 72192, 512, 1024, 0x03c816b2 +0, 72699, 72699, 512, 1024, 0x869fdf25 +0, 73206, 73206, 512, 1024, 0xd40a0a62 +0, 73713, 73713, 512, 1024, 0x5af7dd35 +0, 74220, 74220, 512, 1024, 0x891ffc72 +0, 74750, 74750, 512, 1024, 0x1ff68a08 +0, 75257, 75257, 512, 1024, 0x5a7517a9 +0, 75764, 75764, 512, 1024, 0x0f959f74 +0, 76271, 76271, 512, 1024, 0xe92a12a2 +0, 76778, 76778, 512, 1024, 0x38000e55 +0, 77307, 77307, 512, 1024, 0x39fbdd70 +0, 77814, 77814, 512, 1024, 0xca3d9184 +0, 78322, 78322, 512, 1024, 0x66c8995b +0, 78829, 78829, 512, 1024, 0xac25acea +0, 79358, 79358, 512, 1024, 0x3cd1046c +0, 79865, 79865, 512, 1024, 0x6a1df31c +0, 80372, 80372, 512, 1024, 0x21ca10a1 +0, 80879, 80879, 512, 1024, 0x1aeccedc +0, 81387, 81387, 512, 1024, 0xddea1335 +0, 81916, 81916, 512, 1024, 0x19f5ca9f +0, 82423, 82423, 512, 1024, 0x88e95e43 +0, 82930, 82930, 512, 1024, 0x726284fe +0, 83437, 83437, 512, 1024, 0x6b85b40e +0, 83966, 83966, 512, 1024, 0x111fee2a +0, 84474, 84474, 512, 1024, 0x3656b588 +0, 84981, 84981, 512, 1024, 0xa5a2b552 +0, 85488, 85488, 512, 1024, 0x38fb2467 +0, 85995, 85995, 512, 1024, 0xaa919ccc +0, 86524, 86524, 512, 1024, 0x15993dbc +0, 87031, 87031, 512, 1024, 0xbe01a7b9 +0, 87538, 87538, 512, 1024, 0xefe93c09 +0, 88046, 88046, 512, 1024, 0x1bb566e5 +0, 88575, 88575, 512, 1024, 0x15ce6237 +0, 89082, 89082, 512, 1024, 0xa8552e66 +0, 89589, 89589, 512, 1024, 0x9d80187e +0, 90096, 90096, 512, 1024, 0x5df3fc30 +0, 90603, 90603, 512, 1024, 0x1a312aa5 +0, 91133, 91133, 512, 1024, 0x6bb8e302 +0, 91640, 91640, 512, 1024, 0xbd9684bb +0, 92147, 92147, 512, 1024, 0x78b0b166 +0, 92654, 92654, 512, 1024, 0xd9af5eae +0, 93183, 93183, 512, 1024, 0xdb90fe82 +0, 93690, 93690, 512, 1024, 0x327614e9 +0, 94198, 94198, 512, 1024, 0x1f19b7fe +0, 94705, 94705, 512, 1024, 0x46c53f96 +0, 95212, 95212, 512, 1024, 0x921b2189 +0, 95741, 95741, 512, 1024, 0xa8fbc85a +0, 96248, 96248, 512, 1024, 0xabfdaaae +0, 96755, 96755, 512, 1024, 0x6acc7387 +0, 97263, 97263, 512, 1024, 0x0d9c27b5 +0, 97792, 97792, 512, 1024, 0xba4dd809 +0, 98299, 98299, 512, 1024, 0x2a2ad521 +0, 98806, 98806, 512, 1024, 0x892de38a +0, 99313, 99313, 512, 1024, 0xdc97a2eb +0, 99820, 99820, 512, 1024, 0x4f614ca4 +0, 100350, 100350, 512, 1024, 0x9c8a77ea +0, 100857, 100857, 512, 1024, 0x2d30e646 +0, 101364, 101364, 512, 1024, 0x74e800a7 +0, 101871, 101871, 512, 1024, 0x1e01fb02 +0, 102378, 102378, 512, 1024, 0x4ed2c1d8 +0, 102907, 102907, 512, 1024, 0xf2fdbe63 +0, 103414, 103414, 512, 1024, 0x8d6f63a1 +0, 103922, 103922, 512, 1024, 0xded468d9 +0, 104429, 104429, 512, 1024, 0xccad839e +0, 104958, 104958, 512, 1024, 0xdde7c082 +0, 105465, 105465, 512, 1024, 0x548613c5 +0, 105972, 105972, 512, 1024, 0x383909bd +0, 106479, 106479, 512, 1024, 0xfd37627b +0, 106987, 106987, 512, 1024, 0x6d95a481 +0, 107516, 107516, 512, 1024, 0x56aa87fa +0, 108023, 108023, 512, 1024, 0x7b67258c +0, 108530, 108530, 512, 1024, 0x7dd99a92 +0, 109037, 109037, 512, 1024, 0x4a66d102 +0, 109566, 109566, 512, 1024, 0x7b3fce51 +0, 110074, 110074, 512, 1024, 0xbbd968aa +0, 110581, 110581, 512, 1024, 0x8283ec36 +0, 111088, 111088, 512, 1024, 0x3c96493d +0, 111595, 111595, 512, 1024, 0xfa4f8cf8 +0, 112124, 112124, 512, 1024, 0xe2cf872d +0, 112631, 112631, 512, 1024, 0x0a9e7aa6 +0, 113139, 113139, 512, 1024, 0x6e7a0550 +0, 113646, 113646, 512, 1024, 0x3acfea2f +0, 114175, 114175, 512, 1024, 0x7111d0fa +0, 114682, 114682, 512, 1024, 0xe9a1eca9 +0, 115189, 115189, 512, 1024, 0x24da6c46 +0, 115696, 115696, 512, 1024, 0x117cff37 +0, 116204, 116204, 512, 1024, 0x0f27cab6 +0, 116733, 116733, 512, 1024, 0x69b6b4e6 +0, 117240, 117240, 512, 1024, 0x1e6cc841 +0, 117747, 117747, 512, 1024, 0xb01e2365 +0, 118254, 118254, 512, 1024, 0x14e200d3 +0, 118783, 118783, 512, 1024, 0xd1184c98 +0, 119290, 119290, 512, 1024, 0xef9140e9 +0, 119798, 119798, 512, 1024, 0x4cbb645e +0, 120305, 120305, 512, 1024, 0xe7fe2f06 +0, 120812, 120812, 512, 1024, 0xf8c45028 +0, 121341, 121341, 512, 1024, 0x561358f4 +0, 121848, 121848, 512, 1024, 0xd0129b77 +0, 122355, 122355, 512, 1024, 0xcc636e88 +0, 122863, 122863, 512, 1024, 0xe9406321 +0, 123392, 123392, 512, 1024, 0x9f16a041 +0, 123899, 123899, 512, 1024, 0x468bf409 +0, 124406, 124406, 512, 1024, 0x3df70f7b +0, 124913, 124913, 512, 1024, 0xa880b11b +0, 125420, 125420, 512, 1024, 0x3286c489 +0, 125950, 125950, 512, 1024, 0x39fe9ebc +0, 126457, 126457, 512, 1024, 0xc533d83b +0, 126964, 126964, 512, 1024, 0x153b195d +0, 127471, 127471, 512, 1024, 0xd84786a1 +0, 127978, 127978, 512, 1024, 0xdc295aaa +0, 128507, 128507, 512, 1024, 0xfb764d8c +0, 129015, 129015, 512, 1024, 0xeebc9db9 +0, 129522, 129522, 512, 1024, 0x7ba9403e +0, 130029, 130029, 512, 1024, 0x4e5571ec +0, 130558, 130558, 512, 1024, 0xd965fad4 +0, 131065, 131065, 512, 1024, 0x87e259f2 +0, 131572, 131572, 512, 1024, 0xae7e533b +0, 132080, 132080, 512, 1024, 0x313cf4d6 +0, 132587, 132587, 512, 1024, 0xe1844c90 +0, 133116, 133116, 512, 1024, 0xbb057b44 +0, 133623, 133623, 512, 1024, 0xa5099687 +0, 134130, 134130, 512, 1024, 0xbff10707 +0, 134637, 134637, 512, 1024, 0x37c4ffc0 +0, 135166, 135166, 512, 1024, 0xf9fb6caa +0, 135674, 135674, 512, 1024, 0x3b6a3a1f +0, 136181, 136181, 512, 1024, 0x83431edb +0, 136688, 136688, 512, 1024, 0x1eb713cf +0, 137195, 137195, 512, 1024, 0xd7b07a6d +0, 137724, 137724, 512, 1024, 0x81ae3391 +0, 138231, 138231, 512, 1024, 0xf150130a +0, 138739, 138739, 512, 1024, 0x09678eaa +0, 139246, 139246, 512, 1024, 0xb94e06f1 +0, 139775, 139775, 512, 1024, 0x67b1dbc9 +0, 140282, 140282, 512, 1024, 0xd6edc235 +0, 140789, 140789, 512, 1024, 0x34e4c499 +0, 141296, 141296, 512, 1024, 0xeefd89c0 +0, 141804, 141804, 512, 1024, 0x38afdaf1 +0, 142333, 142333, 512, 1024, 0x29a60d76 +0, 142840, 142840, 512, 1024, 0xe28a4372 +0, 143347, 143347, 512, 1024, 0x7089454d +0, 143854, 143854, 512, 1024, 0x0c01bb7b +0, 144383, 144383, 512, 1024, 0xbd776a72 +0, 144891, 144891, 512, 1024, 0x86776fd0 +0, 145398, 145398, 512, 1024, 0xb37c88f7 +0, 145905, 145905, 512, 1024, 0x5f90aaf8 +0, 146412, 146412, 512, 1024, 0x203d4222 +0, 146941, 146941, 512, 1024, 0x382692a6 +0, 147448, 147448, 512, 1024, 0xf37c95fd +0, 147956, 147956, 512, 1024, 0x6c0b8877 +0, 148463, 148463, 512, 1024, 0x2e54a8b6 +0, 148992, 148992, 512, 1024, 0x7f266488 +0, 149499, 149499, 512, 1024, 0xfbf20f9a +0, 150006, 150006, 512, 1024, 0xf2985cc0 +0, 150513, 150513, 512, 1024, 0xc7075340 +0, 151020, 151020, 512, 1024, 0xe4585695 +0, 151550, 151550, 512, 1024, 0xbdffa380 +0, 152057, 152057, 512, 1024, 0x2422a8a9 +0, 152564, 152564, 512, 1024, 0x59cbd75f +0, 153071, 153071, 512, 1024, 0x04ad1a8c +0, 153578, 153578, 512, 1024, 0x33c09191 +0, 154107, 154107, 512, 1024, 0x55efa6fd +0, 154615, 154615, 512, 1024, 0xf73d0e5d +0, 155122, 155122, 512, 1024, 0x6141ebae +0, 155629, 155629, 512, 1024, 0x7db17a68 +0, 156158, 156158, 512, 1024, 0xa6c690b6 +0, 156665, 156665, 512, 1024, 0xa6fd6725 +0, 157172, 157172, 512, 1024, 0x50a90b9b +0, 157680, 157680, 512, 1024, 0xef990dc8 +0, 158187, 158187, 512, 1024, 0x75adf6b5 +0, 158716, 158716, 512, 1024, 0x61eac43e +0, 159223, 159223, 512, 1024, 0x67797a19 +0, 159730, 159730, 512, 1024, 0xf325277a +0, 160237, 160237, 512, 1024, 0x18bf254a +0, 160767, 160767, 512, 1024, 0x2ce6bee3 +0, 161274, 161274, 512, 1024, 0x8d320860 +0, 161781, 161781, 512, 1024, 0xc979b6e8 +0, 162288, 162288, 512, 1024, 0xdb644b41 +0, 162795, 162795, 512, 1024, 0xe1b368ba +0, 163324, 163324, 512, 1024, 0xacc53d15 +0, 163832, 163832, 512, 1024, 0x42ea8c18 +0, 164339, 164339, 512, 1024, 0xe52c99a4 +0, 164846, 164846, 512, 1024, 0xd7db54a6 +0, 165375, 165375, 512, 1024, 0x7f27a7e3 +0, 165882, 165882, 512, 1024, 0xf7ffeaa9 +0, 166389, 166389, 512, 1024, 0x792b6088 +0, 166896, 166896, 512, 1024, 0x61d99724 +0, 167404, 167404, 512, 1024, 0x5213720e +0, 167933, 167933, 512, 1024, 0xac09dd30 +0, 168440, 168440, 512, 1024, 0x960bf6bb +0, 168947, 168947, 512, 1024, 0xc90168e1 +0, 169454, 169454, 512, 1024, 0x43b45768 +0, 169983, 169983, 512, 1024, 0x935d60a1 +0, 170491, 170491, 512, 1024, 0x9a342ef2 +0, 170998, 170998, 512, 1024, 0xc894709f +0, 171505, 171505, 512, 1024, 0x59b43b07 +0, 172012, 172012, 512, 1024, 0x36a1a98d +0, 172541, 172541, 512, 1024, 0x9e1a121c +0, 173048, 173048, 512, 1024, 0x02208b78 +0, 173556, 173556, 512, 1024, 0xd1d7b274 +0, 174063, 174063, 512, 1024, 0xdacd5096 +0, 174592, 174592, 512, 1024, 0x51b71ead +0, 175099, 175099, 512, 1024, 0xd009a7ca +0, 175606, 175606, 512, 1024, 0xb6d5a938 +0, 176113, 176113, 512, 1024, 0xf3d45e47 +0, 176620, 176620, 512, 1024, 0xea8e04fc +0, 177150, 177150, 512, 1024, 0x0b928bd8 +0, 177657, 177657, 512, 1024, 0x0f02caec +0, 178164, 178164, 512, 1024, 0xe2b137a8 +0, 178671, 178671, 512, 1024, 0xd5f94892 From 95939bf5650c7194ecbf779ae594d818ce99e89e Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 15:36:57 +0100 Subject: [PATCH 10/25] fate: split off adpcm-ima-ws test from vqa-cc Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 3 +++ tests/fate/video.mak | 2 +- tests/ref/fate/adpcm-ima-ws | 41 +++++++++++++++++++++++++++++++++++++ tests/ref/fate/vqa-cc | 41 ------------------------------------- 4 files changed, 45 insertions(+), 42 deletions(-) create mode 100644 tests/ref/fate/adpcm-ima-ws diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 9bcad90f6a..c3dfbe921c 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -49,6 +49,9 @@ fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn FATE_ADPCM += fate-adpcm-ima_wav-stereo fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le +FATE_ADPCM += fate-adpcm-ima-ws +fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn + FATE_ADPCM += fate-adpcm-psx-str-v3 fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn diff --git a/tests/fate/video.mak b/tests/fate/video.mak index f238601a07..3bddb126fc 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -217,7 +217,7 @@ FATE_AVCONV += fate-videoxl fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi FATE_AVCONV += fate-vqa-cc -fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 +fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an FATE_AVCONV += fate-wc3movie-xan fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 diff --git a/tests/ref/fate/adpcm-ima-ws b/tests/ref/fate/adpcm-ima-ws new file mode 100644 index 0000000000..61e0def729 --- /dev/null +++ b/tests/ref/fate/adpcm-ima-ws @@ -0,0 +1,41 @@ +#tb 0: 1/22050 +0, 0, 0, 11024, 22048, 0x0665d7f4 +0, 11024, 11024, 1470, 2940, 0x0f3c64cb +0, 12494, 12494, 1470, 2940, 0xc90b9e78 +0, 13964, 13964, 1470, 2940, 0x146246a3 +0, 15434, 15434, 1470, 2940, 0xd22c714e +0, 16904, 16904, 1470, 2940, 0xd86b681e +0, 18374, 18374, 1470, 2940, 0x12ec8186 +0, 19844, 19844, 1470, 2940, 0x69aa85b6 +0, 21314, 21314, 1470, 2940, 0xb24d33b0 +0, 22784, 22784, 1470, 2940, 0x3f7b0f0d +0, 24254, 24254, 1470, 2940, 0x64f10f7e +0, 25724, 25724, 1470, 2940, 0xd6ea379a +0, 27194, 27194, 1470, 2940, 0x7c38e830 +0, 28664, 28664, 1470, 2940, 0xc28ff132 +0, 30134, 30134, 1470, 2940, 0xe7b11629 +0, 31604, 31604, 1470, 2940, 0xeb86fdcb +0, 33074, 33074, 1470, 2940, 0x5508f586 +0, 34544, 34544, 1470, 2940, 0xf4fa1f1b +0, 36014, 36014, 1470, 2940, 0x9e5ff976 +0, 37484, 37484, 1470, 2940, 0xcfc4e08f +0, 38954, 38954, 1470, 2940, 0x74bde7ed +0, 40424, 40424, 1470, 2940, 0x3e4ae245 +0, 41894, 41894, 1470, 2940, 0x4c6a8e56 +0, 43364, 43364, 1470, 2940, 0xa09d86ab +0, 44834, 44834, 1470, 2940, 0xc8531912 +0, 46304, 46304, 1470, 2940, 0xa5f266aa +0, 47774, 47774, 1470, 2940, 0x587a4187 +0, 49244, 49244, 1470, 2940, 0x14752d45 +0, 50714, 50714, 1470, 2940, 0x558cde10 +0, 52184, 52184, 1470, 2940, 0x735fee38 +0, 53654, 53654, 1470, 2940, 0xac8bb6c8 +0, 55124, 55124, 1470, 2940, 0xa503c73b +0, 56594, 56594, 1470, 2940, 0x7cd588a3 +0, 58064, 58064, 1470, 2940, 0xa6974b04 +0, 59534, 59534, 1470, 2940, 0xbf448241 +0, 61004, 61004, 1470, 2940, 0x2a5c2759 +0, 62474, 62474, 1470, 2940, 0xd0de5ce0 +0, 63944, 63944, 1470, 2940, 0xc0486649 +0, 65414, 65414, 1470, 2940, 0x48b040af +0, 66884, 66884, 1470, 2940, 0x82a338a9 diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc index 97ae71d5c4..d3c5e6a8e1 100644 --- a/tests/ref/fate/vqa-cc +++ b/tests/ref/fate/vqa-cc @@ -1,7 +1,5 @@ #tb 0: 1/15 -#tb 1: 1/22050 0, 0, 0, 1, 192000, 0x00000000 -1, 0, 0, 11024, 22048, 0x0665d7f4 0, 1, 1, 1, 192000, 0x00000000 0, 2, 2, 1, 192000, 0x00000000 0, 3, 3, 1, 192000, 0x00000000 @@ -9,72 +7,33 @@ 0, 5, 5, 1, 192000, 0xfd496438 0, 6, 6, 1, 192000, 0x965f0bf3 0, 7, 7, 1, 192000, 0x378fca5f -1, 11024, 11024, 1470, 2940, 0x0f3c64cb 0, 8, 8, 1, 192000, 0x5ccd8966 -1, 12494, 12494, 1470, 2940, 0xc90b9e78 0, 9, 9, 1, 192000, 0x859676f9 -1, 13964, 13964, 1470, 2940, 0x146246a3 0, 10, 10, 1, 192000, 0x820bfb1c -1, 15434, 15434, 1470, 2940, 0xd22c714e 0, 11, 11, 1, 192000, 0x7570cc05 -1, 16904, 16904, 1470, 2940, 0xd86b681e 0, 12, 12, 1, 192000, 0xf38bdb06 -1, 18374, 18374, 1470, 2940, 0x12ec8186 0, 13, 13, 1, 192000, 0x9b0cbb44 -1, 19844, 19844, 1470, 2940, 0x69aa85b6 0, 14, 14, 1, 192000, 0x0ed70665 -1, 21314, 21314, 1470, 2940, 0xb24d33b0 0, 15, 15, 1, 192000, 0xd16de7fc -1, 22784, 22784, 1470, 2940, 0x3f7b0f0d 0, 16, 16, 1, 192000, 0x97afb484 -1, 24254, 24254, 1470, 2940, 0x64f10f7e 0, 17, 17, 1, 192000, 0x012893f3 -1, 25724, 25724, 1470, 2940, 0xd6ea379a 0, 18, 18, 1, 192000, 0x742a4b43 -1, 27194, 27194, 1470, 2940, 0x7c38e830 0, 19, 19, 1, 192000, 0x309dcd75 -1, 28664, 28664, 1470, 2940, 0xc28ff132 0, 20, 20, 1, 192000, 0xed7814ac -1, 30134, 30134, 1470, 2940, 0xe7b11629 0, 21, 21, 1, 192000, 0xdb7de3d7 -1, 31604, 31604, 1470, 2940, 0xeb86fdcb 0, 22, 22, 1, 192000, 0xe18679a3 -1, 33074, 33074, 1470, 2940, 0x5508f586 0, 23, 23, 1, 192000, 0xb1f213f4 -1, 34544, 34544, 1470, 2940, 0xf4fa1f1b 0, 24, 24, 1, 192000, 0x33c99b5c -1, 36014, 36014, 1470, 2940, 0x9e5ff976 0, 25, 25, 1, 192000, 0xf66c0c91 -1, 37484, 37484, 1470, 2940, 0xcfc4e08f 0, 26, 26, 1, 192000, 0x929cdc73 -1, 38954, 38954, 1470, 2940, 0x74bde7ed 0, 27, 27, 1, 192000, 0xa723fc3b -1, 40424, 40424, 1470, 2940, 0x3e4ae245 0, 28, 28, 1, 192000, 0xe6395ccc -1, 41894, 41894, 1470, 2940, 0x4c6a8e56 0, 29, 29, 1, 192000, 0x147fbf74 -1, 43364, 43364, 1470, 2940, 0xa09d86ab 0, 30, 30, 1, 192000, 0x3ec62d28 -1, 44834, 44834, 1470, 2940, 0xc8531912 0, 31, 31, 1, 192000, 0x22104ffb -1, 46304, 46304, 1470, 2940, 0xa5f266aa 0, 32, 32, 1, 192000, 0x91f25f58 -1, 47774, 47774, 1470, 2940, 0x587a4187 0, 33, 33, 1, 192000, 0xc91b0e4e -1, 49244, 49244, 1470, 2940, 0x14752d45 0, 34, 34, 1, 192000, 0x4683df56 -1, 50714, 50714, 1470, 2940, 0x558cde10 0, 35, 35, 1, 192000, 0x8ef8932a -1, 52184, 52184, 1470, 2940, 0x735fee38 0, 36, 36, 1, 192000, 0xce6c0ec0 -1, 53654, 53654, 1470, 2940, 0xac8bb6c8 0, 37, 37, 1, 192000, 0xcc10e2a0 -1, 55124, 55124, 1470, 2940, 0xa503c73b -1, 56594, 56594, 1470, 2940, 0x7cd588a3 -1, 58064, 58064, 1470, 2940, 0xa6974b04 -1, 59534, 59534, 1470, 2940, 0xbf448241 -1, 61004, 61004, 1470, 2940, 0x2a5c2759 -1, 62474, 62474, 1470, 2940, 0xd0de5ce0 -1, 63944, 63944, 1470, 2940, 0xc0486649 -1, 65414, 65414, 1470, 2940, 0x48b040af -1, 66884, 66884, 1470, 2940, 0x82a338a9 From 6a64ff74fe26d7d9f998efe73f17ab1c314e265e Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 17:08:29 +0100 Subject: [PATCH 11/25] fate: split off adpcm-ms-mono test from dxa-feeble Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 3 +++ tests/fate/video.mak | 2 +- tests/ref/fate/adpcm-ms-mono | 46 ++++++++++++++++++++++++++++++++++++ tests/ref/fate/dxa-feeble | 46 ------------------------------------ 4 files changed, 50 insertions(+), 47 deletions(-) create mode 100644 tests/ref/fate/adpcm-ms-mono diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index c3dfbe921c..9e06efe0cb 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -52,6 +52,9 @@ fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-m FATE_ADPCM += fate-adpcm-ima-ws fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn +FATE_ADPCM += fate-adpcm-ms-mono +fate-adpcm-ms-mono: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -vn + FATE_ADPCM += fate-adpcm-psx-str-v3 fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 3bddb126fc..ba2964097d 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -89,7 +89,7 @@ FATE_AVCONV += fate-truemotion2 fate-truemotion2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi FATE_DXA += fate-dxa-feeble -fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 +fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 diff --git a/tests/ref/fate/adpcm-ms-mono b/tests/ref/fate/adpcm-ms-mono new file mode 100644 index 0000000000..3bf44f82b4 --- /dev/null +++ b/tests/ref/fate/adpcm-ms-mono @@ -0,0 +1,46 @@ +#tb 0: 1/11025 +0, 0, 0, 500, 1000, 0x64cd9403 +0, 500, 500, 500, 1000, 0xa4ef8a9d +0, 1000, 1000, 500, 1000, 0x75c19868 +0, 1500, 1500, 500, 1000, 0x93db6f79 +0, 2000, 2000, 500, 1000, 0x6835625d +0, 2500, 2500, 500, 1000, 0xb3affa8f +0, 3000, 3000, 500, 1000, 0x159fdcc8 +0, 3500, 3500, 500, 1000, 0x79f9f7f1 +0, 4000, 4000, 500, 1000, 0xd7d1131e +0, 4500, 4500, 500, 1000, 0x52a6f797 +0, 5000, 5000, 500, 1000, 0x748202ca +0, 5500, 5500, 500, 1000, 0x0ef92449 +0, 6000, 6000, 500, 1000, 0x6a3760ab +0, 6500, 6500, 500, 1000, 0xce5c5abf +0, 7000, 7000, 500, 1000, 0x23396792 +0, 7500, 7500, 500, 1000, 0xa5276238 +0, 8000, 8000, 500, 1000, 0x288adf1b +0, 8500, 8500, 500, 1000, 0xe7de6fb2 +0, 9000, 9000, 500, 1000, 0x2c2c707f +0, 9500, 9500, 500, 1000, 0xd66d6daf +0, 10000, 10000, 500, 1000, 0xbcea7d64 +0, 10500, 10500, 500, 1000, 0x766feea5 +0, 11000, 11000, 500, 1000, 0xd2e1d63a +0, 11500, 11500, 500, 1000, 0x2f7ef4ed +0, 12000, 12000, 500, 1000, 0xb655cba4 +0, 12500, 12500, 500, 1000, 0x4507d37b +0, 13000, 13000, 500, 1000, 0x0c57f794 +0, 13500, 13500, 500, 1000, 0x0ecbe5cc +0, 14000, 14000, 500, 1000, 0x9bf6e345 +0, 14500, 14500, 500, 1000, 0xc461443c +0, 15000, 15000, 500, 1000, 0xad9657bf +0, 15500, 15500, 500, 1000, 0x466fe91c +0, 16000, 16000, 500, 1000, 0x9ee377fe +0, 16500, 16500, 500, 1000, 0x09956428 +0, 17000, 17000, 500, 1000, 0x9b285f0a +0, 17500, 17500, 500, 1000, 0x0a3e61a6 +0, 18000, 18000, 500, 1000, 0xacc25d6b +0, 18500, 18500, 500, 1000, 0x377be319 +0, 19000, 19000, 500, 1000, 0xe4890504 +0, 19500, 19500, 500, 1000, 0xe90a6497 +0, 20000, 20000, 500, 1000, 0xd00fe950 +0, 20500, 20500, 500, 1000, 0xf195eb44 +0, 21000, 21000, 500, 1000, 0xa491f3ef +0, 21500, 21500, 500, 1000, 0x2c036e18 +0, 22000, 22000, 500, 1000, 0x52d65e2a diff --git a/tests/ref/fate/dxa-feeble b/tests/ref/fate/dxa-feeble index 6aaea29d16..74b43dcf22 100644 --- a/tests/ref/fate/dxa-feeble +++ b/tests/ref/fate/dxa-feeble @@ -1,67 +1,21 @@ #tb 0: 1/10 -#tb 1: 1/11025 0, 0, 0, 1, 921600, 0x0d03844f -1, 0, 0, 500, 1000, 0x64cd9403 -1, 500, 500, 500, 1000, 0xa4ef8a9d -1, 1000, 1000, 500, 1000, 0x75c19868 0, 1, 1, 1, 921600, 0x0d03844f -1, 1500, 1500, 500, 1000, 0x93db6f79 -1, 2000, 2000, 500, 1000, 0x6835625d 0, 2, 2, 1, 921600, 0x649cdcea -1, 2500, 2500, 500, 1000, 0xb3affa8f -1, 3000, 3000, 500, 1000, 0x159fdcc8 0, 3, 3, 1, 921600, 0x649cdcea -1, 3500, 3500, 500, 1000, 0x79f9f7f1 -1, 4000, 4000, 500, 1000, 0xd7d1131e 0, 4, 4, 1, 921600, 0x9c7f22e8 -1, 4500, 4500, 500, 1000, 0x52a6f797 -1, 5000, 5000, 500, 1000, 0x748202ca -1, 5500, 5500, 500, 1000, 0x0ef92449 0, 5, 5, 1, 921600, 0x9c7f22e8 -1, 6000, 6000, 500, 1000, 0x6a3760ab -1, 6500, 6500, 500, 1000, 0xce5c5abf 0, 6, 6, 1, 921600, 0x3451514a -1, 7000, 7000, 500, 1000, 0x23396792 -1, 7500, 7500, 500, 1000, 0xa5276238 0, 7, 7, 1, 921600, 0x3451514a -1, 8000, 8000, 500, 1000, 0x288adf1b -1, 8500, 8500, 500, 1000, 0xe7de6fb2 0, 8, 8, 1, 921600, 0x8f19f600 -1, 9000, 9000, 500, 1000, 0x2c2c707f -1, 9500, 9500, 500, 1000, 0xd66d6daf 0, 9, 9, 1, 921600, 0x8f19f600 -1, 10000, 10000, 500, 1000, 0xbcea7d64 -1, 10500, 10500, 500, 1000, 0x766feea5 -1, 11000, 11000, 500, 1000, 0xd2e1d63a 0, 10, 10, 1, 921600, 0x07e7445b -1, 11500, 11500, 500, 1000, 0x2f7ef4ed -1, 12000, 12000, 500, 1000, 0xb655cba4 0, 11, 11, 1, 921600, 0x07e7445b -1, 12500, 12500, 500, 1000, 0x4507d37b -1, 13000, 13000, 500, 1000, 0x0c57f794 0, 12, 12, 1, 921600, 0x873d1227 -1, 13500, 13500, 500, 1000, 0x0ecbe5cc -1, 14000, 14000, 500, 1000, 0x9bf6e345 0, 13, 13, 1, 921600, 0x873d1227 -1, 14500, 14500, 500, 1000, 0xc461443c -1, 15000, 15000, 500, 1000, 0xad9657bf 0, 14, 14, 1, 921600, 0xbef62d86 -1, 15500, 15500, 500, 1000, 0x466fe91c -1, 16000, 16000, 500, 1000, 0x9ee377fe -1, 16500, 16500, 500, 1000, 0x09956428 0, 15, 15, 1, 921600, 0xbef62d86 -1, 17000, 17000, 500, 1000, 0x9b285f0a -1, 17500, 17500, 500, 1000, 0x0a3e61a6 0, 16, 16, 1, 921600, 0xcf84fee4 -1, 18000, 18000, 500, 1000, 0xacc25d6b -1, 18500, 18500, 500, 1000, 0x377be319 0, 17, 17, 1, 921600, 0xcf84fee4 -1, 19000, 19000, 500, 1000, 0xe4890504 -1, 19500, 19500, 500, 1000, 0xe90a6497 0, 18, 18, 1, 921600, 0x5639e670 -1, 20000, 20000, 500, 1000, 0xd00fe950 -1, 20500, 20500, 500, 1000, 0xf195eb44 0, 19, 19, 1, 921600, 0x5639e670 -1, 21000, 21000, 500, 1000, 0xa491f3ef -1, 21500, 21500, 500, 1000, 0x2c036e18 -1, 22000, 22000, 500, 1000, 0x52d65e2a From 773459e75793a2721da6109e7219c4505ec59b32 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 16:25:34 +0100 Subject: [PATCH 12/25] fate: rename adpcm-psx-str-v3 to adpcm-xa This matches the name of the codec tested. Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 6 +++--- tests/ref/fate/{adpcm-psx-str-v3 => adpcm-xa} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename tests/ref/fate/{adpcm-psx-str-v3 => adpcm-xa} (100%) diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 9e06efe0cb..3a5fa35f98 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -55,12 +55,12 @@ fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn FATE_ADPCM += fate-adpcm-ms-mono fate-adpcm-ms-mono: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -vn -FATE_ADPCM += fate-adpcm-psx-str-v3 -fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn - FATE_ADPCM += fate-adpcm-thp fate-adpcm-thp: CMD = framecrc -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -vn +FATE_ADPCM += fate-adpcm-xa +fate-adpcm-xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn + FATE_ADPCM += fate-adpcm_ms-stereo fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le diff --git a/tests/ref/fate/adpcm-psx-str-v3 b/tests/ref/fate/adpcm-xa similarity index 100% rename from tests/ref/fate/adpcm-psx-str-v3 rename to tests/ref/fate/adpcm-xa From 9656b7f2aedec76fd523a9c3e9b8bb07c8027056 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 17:38:41 +0100 Subject: [PATCH 13/25] fate: rename cryo-apc to adpcm-ima-apc This matches the name of the tested codec. Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 3 +++ tests/fate/demux.mak | 3 --- tests/ref/fate/{cryo-apc => adpcm-ima-apc} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename tests/ref/fate/{cryo-apc => adpcm-ima-apc} (100%) diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 3a5fa35f98..fa98063aa5 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -31,6 +31,9 @@ fate-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -vn FATE_ADPCM += fate-adpcm-ima-amv fate-adpcm-ima-amv: CMD = framecrc -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn +FATE_ADPCM += fate-adpcm-ima-apc +fate-adpcm-ima-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le + FATE_ADPCM += fate-adpcm-ima-dk3 fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index eb706de94c..cb68e80e49 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -13,9 +13,6 @@ fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf FATE_AVCONV += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy -FATE_AVCONV += fate-cryo-apc -fate-cryo-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le - FATE_AVCONV += fate-d-cinema-demux fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24 diff --git a/tests/ref/fate/cryo-apc b/tests/ref/fate/adpcm-ima-apc similarity index 100% rename from tests/ref/fate/cryo-apc rename to tests/ref/fate/adpcm-ima-apc From 838521e1104ccb7d09c949f9be1f85c8a7195c42 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 17:43:54 +0100 Subject: [PATCH 14/25] fate: rename funcom-iss to adpcm-ima-iss This matches the name of the codec. Signed-off-by: Mans Rullgard --- tests/fate/adpcm.mak | 3 +++ tests/fate/demux.mak | 3 --- tests/ref/fate/{funcom-iss => adpcm-ima-iss} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename tests/ref/fate/{funcom-iss => adpcm-ima-iss} (100%) diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index fa98063aa5..8a96851cb1 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -46,6 +46,9 @@ fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV FATE_ADPCM += fate-adpcm-ima-ea-sead fate-adpcm-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -vn +FATE_ADPCM += fate-adpcm-ima-iss +fate-adpcm-ima-iss: CMD = md5 -i $(SAMPLES)/funcom-iss/0004010100.iss -f s16le + FATE_ADPCM += fate-adpcm-ima-smjpeg fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index cb68e80e49..ad70c474c1 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -16,9 +16,6 @@ fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -aco FATE_AVCONV += fate-d-cinema-demux fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24 -FATE_AVCONV += fate-funcom-iss -fate-funcom-iss: CMD = md5 -i $(SAMPLES)/funcom-iss/0004010100.iss -f s16le - FATE_AVCONV += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 diff --git a/tests/ref/fate/funcom-iss b/tests/ref/fate/adpcm-ima-iss similarity index 100% rename from tests/ref/fate/funcom-iss rename to tests/ref/fate/adpcm-ima-iss From cd7b82c5d1f9d2205c107d32bb3ff13d327adb5c Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 16:48:17 +0100 Subject: [PATCH 15/25] fate: split off dpcm-interplay from interplay-mve tests These two files use the same audio codec so only one test for this is needed. Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 6 -- tests/fate/dpcm.mak | 3 + tests/fate/video.mak | 6 ++ tests/ref/fate/dpcm-interplay | 125 +++++++++++++++++++++++++++++ tests/ref/fate/interplay-mve-16bit | 80 ------------------ tests/ref/fate/interplay-mve-8bit | 125 ----------------------------- 6 files changed, 134 insertions(+), 211 deletions(-) create mode 100644 tests/ref/fate/dpcm-interplay diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index ad70c474c1..6fd1b8cb66 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -16,12 +16,6 @@ fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -aco FATE_AVCONV += fate-d-cinema-demux fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24 -FATE_AVCONV += fate-interplay-mve-16bit -fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 - -FATE_AVCONV += fate-interplay-mve-8bit -fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 - FATE_AVCONV += fate-iv8-demux fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak index 36a33db220..c4dd9d52ec 100644 --- a/tests/fate/dpcm.mak +++ b/tests/fate/dpcm.mak @@ -1,6 +1,9 @@ FATE_DPCM += fate-dpcm-idroq fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -vn +FATE_DPCM += fate-dpcm-interplay +fate-dpcm-interplay: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn + FATE_DPCM += fate-dpcm-sierra fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le diff --git a/tests/fate/video.mak b/tests/fate/video.mak index ba2964097d..a6829ab6f3 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -130,6 +130,12 @@ fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 FATE_AVCONV += $(FATE_IFF) fate-iff: $(FATE_IFF) +FATE_AVCONV += fate-interplay-mve-8bit +fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an + +FATE_AVCONV += fate-interplay-mve-16bit +fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an + FATE_AVCONV += fate-kgv1 fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an diff --git a/tests/ref/fate/dpcm-interplay b/tests/ref/fate/dpcm-interplay new file mode 100644 index 0000000000..bda8a8f8d9 --- /dev/null +++ b/tests/ref/fate/dpcm-interplay @@ -0,0 +1,125 @@ +#tb 0: 1/22050 +0, 0, 0, 1462, 5848, 0xea04292b +0, 1462, 1462, 1472, 5888, 0x0e59e942 +0, 2934, 2934, 1472, 5888, 0x56d480f6 +0, 4406, 4406, 1472, 5888, 0xcb560b22 +0, 5878, 5878, 1472, 5888, 0xca26865b +0, 7350, 7350, 1472, 5888, 0xa434392f +0, 8822, 8822, 1472, 5888, 0xa0615fe4 +0, 10294, 10294, 1472, 5888, 0x85b241cd +0, 11766, 11766, 1472, 5888, 0x2c417a43 +0, 13238, 13238, 1472, 5888, 0x2d5ed665 +0, 14710, 14710, 1472, 5888, 0x37267a2d +0, 16182, 16182, 1472, 5888, 0x1f803c67 +0, 17654, 17654, 1472, 5888, 0xfb7940ef +0, 19126, 19126, 1472, 5888, 0x1a5371e8 +0, 20598, 20598, 1472, 5888, 0x37e29b21 +0, 22070, 22070, 1462, 5848, 0x70065769 +0, 23532, 23532, 1472, 5888, 0xaf624f3d +0, 25004, 25004, 1472, 5888, 0x8f5e5b57 +0, 26476, 26476, 1472, 5888, 0x93545968 +0, 27948, 27948, 1472, 5888, 0x915f268f +0, 29420, 29420, 1472, 5888, 0x9cd48ac4 +0, 30892, 30892, 1472, 5888, 0x812c8e13 +0, 32364, 32364, 1472, 5888, 0xe794a2a7 +0, 33836, 33836, 1472, 5888, 0x4a056e4b +0, 35308, 35308, 1472, 5888, 0xa3589992 +0, 36780, 36780, 1472, 5888, 0x19ea7ec5 +0, 38252, 38252, 1472, 5888, 0x422d5097 +0, 39724, 39724, 1472, 5888, 0xc9fd963f +0, 41196, 41196, 1472, 5888, 0xc556a5ea +0, 42668, 42668, 1472, 5888, 0x51557e0f +0, 44140, 44140, 1462, 5848, 0x4903ad21 +0, 45602, 45602, 1472, 5888, 0xb1c85e85 +0, 47074, 47074, 1472, 5888, 0x68963d65 +0, 48546, 48546, 1472, 5888, 0x62a3124e +0, 50018, 50018, 1472, 5888, 0x4ff1878f +0, 51490, 51490, 1472, 5888, 0x8b09ac18 +0, 52962, 52962, 1472, 5888, 0x67d85338 +0, 54434, 54434, 1472, 5888, 0x82eca0a6 +0, 55906, 55906, 1472, 5888, 0x81a17eb8 +0, 57378, 57378, 1472, 5888, 0x7108478c +0, 58850, 58850, 1472, 5888, 0xbfc18b09 +0, 60322, 60322, 1472, 5888, 0xad93711f +0, 61794, 61794, 1472, 5888, 0xf8d25e39 +0, 63266, 63266, 1472, 5888, 0x41edd04e +0, 64738, 64738, 1472, 5888, 0xa6557ee2 +0, 66210, 66210, 1462, 5848, 0xc14d5456 +0, 67672, 67672, 1472, 5888, 0x20a7821f +0, 69144, 69144, 1472, 5888, 0x9f1a8f9d +0, 70616, 70616, 1472, 5888, 0x2f3c6cc8 +0, 72088, 72088, 1472, 5888, 0x757c894a +0, 73560, 73560, 1472, 5888, 0x483e98bb +0, 75032, 75032, 1472, 5888, 0x84289c75 +0, 76504, 76504, 1472, 5888, 0xf79d5a91 +0, 77976, 77976, 1472, 5888, 0x395b5228 +0, 79448, 79448, 1472, 5888, 0x9c937a14 +0, 80920, 80920, 1472, 5888, 0x40c169cf +0, 82392, 82392, 1472, 5888, 0x3e7f99b0 +0, 83864, 83864, 1472, 5888, 0xd4de993e +0, 85336, 85336, 1472, 5888, 0xae856b09 +0, 86808, 86808, 1472, 5888, 0xa2369c95 +0, 88280, 88280, 1462, 5848, 0x992d516b +0, 89742, 89742, 1472, 5888, 0xcd785ba9 +0, 91214, 91214, 1472, 5888, 0x55ea3bce +0, 92686, 92686, 1472, 5888, 0xf06d4bbf +0, 94158, 94158, 1472, 5888, 0x2a9d4c1a +0, 95630, 95630, 1472, 5888, 0xd5e348a3 +0, 97102, 97102, 1472, 5888, 0x6431a24c +0, 98574, 98574, 1472, 5888, 0x41f9908c +0, 100046, 100046, 1472, 5888, 0x0ed99656 +0, 101518, 101518, 1472, 5888, 0x635a6392 +0, 102990, 102990, 1472, 5888, 0x690c750c +0, 104462, 104462, 1472, 5888, 0xf9d97b23 +0, 105934, 105934, 1472, 5888, 0x75e1606b +0, 107406, 107406, 1472, 5888, 0x1bcb43b0 +0, 108878, 108878, 1472, 5888, 0x48c295cb +0, 110350, 110350, 1462, 5848, 0xe47f7b5d +0, 111812, 111812, 1472, 5888, 0x20be7f3e +0, 113284, 113284, 1472, 5888, 0x8c2428c4 +0, 114756, 114756, 1472, 5888, 0x851379af +0, 116228, 116228, 1472, 5888, 0x5916647d +0, 117700, 117700, 1472, 5888, 0xef9c6281 +0, 119172, 119172, 1472, 5888, 0x49660d32 +0, 120644, 120644, 1472, 5888, 0x62cf36a1 +0, 122116, 122116, 1472, 5888, 0x56dff39c +0, 123588, 123588, 1472, 5888, 0x4e6b5b02 +0, 125060, 125060, 1472, 5888, 0xb8697067 +0, 126532, 126532, 1472, 5888, 0xcb4e2706 +0, 128004, 128004, 1472, 5888, 0x6eaa9669 +0, 129476, 129476, 1472, 5888, 0xfd9d7dba +0, 130948, 130948, 1472, 5888, 0xfe137923 +0, 132420, 132420, 1462, 5848, 0x1931296f +0, 133882, 133882, 1472, 5888, 0xa09a7c03 +0, 135354, 135354, 1472, 5888, 0xded9802d +0, 136826, 136826, 1472, 5888, 0x9f6723b7 +0, 138298, 138298, 1472, 5888, 0x3ad02476 +0, 139770, 139770, 1472, 5888, 0xa1647e32 +0, 141242, 141242, 1472, 5888, 0x728672da +0, 142714, 142714, 1472, 5888, 0x9c098090 +0, 144186, 144186, 1472, 5888, 0x32a65ea3 +0, 145658, 145658, 1472, 5888, 0xdde141d5 +0, 147130, 147130, 1472, 5888, 0x816c5fb4 +0, 148602, 148602, 1472, 5888, 0x75e17581 +0, 150074, 150074, 1472, 5888, 0x59035469 +0, 151546, 151546, 1472, 5888, 0x20d340cd +0, 153018, 153018, 1472, 5888, 0xa89a8790 +0, 154490, 154490, 1462, 5848, 0x12b74c34 +0, 155952, 155952, 1472, 5888, 0xcd3b3bef +0, 157424, 157424, 1472, 5888, 0xe5c44bf3 +0, 158896, 158896, 1472, 5888, 0xb82c4fa4 +0, 160368, 160368, 1472, 5888, 0x05b2443a +0, 161840, 161840, 1472, 5888, 0x78028172 +0, 163312, 163312, 1472, 5888, 0xdfcac19a +0, 164784, 164784, 1472, 5888, 0x0761a0b9 +0, 166256, 166256, 1472, 5888, 0x77d88607 +0, 167728, 167728, 1472, 5888, 0xdd7f4d77 +0, 169200, 169200, 1472, 5888, 0x366bf58a +0, 170672, 170672, 1472, 5888, 0x9a3d59b5 +0, 172144, 172144, 1472, 5888, 0x16cb777f +0, 173616, 173616, 1472, 5888, 0x1d4afe64 +0, 175088, 175088, 1472, 5888, 0xc0fe1e73 +0, 176560, 176560, 1462, 5848, 0xcceb69c8 +0, 178022, 178022, 1472, 5888, 0x89449643 +0, 179494, 179494, 1472, 5888, 0x5fe595b7 +0, 180966, 180966, 1472, 5888, 0x400a8c77 diff --git a/tests/ref/fate/interplay-mve-16bit b/tests/ref/fate/interplay-mve-16bit index 35dc14be90..2469aaac59 100644 --- a/tests/ref/fate/interplay-mve-16bit +++ b/tests/ref/fate/interplay-mve-16bit @@ -1,131 +1,51 @@ #tb 0: 1/1000000 -#tb 1: 1/44100 0, 0, 0, 0, 614400, 0x00000000 -1, 0, 0, 1447, 5788, 0x916d2db8 -1, 1447, 1447, 1472, 5888, 0xc65cb069 0, 33360, 33360, 0, 614400, 0x00000000 -1, 2919, 2919, 1472, 5888, 0xd8ec1acc 0, 66720, 66720, 0, 614400, 0xa17ea4ec -1, 4391, 4391, 1472, 5888, 0xb22af0d6 0, 100080, 100080, 0, 614400, 0x4fd207fb -1, 5863, 5863, 1472, 5888, 0x86bb50d9 0, 133440, 133440, 0, 614400, 0xd7a510fb -1, 7335, 7335, 1472, 5888, 0x7674d923 0, 166800, 166800, 0, 614400, 0xe901e2f4 -1, 8807, 8807, 1472, 5888, 0xb97c5500 0, 200160, 200160, 0, 614400, 0x4ac5d3c4 -1, 10279, 10279, 1472, 5888, 0xecea1249 0, 233520, 233520, 0, 614400, 0x32e3e99c -1, 11751, 11751, 1472, 5888, 0x0f4fea81 0, 266880, 266880, 0, 614400, 0x7a2ff20c -1, 13223, 13223, 1472, 5888, 0x997914d8 0, 300240, 300240, 0, 614400, 0x59941193 -1, 14695, 14695, 1472, 5888, 0xd012f03a 0, 333600, 333600, 0, 614400, 0x92773a2b -1, 16167, 16167, 1472, 5888, 0x03fd5248 0, 366960, 366960, 0, 614400, 0x4cd14313 -1, 17639, 17639, 1472, 5888, 0x3041a288 0, 400320, 400320, 0, 614400, 0x2a093fa3 -1, 19111, 19111, 1472, 5888, 0xe6105de1 0, 433680, 433680, 0, 614400, 0xf68b8463 -1, 20583, 20583, 1472, 5888, 0xaa38c7bd 0, 467040, 467040, 0, 614400, 0xa9e1969b -1, 22055, 22055, 1472, 5888, 0xbfff702c 0, 500400, 500400, 0, 614400, 0x461996bb -1, 23527, 23527, 1472, 5888, 0xbe4319a3 0, 533760, 533760, 0, 614400, 0xae58d053 -1, 24999, 24999, 1472, 5888, 0x2e89d262 0, 567120, 567120, 0, 614400, 0x7693015a -1, 26471, 26471, 1472, 5888, 0x10992b9c 0, 600480, 600480, 0, 614400, 0x0b3507fa -1, 27943, 27943, 1472, 5888, 0x972904bf 0, 633840, 633840, 0, 614400, 0xff5c2492 -1, 29415, 29415, 1472, 5888, 0x0093501c 0, 667200, 667200, 0, 614400, 0x636e3e32 -1, 30887, 30887, 1472, 5888, 0x8994ad0e 0, 700560, 700560, 0, 614400, 0x1acd6d0a -1, 32359, 32359, 1472, 5888, 0x9db37d21 0, 733920, 733920, 0, 614400, 0x67039232 -1, 33831, 33831, 1472, 5888, 0xa8c7300f 0, 767280, 767280, 0, 614400, 0x8ab9c75a -1, 35303, 35303, 1472, 5888, 0x1b7073b5 0, 800640, 800640, 0, 614400, 0xe824bbe2 -1, 36775, 36775, 1472, 5888, 0x56ad7f7b 0, 834000, 834000, 0, 614400, 0x5133e9ea -1, 38247, 38247, 1472, 5888, 0x9706a8fb 0, 867360, 867360, 0, 614400, 0xcecf1249 -1, 39719, 39719, 1472, 5888, 0x16c9420e 0, 900720, 900720, 0, 614400, 0xe6d928c1 -1, 41191, 41191, 1472, 5888, 0x3e11be0a 0, 934080, 934080, 0, 614400, 0x8da46ff1 -1, 42663, 42663, 1472, 5888, 0x3e534a32 0, 967440, 967440, 0, 614400, 0x1c778319 -1, 44135, 44135, 1447, 5788, 0x0ffae5f4 0, 1000800, 1000800, 0, 614400, 0x35a19451 -1, 45582, 45582, 1472, 5888, 0xc2018f82 0, 1034160, 1034160, 0, 614400, 0x5145d1b9 -1, 47054, 47054, 1472, 5888, 0x2a11f529 0, 1067520, 1067520, 0, 614400, 0x146ee231 -1, 48526, 48526, 1472, 5888, 0xec282167 0, 1100880, 1100880, 0, 614400, 0xd9b33380 -1, 49998, 49998, 1472, 5888, 0xd61b5a05 0, 1134240, 1134240, 0, 614400, 0x8b112ef8 -1, 51470, 51470, 1472, 5888, 0x61de2741 0, 1167600, 1167600, 0, 614400, 0xb9e79ab0 -1, 52942, 52942, 1472, 5888, 0x17aaff8c 0, 1200960, 1200960, 0, 614400, 0x62d3a498 -1, 54414, 54414, 1472, 5888, 0xd40cd7a6 0, 1234320, 1234320, 0, 614400, 0xaeaaaa58 -1, 55886, 55886, 1472, 5888, 0x840840d4 0, 1267680, 1267680, 0, 614400, 0x8922c440 -1, 57358, 57358, 1472, 5888, 0x7c97ddcf 0, 1301040, 1301040, 0, 614400, 0xd62ef758 -1, 58830, 58830, 1472, 5888, 0xed9150f7 0, 1334400, 1334400, 0, 614400, 0x2a53149f -1, 60302, 60302, 1472, 5888, 0xbccf973e 0, 1367760, 1367760, 0, 614400, 0x13da47df -1, 61774, 61774, 1472, 5888, 0x74bda5ea 0, 1401120, 1401120, 0, 614400, 0x27c05c3f -1, 63246, 63246, 1472, 5888, 0xd083892a 0, 1434480, 1434480, 0, 614400, 0x41ff7ca7 -1, 64718, 64718, 1472, 5888, 0x16e444b2 0, 1467840, 1467840, 0, 614400, 0x6b0e8a07 -1, 66190, 66190, 1472, 5888, 0x68a9cedb 0, 1501200, 1501200, 0, 614400, 0xa200ad9f -1, 67662, 67662, 1472, 5888, 0x80849f36 0, 1534560, 1534560, 0, 614400, 0x9da7cc77 -1, 69134, 69134, 1472, 5888, 0x63cb7df9 0, 1567920, 1567920, 0, 614400, 0x2f5703be -1, 70606, 70606, 1472, 5888, 0xf90f754d 0, 1601280, 1601280, 0, 614400, 0x91c720f6 -1, 72078, 72078, 1472, 5888, 0x9c2c867d 0, 1634640, 1634640, 0, 614400, 0x927a882e -1, 73550, 73550, 1472, 5888, 0x337994a4 -1, 75022, 75022, 1472, 5888, 0xf354a28d -1, 76494, 76494, 1472, 5888, 0x70933738 -1, 77966, 77966, 1472, 5888, 0x3c019219 -1, 79438, 79438, 1472, 5888, 0xe0c21295 -1, 80910, 80910, 1472, 5888, 0x21869515 -1, 82382, 82382, 1472, 5888, 0xe9b1ec7d -1, 83854, 83854, 1472, 5888, 0x57825497 -1, 85326, 85326, 1472, 5888, 0xae02ebeb -1, 86798, 86798, 1472, 5888, 0x0c62e14f -1, 88270, 88270, 1447, 5788, 0x8a255f8f -1, 89717, 89717, 1472, 5888, 0x38993359 -1, 91189, 91189, 1472, 5888, 0x390baf95 -1, 92661, 92661, 1472, 5888, 0xb72c72ea -1, 94133, 94133, 1472, 5888, 0xbbd3c6fe -1, 95605, 95605, 1472, 5888, 0xefb26f0a -1, 97077, 97077, 1472, 5888, 0xcc404dd0 -1, 98549, 98549, 1472, 5888, 0xffa23082 -1, 100021, 100021, 1472, 5888, 0xd0c43567 -1, 101493, 101493, 1472, 5888, 0x4d3b7958 -1, 102965, 102965, 1472, 5888, 0x47125aa1 -1, 104437, 104437, 1472, 5888, 0x99286cf3 -1, 105909, 105909, 1472, 5888, 0x478d61e2 -1, 107381, 107381, 1472, 5888, 0xac65b47e -1, 108853, 108853, 1472, 5888, 0x333c1d1a -1, 110325, 110325, 1472, 5888, 0x8f960ecf -1, 111797, 111797, 1472, 5888, 0x58f76aec -1, 113269, 113269, 1472, 5888, 0xb5e0dded -1, 114741, 114741, 1472, 5888, 0xaf1a8f9a diff --git a/tests/ref/fate/interplay-mve-8bit b/tests/ref/fate/interplay-mve-8bit index 33630e9122..abd86eb46d 100644 --- a/tests/ref/fate/interplay-mve-8bit +++ b/tests/ref/fate/interplay-mve-8bit @@ -1,236 +1,111 @@ #tb 0: 1/1000000 -#tb 1: 1/22050 0, 0, 0, 0, 414720, 0xa5cd50ca -1, 0, 0, 1462, 5848, 0xea04292b -1, 1462, 1462, 1472, 5888, 0x0e59e942 0, 66728, 66728, 0, 414720, 0x3facd321 -1, 2934, 2934, 1472, 5888, 0x56d480f6 0, 133456, 133456, 0, 414720, 0x849e6d4b -1, 4406, 4406, 1472, 5888, 0xcb560b22 0, 200184, 200184, 0, 414720, 0xe649363f -1, 5878, 5878, 1472, 5888, 0xca26865b 0, 266912, 266912, 0, 414720, 0x5bbd7b14 -1, 7350, 7350, 1472, 5888, 0xa434392f 0, 333640, 333640, 0, 414720, 0xe246ab51 -1, 8822, 8822, 1472, 5888, 0xa0615fe4 0, 400368, 400368, 0, 414720, 0x5721b22e -1, 10294, 10294, 1472, 5888, 0x85b241cd 0, 467096, 467096, 0, 414720, 0xe391e107 -1, 11766, 11766, 1472, 5888, 0x2c417a43 0, 533824, 533824, 0, 414720, 0x04d851ff -1, 13238, 13238, 1472, 5888, 0x2d5ed665 0, 600552, 600552, 0, 414720, 0x8d80d580 -1, 14710, 14710, 1472, 5888, 0x37267a2d 0, 667280, 667280, 0, 414720, 0x5a24b0bc -1, 16182, 16182, 1472, 5888, 0x1f803c67 0, 734008, 734008, 0, 414720, 0x06cd6960 -1, 17654, 17654, 1472, 5888, 0xfb7940ef 0, 800736, 800736, 0, 414720, 0xf5ca48b4 -1, 19126, 19126, 1472, 5888, 0x1a5371e8 0, 867464, 867464, 0, 414720, 0x24700f94 -1, 20598, 20598, 1472, 5888, 0x37e29b21 0, 934192, 934192, 0, 414720, 0xb0bfe451 -1, 22070, 22070, 1462, 5848, 0x70065769 0, 1000920, 1000920, 0, 414720, 0x00e9f3d1 -1, 23532, 23532, 1472, 5888, 0xaf624f3d 0, 1067648, 1067648, 0, 414720, 0x0efbffd1 -1, 25004, 25004, 1472, 5888, 0x8f5e5b57 0, 1134376, 1134376, 0, 414720, 0x2ecdfc8d -1, 26476, 26476, 1472, 5888, 0x93545968 0, 1201104, 1201104, 0, 414720, 0x94b531fc -1, 27948, 27948, 1472, 5888, 0x915f268f 0, 1267832, 1267832, 0, 414720, 0x2c2579f8 -1, 29420, 29420, 1472, 5888, 0x9cd48ac4 0, 1334560, 1334560, 0, 414720, 0x6c7ecfb8 -1, 30892, 30892, 1472, 5888, 0x812c8e13 0, 1401288, 1401288, 0, 414720, 0x08982527 -1, 32364, 32364, 1472, 5888, 0xe794a2a7 0, 1468016, 1468016, 0, 414720, 0x5c0161b3 -1, 33836, 33836, 1472, 5888, 0x4a056e4b 0, 1534744, 1534744, 0, 414720, 0x453ce413 -1, 35308, 35308, 1472, 5888, 0xa3589992 0, 1601472, 1601472, 0, 414720, 0x634e36b2 -1, 36780, 36780, 1472, 5888, 0x19ea7ec5 0, 1668200, 1668200, 0, 414720, 0x401a683a -1, 38252, 38252, 1472, 5888, 0x422d5097 0, 1734928, 1734928, 0, 414720, 0x3c5f442e -1, 39724, 39724, 1472, 5888, 0xc9fd963f 0, 1801656, 1801656, 0, 414720, 0x075ef787 -1, 41196, 41196, 1472, 5888, 0xc556a5ea 0, 1868384, 1868384, 0, 414720, 0x8501a04f -1, 42668, 42668, 1472, 5888, 0x51557e0f 0, 1935112, 1935112, 0, 414720, 0x3620093b -1, 44140, 44140, 1462, 5848, 0x4903ad21 0, 2001840, 2001840, 0, 414720, 0xa42d9480 -1, 45602, 45602, 1472, 5888, 0xb1c85e85 0, 2068568, 2068568, 0, 414720, 0x09b150b4 -1, 47074, 47074, 1472, 5888, 0x68963d65 0, 2135296, 2135296, 0, 414720, 0xcad407f0 -1, 48546, 48546, 1472, 5888, 0x62a3124e 0, 2202024, 2202024, 0, 414720, 0x69e5eecd -1, 50018, 50018, 1472, 5888, 0x4ff1878f 0, 2268752, 2268752, 0, 414720, 0xb92ad2d9 -1, 51490, 51490, 1472, 5888, 0x8b09ac18 0, 2335480, 2335480, 0, 414720, 0xc78eaf29 -1, 52962, 52962, 1472, 5888, 0x67d85338 0, 2402208, 2402208, 0, 414720, 0x47c3fa91 -1, 54434, 54434, 1472, 5888, 0x82eca0a6 0, 2468936, 2468936, 0, 414720, 0x8847b7b8 -1, 55906, 55906, 1472, 5888, 0x81a17eb8 0, 2535664, 2535664, 0, 414720, 0x864cab2f -1, 57378, 57378, 1472, 5888, 0x7108478c 0, 2602392, 2602392, 0, 414720, 0x78d653e2 -1, 58850, 58850, 1472, 5888, 0xbfc18b09 0, 2669120, 2669120, 0, 414720, 0xda15cbd2 -1, 60322, 60322, 1472, 5888, 0xad93711f 0, 2735848, 2735848, 0, 414720, 0xdf9ce28a -1, 61794, 61794, 1472, 5888, 0xf8d25e39 0, 2802576, 2802576, 0, 414720, 0xe88c49ca -1, 63266, 63266, 1472, 5888, 0x41edd04e 0, 2869304, 2869304, 0, 414720, 0xd6bcbc07 -1, 64738, 64738, 1472, 5888, 0xa6557ee2 0, 2936032, 2936032, 0, 414720, 0xf0b4a7bf -1, 66210, 66210, 1462, 5848, 0xc14d5456 0, 3002760, 3002760, 0, 414720, 0x74f9bfbf -1, 67672, 67672, 1472, 5888, 0x20a7821f 0, 3069488, 3069488, 0, 414720, 0x904ce103 -1, 69144, 69144, 1472, 5888, 0x9f1a8f9d 0, 3136216, 3136216, 0, 414720, 0xca877e4a -1, 70616, 70616, 1472, 5888, 0x2f3c6cc8 0, 3202944, 3202944, 0, 414720, 0x588effd6 -1, 72088, 72088, 1472, 5888, 0x757c894a 0, 3269672, 3269672, 0, 414720, 0x6dff8b71 -1, 73560, 73560, 1472, 5888, 0x483e98bb 0, 3336400, 3336400, 0, 414720, 0xbeaae788 -1, 75032, 75032, 1472, 5888, 0x84289c75 0, 3403128, 3403128, 0, 414720, 0x1a4d1242 -1, 76504, 76504, 1472, 5888, 0xf79d5a91 0, 3469856, 3469856, 0, 414720, 0x4ae98ea0 -1, 77976, 77976, 1472, 5888, 0x395b5228 0, 3536584, 3536584, 0, 414720, 0x41ed6d22 -1, 79448, 79448, 1472, 5888, 0x9c937a14 0, 3603312, 3603312, 0, 414720, 0x486e70aa -1, 80920, 80920, 1472, 5888, 0x40c169cf 0, 3670040, 3670040, 0, 414720, 0xfddc103e -1, 82392, 82392, 1472, 5888, 0x3e7f99b0 0, 3736768, 3736768, 0, 414720, 0x8620f03e -1, 83864, 83864, 1472, 5888, 0xd4de993e 0, 3803496, 3803496, 0, 414720, 0x0e4ec273 -1, 85336, 85336, 1472, 5888, 0xae856b09 0, 3870224, 3870224, 0, 414720, 0xb2298b3e -1, 86808, 86808, 1472, 5888, 0xa2369c95 0, 3936952, 3936952, 0, 414720, 0xb4f50176 -1, 88280, 88280, 1462, 5848, 0x992d516b 0, 4003680, 4003680, 0, 414720, 0xb9c7a495 -1, 89742, 89742, 1472, 5888, 0xcd785ba9 0, 4070408, 4070408, 0, 414720, 0xed270702 -1, 91214, 91214, 1472, 5888, 0x55ea3bce 0, 4137136, 4137136, 0, 414720, 0x98b72586 -1, 92686, 92686, 1472, 5888, 0xf06d4bbf 0, 4203864, 4203864, 0, 414720, 0xd8977cb1 -1, 94158, 94158, 1472, 5888, 0x2a9d4c1a 0, 4270592, 4270592, 0, 414720, 0xff3d3851 -1, 95630, 95630, 1472, 5888, 0xd5e348a3 0, 4337320, 4337320, 0, 414720, 0x7e4f0424 -1, 97102, 97102, 1472, 5888, 0x6431a24c 0, 4404048, 4404048, 0, 414720, 0xa9e75006 -1, 98574, 98574, 1472, 5888, 0x41f9908c 0, 4470776, 4470776, 0, 414720, 0x8f98cba9 -1, 100046, 100046, 1472, 5888, 0x0ed99656 0, 4537504, 4537504, 0, 414720, 0x25ecd620 -1, 101518, 101518, 1472, 5888, 0x635a6392 0, 4604232, 4604232, 0, 414720, 0x78cf5c58 -1, 102990, 102990, 1472, 5888, 0x690c750c 0, 4670960, 4670960, 0, 414720, 0x3fb4b81a -1, 104462, 104462, 1472, 5888, 0xf9d97b23 0, 4737688, 4737688, 0, 414720, 0xd7b655fa -1, 105934, 105934, 1472, 5888, 0x75e1606b 0, 4804416, 4804416, 0, 414720, 0xd9158db3 -1, 107406, 107406, 1472, 5888, 0x1bcb43b0 0, 4871144, 4871144, 0, 414720, 0x2e651852 -1, 108878, 108878, 1472, 5888, 0x48c295cb 0, 4937872, 4937872, 0, 414720, 0x9f9adb64 -1, 110350, 110350, 1462, 5848, 0xe47f7b5d 0, 5004600, 5004600, 0, 414720, 0xe9d16e81 -1, 111812, 111812, 1472, 5888, 0x20be7f3e 0, 5071328, 5071328, 0, 414720, 0xbe73daf5 -1, 113284, 113284, 1472, 5888, 0x8c2428c4 0, 5138056, 5138056, 0, 414720, 0x3d164329 -1, 114756, 114756, 1472, 5888, 0x851379af 0, 5204784, 5204784, 0, 414720, 0x1d5a9bc8 -1, 116228, 116228, 1472, 5888, 0x5916647d 0, 5271512, 5271512, 0, 414720, 0x8e8debbe -1, 117700, 117700, 1472, 5888, 0xef9c6281 0, 5338240, 5338240, 0, 414720, 0x4e7a2bf0 -1, 119172, 119172, 1472, 5888, 0x49660d32 0, 5404968, 5404968, 0, 414720, 0x4a13804d -1, 120644, 120644, 1472, 5888, 0x62cf36a1 0, 5471696, 5471696, 0, 414720, 0x5dd188d8 -1, 122116, 122116, 1472, 5888, 0x56dff39c 0, 5538424, 5538424, 0, 414720, 0xbe7f4963 -1, 123588, 123588, 1472, 5888, 0x4e6b5b02 0, 5605152, 5605152, 0, 414720, 0xcff3b767 -1, 125060, 125060, 1472, 5888, 0xb8697067 0, 5671880, 5671880, 0, 414720, 0xbbd3afa0 -1, 126532, 126532, 1472, 5888, 0xcb4e2706 0, 5738608, 5738608, 0, 414720, 0xaf9dec62 -1, 128004, 128004, 1472, 5888, 0x6eaa9669 0, 5805336, 5805336, 0, 414720, 0xc74816a1 -1, 129476, 129476, 1472, 5888, 0xfd9d7dba 0, 5872064, 5872064, 0, 414720, 0x51488bfc -1, 130948, 130948, 1472, 5888, 0xfe137923 0, 5938792, 5938792, 0, 414720, 0x68c10a2c -1, 132420, 132420, 1462, 5848, 0x1931296f 0, 6005520, 6005520, 0, 414720, 0x10179c4e -1, 133882, 133882, 1472, 5888, 0xa09a7c03 0, 6072248, 6072248, 0, 414720, 0x18d559b7 -1, 135354, 135354, 1472, 5888, 0xded9802d 0, 6138976, 6138976, 0, 414720, 0x8257aa55 -1, 136826, 136826, 1472, 5888, 0x9f6723b7 0, 6205704, 6205704, 0, 414720, 0x9ea24501 -1, 138298, 138298, 1472, 5888, 0x3ad02476 0, 6272432, 6272432, 0, 414720, 0x238605cc -1, 139770, 139770, 1472, 5888, 0xa1647e32 0, 6339160, 6339160, 0, 414720, 0xb552deaa -1, 141242, 141242, 1472, 5888, 0x728672da 0, 6405888, 6405888, 0, 414720, 0x07c3348d -1, 142714, 142714, 1472, 5888, 0x9c098090 0, 6472616, 6472616, 0, 414720, 0x82f4f9b0 -1, 144186, 144186, 1472, 5888, 0x32a65ea3 0, 6539344, 6539344, 0, 414720, 0xf5d76bc5 -1, 145658, 145658, 1472, 5888, 0xdde141d5 0, 6606072, 6606072, 0, 414720, 0x34b3a1e6 -1, 147130, 147130, 1472, 5888, 0x816c5fb4 0, 6672800, 6672800, 0, 414720, 0xda25e11b -1, 148602, 148602, 1472, 5888, 0x75e17581 0, 6739528, 6739528, 0, 414720, 0x2b19936b -1, 150074, 150074, 1472, 5888, 0x59035469 0, 6806256, 6806256, 0, 414720, 0xe91f9f73 -1, 151546, 151546, 1472, 5888, 0x20d340cd 0, 6872984, 6872984, 0, 414720, 0x48d09aab -1, 153018, 153018, 1472, 5888, 0xa89a8790 0, 6939712, 6939712, 0, 414720, 0xac42bf83 -1, 154490, 154490, 1462, 5848, 0x12b74c34 0, 7006440, 7006440, 0, 414720, 0x2d8ca14e -1, 155952, 155952, 1472, 5888, 0xcd3b3bef 0, 7073168, 7073168, 0, 414720, 0xe65462fd -1, 157424, 157424, 1472, 5888, 0xe5c44bf3 0, 7139896, 7139896, 0, 414720, 0xe5bfc929 -1, 158896, 158896, 1472, 5888, 0xb82c4fa4 0, 7206624, 7206624, 0, 414720, 0x66784c58 -1, 160368, 160368, 1472, 5888, 0x05b2443a 0, 7273352, 7273352, 0, 414720, 0x70dbeca8 -1, 161840, 161840, 1472, 5888, 0x78028172 -1, 163312, 163312, 1472, 5888, 0xdfcac19a -1, 164784, 164784, 1472, 5888, 0x0761a0b9 -1, 166256, 166256, 1472, 5888, 0x77d88607 -1, 167728, 167728, 1472, 5888, 0xdd7f4d77 -1, 169200, 169200, 1472, 5888, 0x366bf58a -1, 170672, 170672, 1472, 5888, 0x9a3d59b5 -1, 172144, 172144, 1472, 5888, 0x16cb777f -1, 173616, 173616, 1472, 5888, 0x1d4afe64 -1, 175088, 175088, 1472, 5888, 0xc0fe1e73 -1, 176560, 176560, 1462, 5848, 0xcceb69c8 -1, 178022, 178022, 1472, 5888, 0x89449643 -1, 179494, 179494, 1472, 5888, 0x5fe595b7 -1, 180966, 180966, 1472, 5888, 0x400a8c77 From 0bbb330ee3ca23b952a58a3a80d100e694bb4720 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 18:30:44 +0100 Subject: [PATCH 16/25] fate: d-cinema-demux: drop unnecessary flags Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 6fd1b8cb66..9721037b53 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -14,7 +14,7 @@ FATE_AVCONV += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy FATE_AVCONV += fate-d-cinema-demux -fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24 +fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy FATE_AVCONV += fate-iv8-demux fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy From b809991a3101bc36a631ea6e4fe56d365fbc6c76 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 11 May 2012 20:59:58 +0100 Subject: [PATCH 17/25] fate: film-cvid: drop pcm audio and rename test Signed-off-by: Mans Rullgard --- tests/fate/pcm.mak | 3 -- tests/fate/video.mak | 3 ++ .../{film-cvid-pcm-stereo-8bit => film-cvid} | 30 ------------------- 3 files changed, 3 insertions(+), 33 deletions(-) rename tests/ref/fate/{film-cvid-pcm-stereo-8bit => film-cvid} (79%) diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index 536fb3e6d6..d4eb24fa51 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -1,6 +1,3 @@ -FATE_PCM += fate-film-cvid-pcm-stereo-8bit -fate-film-cvid-pcm-stereo-8bit: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk - FATE_PCM += fate-iff-pcm fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le diff --git a/tests/fate/video.mak b/tests/fate/video.mak index a6829ab6f3..1fdd240b2b 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -97,6 +97,9 @@ fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 FATE_AVCONV += $(FATE_DXA) fate-dxa: $(FATE_DXA) +FATE_PCM += fate-film-cvid +fate-film-cvid: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk -an + FATE_FLIC += fate-flic-af11-palette-change fate-flic-af11-palette-change: CMD = framecrc -i $(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24 diff --git a/tests/ref/fate/film-cvid-pcm-stereo-8bit b/tests/ref/fate/film-cvid similarity index 79% rename from tests/ref/fate/film-cvid-pcm-stereo-8bit rename to tests/ref/fate/film-cvid index 40851e263d..12b1f1cdcb 100644 --- a/tests/ref/fate/film-cvid-pcm-stereo-8bit +++ b/tests/ref/fate/film-cvid @@ -1,7 +1,5 @@ #tb 0: 1/30 -#tb 1: 1/44100 0, 0, 0, 1, 107520, 0xa6c9fdd2 -1, 0, 0, 22048, 88192, 0x23bb50ae 0, 2, 2, 1, 107520, 0x61eb28c1 0, 4, 4, 1, 107520, 0x45e20af7 0, 6, 6, 1, 107520, 0x366970fc @@ -9,133 +7,105 @@ 0, 10, 10, 1, 107520, 0xcf7bac98 0, 12, 12, 1, 107520, 0x222eba53 0, 14, 14, 1, 107520, 0x74e255a1 -1, 22048, 22048, 11028, 44112, 0x79600f01 0, 16, 16, 1, 107520, 0xc19eec6f 0, 18, 18, 1, 107520, 0xa3880681 0, 20, 20, 1, 107520, 0x957878db 0, 22, 22, 1, 107520, 0x18340692 -1, 33076, 33076, 11024, 44096, 0x09dbf7aa 0, 24, 24, 1, 107520, 0x9970f24d 0, 26, 26, 1, 107520, 0xf08618aa 0, 28, 28, 1, 107520, 0xee7324f0 0, 30, 30, 1, 107520, 0xe15025b3 -1, 44100, 44100, 11028, 44112, 0x18fed048 0, 32, 32, 1, 107520, 0x8afa312e 0, 34, 34, 1, 107520, 0x717a7d0f 0, 36, 36, 1, 107520, 0x355c6e23 -1, 55128, 55128, 11028, 44112, 0x030d35ef 0, 38, 38, 1, 107520, 0x7015a50f 0, 40, 40, 1, 107520, 0xcdfc1a16 0, 42, 42, 1, 107520, 0x38d929e7 0, 44, 44, 1, 107520, 0x52913423 -1, 66156, 66156, 11028, 44112, 0xc23154d5 0, 46, 46, 1, 107520, 0xe2c91c10 0, 48, 48, 1, 107520, 0x85516e9c 0, 50, 50, 1, 107520, 0xd1626030 0, 52, 52, 1, 107520, 0xea7b16de -1, 77184, 77184, 11016, 44064, 0xe4713ee7 0, 54, 54, 1, 107520, 0xa33eaa0d 0, 56, 56, 1, 107520, 0x8e3be6a6 0, 58, 58, 1, 107520, 0x14147bd6 0, 60, 60, 1, 107520, 0x07d54bec -1, 88200, 88200, 11028, 44112, 0xddc19d91 0, 62, 62, 1, 107520, 0xe287a0a7 0, 64, 64, 1, 107520, 0xc023a14d 0, 66, 66, 1, 107520, 0x2437085d -1, 99228, 99228, 11028, 44112, 0x9591522d 0, 68, 68, 1, 107520, 0x63823918 0, 70, 70, 1, 107520, 0xbc17e198 0, 72, 72, 1, 107520, 0x9d99bc81 0, 74, 74, 1, 107520, 0x7e4ec71e -1, 110256, 110256, 11028, 44112, 0x90deb013 0, 76, 76, 1, 107520, 0x55b98376 0, 78, 78, 1, 107520, 0x356d8e9e 0, 80, 80, 1, 107520, 0xf77e8a61 0, 82, 82, 1, 107520, 0x5ae7c8c7 -1, 121284, 121284, 11016, 44064, 0x3842d420 0, 84, 84, 1, 107520, 0x8acf9322 0, 86, 86, 1, 107520, 0x40a9177e 0, 88, 88, 1, 107520, 0x3e0e4d8d 0, 90, 90, 1, 107520, 0xd268865b -1, 132300, 132300, 11028, 44112, 0x99c8c3d9 0, 92, 92, 1, 107520, 0x89a4efeb 0, 94, 94, 1, 107520, 0x70ca2478 0, 96, 96, 1, 107520, 0xcc9ec981 -1, 143328, 143328, 11028, 44112, 0xffaf3824 0, 98, 98, 1, 107520, 0xf0648459 0, 100, 100, 1, 107520, 0x7e4a4cca 0, 102, 102, 1, 107520, 0xb315dc65 0, 104, 104, 1, 107520, 0x2aecc7b4 -1, 154356, 154356, 11028, 44112, 0x3dbe1aef 0, 106, 106, 1, 107520, 0x81742f51 0, 108, 108, 1, 107520, 0x3a1d7571 0, 110, 110, 1, 107520, 0x3a1d7571 0, 112, 112, 1, 107520, 0x3a1d7571 -1, 165384, 165384, 11016, 44064, 0xed2c7dfb 0, 114, 114, 1, 107520, 0x3a1d7571 0, 116, 116, 1, 107520, 0x3a1d7571 0, 118, 118, 1, 107520, 0x3a1d7571 0, 120, 120, 1, 107520, 0x3a1d7571 -1, 176400, 176400, 11028, 44112, 0x9e475274 0, 122, 122, 1, 107520, 0xe974733e 0, 124, 124, 1, 107520, 0x999c6fbf 0, 126, 126, 1, 107520, 0x26b56b6e -1, 187428, 187428, 11028, 44112, 0x541f05d4 0, 128, 128, 1, 107520, 0xc9f9647b 0, 130, 130, 1, 107520, 0x6d025d00 0, 132, 132, 1, 107520, 0xf9c056c1 0, 134, 134, 1, 107520, 0xa5cc4d0b -1, 198456, 198456, 11028, 44112, 0x09e39025 0, 136, 136, 1, 107520, 0x1a4c4236 0, 138, 138, 1, 107520, 0xa9d538b6 0, 140, 140, 1, 107520, 0x14682d00 0, 142, 142, 1, 107520, 0x6236204f -1, 209484, 209484, 11016, 44064, 0xdc111087 0, 144, 144, 1, 107520, 0x303e14aa 0, 146, 146, 1, 107520, 0x943b0837 0, 148, 148, 1, 107520, 0xfce5fd07 0, 150, 150, 1, 107520, 0xd993f193 -1, 220500, 220500, 11028, 44112, 0xb8f86e48 0, 152, 152, 1, 107520, 0x4d48e7b4 0, 154, 154, 1, 107520, 0x61ccdf83 0, 156, 156, 1, 107520, 0xfb4fd608 -1, 231528, 231528, 11028, 44112, 0xa1e0c75c 0, 158, 158, 1, 107520, 0x5efdcdb3 0, 160, 160, 1, 107520, 0xb03ec886 0, 162, 162, 1, 107520, 0xf464c343 0, 164, 164, 1, 107520, 0xf464c343 -1, 242556, 242556, 11028, 44112, 0x0654dcb0 0, 166, 166, 1, 107520, 0xf464c343 0, 168, 168, 1, 107520, 0xf464c343 0, 170, 170, 1, 107520, 0xf464c343 0, 172, 172, 1, 107520, 0xf464c343 -1, 253584, 253584, 11016, 44064, 0xb921e11a 0, 174, 174, 1, 107520, 0xf464c343 0, 176, 176, 1, 107520, 0xf464c343 0, 178, 178, 1, 107520, 0xf464c343 0, 180, 180, 1, 107520, 0xf464c343 -1, 264600, 264600, 11028, 44112, 0xe0ac619f 0, 182, 182, 1, 107520, 0xf464c343 0, 184, 184, 1, 107520, 0xf2b2c712 0, 186, 186, 1, 107520, 0xf2b2c712 -1, 275628, 275628, 11028, 44112, 0xb07aa65c 0, 188, 188, 1, 107520, 0xf2b2c712 0, 190, 190, 1, 107520, 0xf2b2c712 0, 192, 192, 1, 107520, 0xb95e6bc8 0, 194, 194, 1, 107520, 0x33feee37 -1, 286656, 286656, 11028, 44112, 0x24610ff0 0, 196, 196, 1, 107520, 0x36ee3cd5 0, 198, 198, 1, 107520, 0x59096471 0, 200, 200, 1, 107520, 0x53b470c6 0, 202, 202, 1, 107520, 0xdb7c64ff -1, 297684, 297684, 11016, 44064, 0x00000000 0, 204, 204, 1, 107520, 0xe5a1596a 0, 206, 206, 1, 107520, 0x8c8942eb 0, 208, 208, 1, 107520, 0x5ecc379e 0, 210, 210, 1, 107520, 0xea09432a -1, 308700, 308700, 11028, 44112, 0x00000000 0, 212, 212, 1, 107520, 0xe01e6b73 0, 214, 214, 1, 107520, 0x1d13bba8 0, 216, 216, 1, 107520, 0x3a993a6c -1, 319728, 319728, 2200, 8800, 0x00000000 0, 218, 218, 1, 107520, 0x2ede041a From f70d91e2689beb0759fd873183cddfcf51fef8f8 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 12 May 2012 12:39:59 +0100 Subject: [PATCH 18/25] fate: caf: disable decoding This is intended as a demuxer test and the file contains pcm_s16be audio which is tested elsewhere. Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 2 +- tests/ref/fate/caf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 9721037b53..edf7ad0ca1 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -8,7 +8,7 @@ FATE_AVCONV += fate-bink-demux fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy FATE_AVCONV += fate-caf -fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf +fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy FATE_AVCONV += fate-cdxl-demux fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy diff --git a/tests/ref/fate/caf b/tests/ref/fate/caf index a400501e68..00de78c511 100644 --- a/tests/ref/fate/caf +++ b/tests/ref/fate/caf @@ -1 +1 @@ -CRC=0x5b74195c +CRC=0xd0d7195c From 09a35f251ac07f3002642fde88666b95f0805379 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 12 May 2012 13:17:38 +0100 Subject: [PATCH 19/25] fate: westwood-aud: disable decoding The codec (adpcm-ima-ws) is tested elsewhere. Using framecrc output provides more information than a single md5 if something goes wrong. Signed-off-by: Mans Rullgard --- tests/fate/demux.mak | 2 +- tests/ref/fate/westwood-aud | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index edf7ad0ca1..32f3200fee 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -65,7 +65,7 @@ FATE_AVCONV += fate-smjpeg fate-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vcodec copy FATE_AVCONV += fate-westwood-aud -fate-westwood-aud: CMD = md5 -i $(SAMPLES)/westwood-aud/excellent.aud -f s16le +fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy FATE_AVCONV += fate-wtv-demux fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy diff --git a/tests/ref/fate/westwood-aud b/tests/ref/fate/westwood-aud index f8bec10599..9fab24197a 100644 --- a/tests/ref/fate/westwood-aud +++ b/tests/ref/fate/westwood-aud @@ -1 +1,12 @@ -5c2528488729035c17c21486797a2a23 +#tb 0: 1/22050 +0, 0, 0, 1024, 512, 0x6694cc55 +0, 1024, 1024, 1024, 512, 0xdbc5cb22 +0, 2048, 2048, 1024, 512, 0x8e5bcbfd +0, 3072, 3072, 1024, 512, 0x7b2ac519 +0, 4096, 4096, 1024, 512, 0x6ae0cb0c +0, 5120, 5120, 1024, 512, 0x055ec435 +0, 6144, 6144, 1024, 512, 0x9424c8d6 +0, 7168, 7168, 1024, 512, 0x58fccb7d +0, 8192, 8192, 1024, 512, 0x348fd253 +0, 9216, 9216, 1024, 512, 0xe1b1c24e +0, 10240, 10240, 192, 96, 0x95f81350 From fcc456b8293b829d868f55778d76f8da3d54e846 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Sat, 12 May 2012 08:59:00 +0200 Subject: [PATCH 20/25] x86: use more standard construct for setting ASM functions in FFT code Signed-off-by: Diego Biurrun --- libavcodec/x86/fft.c | 45 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/libavcodec/x86/fft.c b/libavcodec/x86/fft.c index 3e0c42fb1e..5495821e5b 100644 --- a/libavcodec/x86/fft.c +++ b/libavcodec/x86/fft.c @@ -25,30 +25,31 @@ av_cold void ff_fft_init_mmx(FFTContext *s) { #if HAVE_YASM int has_vectors = av_get_cpu_flags(); - if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX && s->nbits >= 5) { - /* AVX for SB */ - s->imdct_calc = ff_imdct_calc_sse; - s->imdct_half = ff_imdct_half_avx; - s->fft_permute = ff_fft_permute_sse; - s->fft_calc = ff_fft_calc_avx; - s->fft_permutation = FF_FFT_PERM_AVX; - } else if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE) { + if (has_vectors & AV_CPU_FLAG_3DNOW && HAVE_AMD3DNOW) { + /* 3DNow! for K6-2/3 */ + s->imdct_calc = ff_imdct_calc_3dn; + s->imdct_half = ff_imdct_half_3dn; + s->fft_calc = ff_fft_calc_3dn; + } + if (has_vectors & AV_CPU_FLAG_3DNOWEXT && HAVE_AMD3DNOWEXT) { + /* 3DNowEx for K7 */ + s->imdct_calc = ff_imdct_calc_3dn2; + s->imdct_half = ff_imdct_half_3dn2; + s->fft_calc = ff_fft_calc_3dn2; + } + if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE) { /* SSE for P3/P4/K8 */ s->imdct_calc = ff_imdct_calc_sse; s->imdct_half = ff_imdct_half_sse; s->fft_permute = ff_fft_permute_sse; s->fft_calc = ff_fft_calc_sse; s->fft_permutation = FF_FFT_PERM_SWAP_LSBS; - } else if (has_vectors & AV_CPU_FLAG_3DNOWEXT && HAVE_AMD3DNOWEXT) { - /* 3DNowEx for K7 */ - s->imdct_calc = ff_imdct_calc_3dn2; - s->imdct_half = ff_imdct_half_3dn2; - s->fft_calc = ff_fft_calc_3dn2; - } else if (has_vectors & AV_CPU_FLAG_3DNOW && HAVE_AMD3DNOW) { - /* 3DNow! for K6-2/3 */ - s->imdct_calc = ff_imdct_calc_3dn; - s->imdct_half = ff_imdct_half_3dn; - s->fft_calc = ff_fft_calc_3dn; + } + if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX && s->nbits >= 5) { + /* AVX for SB */ + s->imdct_half = ff_imdct_half_avx; + s->fft_calc = ff_fft_calc_avx; + s->fft_permutation = FF_FFT_PERM_AVX; } #endif } @@ -58,12 +59,12 @@ av_cold void ff_dct_init_mmx(DCTContext *s) { #if HAVE_YASM int has_vectors = av_get_cpu_flags(); + if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE) + s->dct32 = ff_dct32_float_sse; + if (has_vectors & AV_CPU_FLAG_SSE2 && HAVE_SSE) + s->dct32 = ff_dct32_float_sse2; if (has_vectors & AV_CPU_FLAG_AVX && HAVE_AVX) s->dct32 = ff_dct32_float_avx; - else if (has_vectors & AV_CPU_FLAG_SSE2 && HAVE_SSE) - s->dct32 = ff_dct32_float_sse2; - else if (has_vectors & AV_CPU_FLAG_SSE && HAVE_SSE) - s->dct32 = ff_dct32_float_sse; #endif } #endif From 70be4dddc899d8a07c37819d602777a06591645a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 29 Jul 2011 12:02:20 +0200 Subject: [PATCH 21/25] gxfenc: remove disabled half-implemented MJPEG tag --- libavformat/gxfenc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 5069f2f3f8..c11b77bedc 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -524,17 +524,6 @@ static int gxf_write_umf_media_audio(AVIOContext *pb, GXFStreamContext *sc) return 32; } -#if 0 -static int gxf_write_umf_media_mjpeg(AVIOContext *pb, GXFStreamContext *sc) -{ - avio_wb64(pb, 0); /* FIXME FLOAT max chroma quant level */ - avio_wb64(pb, 0); /* FIXME FLOAT max luma quant level */ - avio_wb64(pb, 0); /* FIXME FLOAT min chroma quant level */ - avio_wb64(pb, 0); /* FIXME FLOAT min luma quant level */ - return 32; -} -#endif - static int gxf_write_umf_media_description(AVFormatContext *s) { GXFContext *gxf = s->priv_data; From 5aad8e80a78e6b1f1479aa45d29713d4f44ea0be Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 17 Jul 2011 13:30:24 +0200 Subject: [PATCH 22/25] motion-test: remove disabled code --- libavcodec/motion-test.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c index a22cb1eec5..fb97f085be 100644 --- a/libavcodec/motion-test.c +++ b/libavcodec/motion-test.c @@ -48,11 +48,7 @@ static void fill_random(uint8_t *tab, int size) av_lfg_init(&prng, 1); for(i=0;i Date: Fri, 13 Apr 2012 08:52:08 +0200 Subject: [PATCH 23/25] vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits. --- libavcodec/vcr1.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 7edd801b8f..87b39b0527 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -151,6 +151,9 @@ AVCodec ff_vcr1_decoder = { #define CONFIG_VCR1_ENCODER 0 #if CONFIG_VCR1_ENCODER + +#include "put_bits.h" + static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) { @@ -164,10 +167,9 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, p->key_frame = 1; avpriv_align_put_bits(&a->pb); - while (get_bit_count(&a->pb) & 31) - put_bits(&a->pb, 8, 0); + flush_put_bits(&a->pb); - size = get_bit_count(&a->pb) / 32; + size = put_bits_count(&a->pb) / 32; return size * 4; } From a761e5951cc571baf36658eb0e98b148e5fb963f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 14 May 2012 12:33:04 +0200 Subject: [PATCH 24/25] vcr1: Fix return type of common_init to match the function pointer signature. libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type --- libavcodec/vcr1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 87b39b0527..4f32631ca0 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -33,11 +33,13 @@ typedef struct VCR1Context { int offset[4]; } VCR1Context; -static av_cold void common_init(AVCodecContext *avctx) +static av_cold int common_init(AVCodecContext *avctx) { VCR1Context *const a = avctx->priv_data; avctx->coded_frame = &a->picture; + + return 0; } static av_cold int decode_init(AVCodecContext *avctx) From 100c70b0481b889d522b4fc2aac5b948ddb05c70 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 14 May 2012 12:36:45 +0200 Subject: [PATCH 25/25] vcr1: Add vcr1_ prefixes to all static functions with generic names. --- libavcodec/vcr1.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index 4f32631ca0..3a42612445 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -33,7 +33,7 @@ typedef struct VCR1Context { int offset[4]; } VCR1Context; -static av_cold int common_init(AVCodecContext *avctx) +static av_cold int vcr1_common_init(AVCodecContext *avctx) { VCR1Context *const a = avctx->priv_data; @@ -42,16 +42,16 @@ static av_cold int common_init(AVCodecContext *avctx) return 0; } -static av_cold int decode_init(AVCodecContext *avctx) +static av_cold int vcr1_decode_init(AVCodecContext *avctx) { - common_init(avctx); + vcr1_common_init(avctx); avctx->pix_fmt = PIX_FMT_YUV410P; return 0; } -static av_cold int decode_end(AVCodecContext *avctx) +static av_cold int vcr1_decode_end(AVCodecContext *avctx) { VCR1Context *s = avctx->priv_data; @@ -61,8 +61,8 @@ static av_cold int decode_end(AVCodecContext *avctx) return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, - int *data_size, AVPacket *avpkt) +static int vcr1_decode_frame(AVCodecContext *avctx, void *data, + int *data_size, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -141,9 +141,9 @@ AVCodec ff_vcr1_decoder = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_VCR1, .priv_data_size = sizeof(VCR1Context), - .init = decode_init, - .close = decode_end, - .decode = decode_frame, + .init = vcr1_decode_init, + .close = vcr1_decode_end, + .decode = vcr1_decode_frame, .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; @@ -156,8 +156,8 @@ AVCodec ff_vcr1_decoder = { #include "put_bits.h" -static int encode_frame(AVCodecContext *avctx, unsigned char *buf, - int buf_size, void *data) +static int vcr1_encode_frame(AVCodecContext *avctx, unsigned char *buf, + int buf_size, void *data) { VCR1Context *const a = avctx->priv_data; AVFrame *pict = data; @@ -181,8 +181,8 @@ AVCodec ff_vcr1_encoder = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_VCR1, .priv_data_size = sizeof(VCR1Context), - .init = common_init, - .encode = encode_frame, + .init = vcr1_common_init, + .encode = vcr1_encode_frame, .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; #endif /* CONFIG_VCR1_ENCODER */