[PATCH] tests: add overlay rgb and yuv444 tests
Also rename overlay test to overlay_yuv420 accordingly. --- tests/fate/avfilter.mak | 4 +++- tests/lavfi-regression.sh | 4 +++- tests/ref/lavfi/overlay | 1 - tests/ref/lavfi/overlay_rgb | 1 + tests/ref/lavfi/overlay_yuv420 | 1 + tests/ref/lavfi/overlay_yuv444 | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 tests/ref/lavfi/overlay create mode 100644 tests/ref/lavfi/overlay_rgb create mode 100644 tests/ref/lavfi/overlay_yuv420 create mode 100644 tests/ref/lavfi/overlay_yuv444 diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index 15c8595..8ac8d41 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -14,7 +14,9 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-il \ fate-lavfi-life \ fate-lavfi-null \ - fate-lavfi-overlay \ + fate-lavfi-overlay_rgb \ + fate-lavfi-overlay_yuv420 \ + fate-lavfi-overlay_yuv444 \ fate-lavfi-pad \ fate-lavfi-pixfmts_copy \ fate-lavfi-pixfmts_crop \ diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index d6aba4c..9335124 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -47,7 +47,9 @@ do_lavfi "fade" "fade=in:5:15,fade=out:30:15" do_lavfi "hue" "hue=s=sin(2*PI*t)+1" do_lavfi "idet" "idet" do_lavfi "null" "null" -do_lavfi "overlay" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16" +do_lavfi "overlay_rgb" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=rgb" +do_lavfi "overlay_yuv420" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv420" +do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444" do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" do_lavfi "pp" "pp=be/hb/vb/tn/l5/al" do_lavfi "pp2" "pp=be/fq:16/h1/v1/lb" diff --git a/tests/ref/lavfi/overlay b/tests/ref/lavfi/overlay deleted file mode 100644 index ca70370..0000000 --- a/tests/ref/lavfi/overlay +++ /dev/null @@ -1 +0,0 @@ -overlay 4e85d551db9e56e8faddc1fc70fd6a00 diff --git a/tests/ref/lavfi/overlay_rgb b/tests/ref/lavfi/overlay_rgb new file mode 100644 index 0000000..ce4e30b --- /dev/null +++ b/tests/ref/lavfi/overlay_rgb @@ -0,0 +1 @@ +overlay_rgb abea47d9e61d7eab40c4734294519524 diff --git a/tests/ref/lavfi/overlay_yuv420 b/tests/ref/lavfi/overlay_yuv420 new file mode 100644 index 0000000..3d12251 --- /dev/null +++ b/tests/ref/lavfi/overlay_yuv420 @@ -0,0 +1 @@ +overlay_yuv420 4e85d551db9e56e8faddc1fc70fd6a00 diff --git a/tests/ref/lavfi/overlay_yuv444 b/tests/ref/lavfi/overlay_yuv444 new file mode 100644 index 0000000..b83e605 --- /dev/null +++ b/tests/ref/lavfi/overlay_yuv444 @@ -0,0 +1 @@ +overlay_yuv444 16215d0b4054a44bbe7f6c46bd97d235 -- 1.7.9.5
On 3/5/13, Stefano Sabatini <stefasab@gmail.com> wrote:
Also rename overlay test to overlay_yuv420 accordingly. --- tests/fate/avfilter.mak | 4 +++- tests/lavfi-regression.sh | 4 +++- tests/ref/lavfi/overlay | 1 - tests/ref/lavfi/overlay_rgb | 1 + tests/ref/lavfi/overlay_yuv420 | 1 + tests/ref/lavfi/overlay_yuv444 | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 tests/ref/lavfi/overlay create mode 100644 tests/ref/lavfi/overlay_rgb create mode 100644 tests/ref/lavfi/overlay_yuv420 create mode 100644 tests/ref/lavfi/overlay_yuv444
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index 15c8595..8ac8d41 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -14,7 +14,9 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-il \ fate-lavfi-life \ fate-lavfi-null \ - fate-lavfi-overlay \ + fate-lavfi-overlay_rgb \ + fate-lavfi-overlay_yuv420 \ + fate-lavfi-overlay_yuv444 \ fate-lavfi-pad \ fate-lavfi-pixfmts_copy \ fate-lavfi-pixfmts_crop \ diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index d6aba4c..9335124 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -47,7 +47,9 @@ do_lavfi "fade" "fade=in:5:15,fade=out:30:15" do_lavfi "hue" "hue=s=sin(2*PI*t)+1" do_lavfi "idet" "idet" do_lavfi "null" "null" -do_lavfi "overlay" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16" +do_lavfi "overlay_rgb" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=rgb" +do_lavfi "overlay_yuv420" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv420" +do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444" do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" do_lavfi "pp" "pp=be/hb/vb/tn/l5/al" do_lavfi "pp2" "pp=be/fq:16/h1/v1/lb" diff --git a/tests/ref/lavfi/overlay b/tests/ref/lavfi/overlay deleted file mode 100644 index ca70370..0000000 --- a/tests/ref/lavfi/overlay +++ /dev/null @@ -1 +0,0 @@ -overlay 4e85d551db9e56e8faddc1fc70fd6a00 diff --git a/tests/ref/lavfi/overlay_rgb b/tests/ref/lavfi/overlay_rgb new file mode 100644 index 0000000..ce4e30b --- /dev/null +++ b/tests/ref/lavfi/overlay_rgb @@ -0,0 +1 @@ +overlay_rgb abea47d9e61d7eab40c4734294519524 diff --git a/tests/ref/lavfi/overlay_yuv420 b/tests/ref/lavfi/overlay_yuv420 new file mode 100644 index 0000000..3d12251 --- /dev/null +++ b/tests/ref/lavfi/overlay_yuv420 @@ -0,0 +1 @@ +overlay_yuv420 4e85d551db9e56e8faddc1fc70fd6a00 diff --git a/tests/ref/lavfi/overlay_yuv444 b/tests/ref/lavfi/overlay_yuv444 new file mode 100644 index 0000000..b83e605 --- /dev/null +++ b/tests/ref/lavfi/overlay_yuv444 @@ -0,0 +1 @@ +overlay_yuv444 16215d0b4054a44bbe7f6c46bd97d235 -- 1.7.9.5
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
I guess it should be ok.
On date Tuesday 2013-03-05 09:38:13 +0000, Paul B Mahol encoded:
On 3/5/13, Stefano Sabatini <stefasab@gmail.com> wrote:
Also rename overlay test to overlay_yuv420 accordingly. --- tests/fate/avfilter.mak | 4 +++- tests/lavfi-regression.sh | 4 +++- tests/ref/lavfi/overlay | 1 - tests/ref/lavfi/overlay_rgb | 1 + tests/ref/lavfi/overlay_yuv420 | 1 + tests/ref/lavfi/overlay_yuv444 | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 tests/ref/lavfi/overlay create mode 100644 tests/ref/lavfi/overlay_rgb create mode 100644 tests/ref/lavfi/overlay_yuv420 create mode 100644 tests/ref/lavfi/overlay_yuv444 [...] I guess it should be ok.
Applied. -- FFmpeg = Fundamentalist & Fanciful Multipurpose Pacific Ecumenical Game
Stefano Sabatini <stefasab <at> gmail.com> writes:
diff --git a/tests/ref/lavfi/overlay_rgb b/tests/ref/lavfi/overlay_rgb new file mode 100644 index 0000000..ce4e30b --- /dev/null +++ b/tests/ref/lavfi/overlay_rgb <at> <at> -0,0 +1 <at> <at> +overlay_rgb abea47d9e61d7eab40c4734294519524
Afaict, this breaks fate with target-exec: The remote ffmpeg executable cannot read this file. Carl Eugen
Carl Eugen Hoyos <cehoyos <at> ag.or.at> writes:
Stefano Sabatini <stefasab <at> gmail.com> writes:
diff --git a/tests/ref/lavfi/overlay_rgb b/tests/ref/lavfi/overlay_rgb new file mode 100644 index 0000000..ce4e30b --- /dev/null +++ b/tests/ref/lavfi/overlay_rgb <at> <at> -0,0 +1 <at> <at> +overlay_rgb abea47d9e61d7eab40c4734294519524
Afaict, this breaks fate with target-exec: The remote ffmpeg executable cannot read this file.
The following fate tests have the same problem: fate-filter-alphaextract_alphamerge_yuv fate-filter-alphaextract_alphamerge_rgb tests/data/ffprobe-test.nut fate-filter-lavd-scalenorm fate-filter-hqdn3d-sample fate-filter-gradfun-sample fate-filter-concat Basically the files in tests/filtergraphs and ffprobe-test.nut Carl Eugen
Carl Eugen Hoyos <cehoyos <at> ag.or.at> writes:
+overlay_rgb abea47d9e61d7eab40c4734294519524
Afaict, this breaks fate with target-exec: The remote ffmpeg executable cannot read this file.
The following fate tests have the same problem: fate-filter-alphaextract_alphamerge_yuv fate-filter-alphaextract_alphamerge_rgb tests/data/ffprobe-test.nut fate-filter-lavd-scalenorm fate-filter-hqdn3d-sample fate-filter-gradfun-sample fate-filter-concat
Basically the files in tests/filtergraphs
These should be fixed now.
and ffprobe-test.nut
I don't think this is a related problem, the command line to generated ffrobe-test.nut contains both parentheses and semicolons, making it bad for ssh. Carl Eugen
participants (3)
-
Carl Eugen Hoyos -
Paul B Mahol -
Stefano Sabatini