From 37efad4e5b6631ad902e8ae3d19e850037d22efb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 11 May 2015 00:44:14 +0200 Subject: [PATCH] fate: Test pullup and fieldmatch with 5 instead of 1 frame MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Clément Bœsch Signed-off-by: Michael Niedermayer --- tests/fate-run.sh | 3 ++- tests/fate/filter-video.mak | 4 ++-- tests/ref/fate/filter-pixfmts-fieldmatch | 10 +++++----- tests/ref/fate/filter-pixfmts-pullup | 24 ++++++++++++------------ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f795fdf4b9..b88730a47e 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -195,6 +195,7 @@ pixfmts(){ filter=${filter%_*} filter_args=$1 prefilter_chain=$2 + nframes=${3:-1} showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test" scale_exclude_fmts=${outfile}_scale_exclude_fmts @@ -213,7 +214,7 @@ pixfmts(){ outertest=$test for pix_fmt in $pix_fmts; do test=$pix_fmt - video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt -frames:v 1 + video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt -frames:v $nframes done rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index d9343b23c3..4c23c5a40c 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -349,7 +349,7 @@ FATE_FILTER_PIXFMTS-$(CONFIG_FIELD_FILTER) += fate-filter-pixfmts-field fate-filter-pixfmts-field: CMD = pixfmts "bottom" FATE_FILTER_PIXFMTS-$(call ALLYES, TELECINE_FILTER FIELDMATCH_FILTER) += fate-filter-pixfmts-fieldmatch -fate-filter-pixfmts-fieldmatch: CMD = pixfmts "" "telecine," +fate-filter-pixfmts-fieldmatch: CMD = pixfmts "" "telecine," 25 FATE_FILTER_PIXFMTS-$(CONFIG_FIELDORDER_FILTER) += fate-filter-pixfmts-fieldorder fate-filter-pixfmts-fieldorder: CMD = pixfmts "tff" "setfield=bff," @@ -376,7 +376,7 @@ FATE_FILTER_PIXFMTS-$(CONFIG_PAD_FILTER) += fate-filter-pixfmts-pad fate-filter-pixfmts-pad: CMD = pixfmts "500:400:20:20" FATE_FILTER_PIXFMTS-$(call ALLYES, TELECINE_FILTER PULLUP_FILTER) += fate-filter-pixfmts-pullup -fate-filter-pixfmts-pullup: CMD = pixfmts "" "telecine," +fate-filter-pixfmts-pullup: CMD = pixfmts "" "telecine," 25 FATE_FILTER_PIXFMTS-$(CONFIG_ROTATE_FILTER) += fate-filter-pixfmts-rotate fate-filter-pixfmts-rotate: CMD = pixfmts "2*PI*n/50" diff --git a/tests/ref/fate/filter-pixfmts-fieldmatch b/tests/ref/fate/filter-pixfmts-fieldmatch index cbd32f0ef4..44622d060c 100644 --- a/tests/ref/fate/filter-pixfmts-fieldmatch +++ b/tests/ref/fate/filter-pixfmts-fieldmatch @@ -1,5 +1,5 @@ -yuv410p b5dc363ece6aa953a306c036c7e4d1f8 -yuv411p 4424432cd71ff3771420e96eeab31b17 -yuv420p a4f8a78b55ea5ad5b186cf260168fd0b -yuv422p 1f3636c6d33c16f5147c365bc403b481 -yuv444p 801c6fc49a0cdc09cb7dbb97ec9cc63f +yuv410p a6c9b4065e8253d8120772f69be0bf04 +yuv411p b913e634ad37ce046240252bed8681fb +yuv420p d448d95326eadeeb12ea0cc348067958 +yuv422p 11ad22ce00c5e8a30d0472f29fb15434 +yuv444p 9350a3f23cd7d95ec441a49f63f55953 diff --git a/tests/ref/fate/filter-pixfmts-pullup b/tests/ref/fate/filter-pixfmts-pullup index 3905a2d40e..c6ddb3489a 100644 --- a/tests/ref/fate/filter-pixfmts-pullup +++ b/tests/ref/fate/filter-pixfmts-pullup @@ -1,12 +1,12 @@ -gray 68c24cf3dbf84fde2db57e7dddfc025a -yuv410p 0416e0c5359efe8c5577c564af72274d -yuv411p 7dc0b5d9f933b9b2eb56879be4b82545 -yuv420p 4788ee936d7bdad49abcd9510a058900 -yuv422p bf9b6c5829e8e0c619d273b7b759e33d -yuv440p 44c1b4461b873ae22dff024072878e10 -yuv444p 88315c711c261aeb62d0c7701ef5c1bf -yuvj411p 7387b729f4ab97d107e5f4bcc0d89422 -yuvj420p d72a37540785e2e7d8400ee457f20456 -yuvj422p 32b27295e432da29d397404b5049c2a2 -yuvj440p eaec52d14f632d29ad95be3f22591540 -yuvj444p ee3a0e4dee7c19e037d65887bd4ff70e +gray 415c928947f83f9b45c24ad15a094bda +yuv410p 0f29d0b6394871e1e6cde484b4f351f4 +yuv411p ec059b1992e1acda472b9b2dd3e4506b +yuv420p dba6303cd02cc39cb0db7b546793d565 +yuv422p d7d3224dd900bb1b96608a28a704360d +yuv440p d4c5f20701cfceb4bbf7d75cfcc13514 +yuv444p 7e405274037e7f2ab845d7413a71e16d +yuvj411p dc602e7bd3449d16e17e695815616b1e +yuvj420p b98ec86eeef2d512aeb2fc4d32ffa656 +yuvj422p f09c3240bb662477b76ce4da34b4feed +yuvj440p 8d3ab69e2bbbbbd2f9be323c18922533 +yuvj444p 2dc27560eed5d685354796dcccce853c