From 1dd9ff871a746683733e2eac4153389e1500ec73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Tue, 2 Mar 2010 21:59:02 +0000 Subject: [PATCH] Place regtest-pixfmt output files in separate dir This test generates many output files, and keeping them separate is convenient. Originally committed as revision 22157 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/lavf-regression.sh | 4 ++- tests/ref/lavf/pixfmt | 76 ++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index a23a58fc1d..3f4a677bb3 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -207,11 +207,13 @@ fi # pix_fmt conversions if [ -n "$do_pixfmt" ] ; then +outfile="$datadir/pixfmt/" +mkdir -p "$outfile" conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \ yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \ monob yuv440p yuvj440p" for pix_fmt in $conversions ; do - file=${outfile}lavf-${pix_fmt}.yuv + file=${outfile}${pix_fmt}.yuv do_ffmpeg_nocheck $file -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \ -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst do_ffmpeg $file -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \ diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt index d15ed7f475..d03abffa8e 100644 --- a/tests/ref/lavf/pixfmt +++ b/tests/ref/lavf/pixfmt @@ -1,38 +1,38 @@ -5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/lavf/lavf-yuv420p.yuv -304128 ./tests/data/lavf/lavf-yuv420p.yuv -ac68f9fdd9d55efd0306d9b004038761 *./tests/data/lavf/lavf-yuv422p.yuv -304128 ./tests/data/lavf/lavf-yuv422p.yuv -5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/lavf/lavf-yuv444p.yuv -304128 ./tests/data/lavf/lavf-yuv444p.yuv -ac68f9fdd9d55efd0306d9b004038761 *./tests/data/lavf/lavf-yuyv422.yuv -304128 ./tests/data/lavf/lavf-yuyv422.yuv -507c7e9f0c97660385df977469ca9e6d *./tests/data/lavf/lavf-yuv410p.yuv -304128 ./tests/data/lavf/lavf-yuv410p.yuv -8594ea0b8d7c2c964525b0801b5351de *./tests/data/lavf/lavf-yuv411p.yuv -304128 ./tests/data/lavf/lavf-yuv411p.yuv -66673539adf8cda28e3b76068d3aae61 *./tests/data/lavf/lavf-yuvj420p.yuv -304128 ./tests/data/lavf/lavf-yuvj420p.yuv -572bf387dd1e3f073cbfd082e055ca81 *./tests/data/lavf/lavf-yuvj422p.yuv -304128 ./tests/data/lavf/lavf-yuvj422p.yuv -c10442da177c9f1d12be3c53be6fa12c *./tests/data/lavf/lavf-yuvj444p.yuv -304128 ./tests/data/lavf/lavf-yuvj444p.yuv -c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/lavf/lavf-rgb24.yuv -304128 ./tests/data/lavf/lavf-rgb24.yuv -c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/lavf/lavf-bgr24.yuv -304128 ./tests/data/lavf/lavf-bgr24.yuv -c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/lavf/lavf-rgb32.yuv -304128 ./tests/data/lavf/lavf-rgb32.yuv -66d39d464bd89ded2a124897f0a75ade *./tests/data/lavf/lavf-rgb565.yuv -304128 ./tests/data/lavf/lavf-rgb565.yuv -c894c3bd8d2631ed1964500b90a0c350 *./tests/data/lavf/lavf-rgb555.yuv -304128 ./tests/data/lavf/lavf-rgb555.yuv -6be306b0cce5f8e6c271ea17fef9745b *./tests/data/lavf/lavf-gray.yuv -304128 ./tests/data/lavf/lavf-gray.yuv -31398104d2349dd48328a6862bc6711f *./tests/data/lavf/lavf-monow.yuv -304128 ./tests/data/lavf/lavf-monow.yuv -31398104d2349dd48328a6862bc6711f *./tests/data/lavf/lavf-monob.yuv -304128 ./tests/data/lavf/lavf-monob.yuv -00b85790df5740bab95e2559d81603a7 *./tests/data/lavf/lavf-yuv440p.yuv -304128 ./tests/data/lavf/lavf-yuv440p.yuv -4d8d402c45d913038d4b725396719111 *./tests/data/lavf/lavf-yuvj440p.yuv -304128 ./tests/data/lavf/lavf-yuvj440p.yuv +5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/pixfmt/yuv420p.yuv +304128 ./tests/data/pixfmt/yuv420p.yuv +ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuv422p.yuv +304128 ./tests/data/pixfmt/yuv422p.yuv +5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/pixfmt/yuv444p.yuv +304128 ./tests/data/pixfmt/yuv444p.yuv +ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuyv422.yuv +304128 ./tests/data/pixfmt/yuyv422.yuv +507c7e9f0c97660385df977469ca9e6d *./tests/data/pixfmt/yuv410p.yuv +304128 ./tests/data/pixfmt/yuv410p.yuv +8594ea0b8d7c2c964525b0801b5351de *./tests/data/pixfmt/yuv411p.yuv +304128 ./tests/data/pixfmt/yuv411p.yuv +66673539adf8cda28e3b76068d3aae61 *./tests/data/pixfmt/yuvj420p.yuv +304128 ./tests/data/pixfmt/yuvj420p.yuv +572bf387dd1e3f073cbfd082e055ca81 *./tests/data/pixfmt/yuvj422p.yuv +304128 ./tests/data/pixfmt/yuvj422p.yuv +c10442da177c9f1d12be3c53be6fa12c *./tests/data/pixfmt/yuvj444p.yuv +304128 ./tests/data/pixfmt/yuvj444p.yuv +c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb24.yuv +304128 ./tests/data/pixfmt/rgb24.yuv +c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/bgr24.yuv +304128 ./tests/data/pixfmt/bgr24.yuv +c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb32.yuv +304128 ./tests/data/pixfmt/rgb32.yuv +66d39d464bd89ded2a124897f0a75ade *./tests/data/pixfmt/rgb565.yuv +304128 ./tests/data/pixfmt/rgb565.yuv +c894c3bd8d2631ed1964500b90a0c350 *./tests/data/pixfmt/rgb555.yuv +304128 ./tests/data/pixfmt/rgb555.yuv +6be306b0cce5f8e6c271ea17fef9745b *./tests/data/pixfmt/gray.yuv +304128 ./tests/data/pixfmt/gray.yuv +31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monow.yuv +304128 ./tests/data/pixfmt/monow.yuv +31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monob.yuv +304128 ./tests/data/pixfmt/monob.yuv +00b85790df5740bab95e2559d81603a7 *./tests/data/pixfmt/yuv440p.yuv +304128 ./tests/data/pixfmt/yuv440p.yuv +4d8d402c45d913038d4b725396719111 *./tests/data/pixfmt/yuvj440p.yuv +304128 ./tests/data/pixfmt/yuvj440p.yuv