Re: [libav-devel] [PATCH 15/20] tests: Split monolithic lavf-pixfmt test into individual tests

2018-09-24 Thread Diego Biurrun 
*PLEASE* snip your quotes.

On Mon, Sep 24, 2018 at 01:16:46PM +0200, Sean McGovern wrote:
> On Thu, Sep 20, 2018, 10:47 Diego Biurrun  wrote:
> > [...]
> 
> Thank you very much for completing this, Diego.
> 
> Much appreciated,

You are welcome :)

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 15/20] tests: Split monolithic lavf-pixfmt test into individual tests

2018-09-24 Thread Sean McGovern 
On Thu, Sep 20, 2018, 10:47 Diego Biurrun  wrote:

> ---
>  tests/Makefile |  1 +
>  tests/fate-run.sh  | 18 +++---
>  tests/fate/avformat.mak|  4 
>  tests/fate/pixfmt.mak  | 27 +++
>  tests/ref/fate/pixfmt-bgr24|  2 ++
>  tests/ref/fate/pixfmt-gray |  2 ++
>  tests/ref/fate/pixfmt-monob|  2 ++
>  tests/ref/fate/pixfmt-monow|  2 ++
>  tests/ref/fate/pixfmt-rgb24|  2 ++
>  tests/ref/fate/pixfmt-rgb32|  2 ++
>  tests/ref/fate/pixfmt-rgb555   |  2 ++
>  tests/ref/fate/pixfmt-rgb565   |  2 ++
>  tests/ref/fate/pixfmt-yuv410p  |  2 ++
>  tests/ref/fate/pixfmt-yuv411p  |  2 ++
>  tests/ref/fate/pixfmt-yuv420p  |  2 ++
>  tests/ref/fate/pixfmt-yuv422p  |  2 ++
>  tests/ref/fate/pixfmt-yuv440p  |  2 ++
>  tests/ref/fate/pixfmt-yuv444p  |  2 ++
>  tests/ref/fate/pixfmt-yuvj420p |  2 ++
>  tests/ref/fate/pixfmt-yuvj422p |  2 ++
>  tests/ref/fate/pixfmt-yuvj440p |  2 ++
>  tests/ref/fate/pixfmt-yuvj444p |  2 ++
>  tests/ref/fate/pixfmt-yuyv422  |  2 ++
>  tests/ref/lavf/pixfmt  | 38 --
>  24 files changed, 73 insertions(+), 53 deletions(-)
>  create mode 100644 tests/fate/pixfmt.mak
>  create mode 100644 tests/ref/fate/pixfmt-bgr24
>  create mode 100644 tests/ref/fate/pixfmt-gray
>  create mode 100644 tests/ref/fate/pixfmt-monob
>  create mode 100644 tests/ref/fate/pixfmt-monow
>  create mode 100644 tests/ref/fate/pixfmt-rgb24
>  create mode 100644 tests/ref/fate/pixfmt-rgb32
>  create mode 100644 tests/ref/fate/pixfmt-rgb555
>  create mode 100644 tests/ref/fate/pixfmt-rgb565
>  create mode 100644 tests/ref/fate/pixfmt-yuv410p
>  create mode 100644 tests/ref/fate/pixfmt-yuv411p
>  create mode 100644 tests/ref/fate/pixfmt-yuv420p
>  create mode 100644 tests/ref/fate/pixfmt-yuv422p
>  create mode 100644 tests/ref/fate/pixfmt-yuv440p
>  create mode 100644 tests/ref/fate/pixfmt-yuv444p
>  create mode 100644 tests/ref/fate/pixfmt-yuvj420p
>  create mode 100644 tests/ref/fate/pixfmt-yuvj422p
>  create mode 100644 tests/ref/fate/pixfmt-yuvj440p
>  create mode 100644 tests/ref/fate/pixfmt-yuvj444p
>  create mode 100644 tests/ref/fate/pixfmt-yuyv422
>  delete mode 100644 tests/ref/lavf/pixfmt
>
> diff --git a/tests/Makefile b/tests/Makefile
> index 9fec13211f..adca8ad172 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -105,6 +105,7 @@ include $(SRC_PATH)/tests/fate/mpc.mak
>  include $(SRC_PATH)/tests/fate/mpeg4.mak
>  include $(SRC_PATH)/tests/fate/opus.mak
>  include $(SRC_PATH)/tests/fate/pcm.mak
> +include $(SRC_PATH)/tests/fate/pixfmt.mak
>  include $(SRC_PATH)/tests/fate/probe.mak
>  include $(SRC_PATH)/tests/fate/prores.mak
>  include $(SRC_PATH)/tests/fate/qt.mak
> diff --git a/tests/fate-run.sh b/tests/fate-run.sh
> index 1da1f599c8..f8c3444e29 100755
> --- a/tests/fate-run.sh
> +++ b/tests/fate-run.sh
> @@ -220,21 +220,17 @@ lavftest(){
>  ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec"
> "$target_path" "$threads" "$thread_type" "$cpuflags"
>  }
>
> -pixfmt(){
> +pixfmt_conversion(){
>  t="${test#lavf-}"
> +conversion="${t#pixfmt-}"
>  raw_dst="tests/data/$t.lavf.out.yuv"
>  outdir="tests/data/pixfmt"
>  mkdir -p "$outdir"
> -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=${outdir}/${pix_fmt}.yuv
> -run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
> -   $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt
> $pix_fmt $target_path/$raw_dst
> -do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt
> $pix_fmt -i $target_path/$raw_dst \
> -  $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
> -done
> +file=${outdir}/${conversion}.yuv
> +run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
> +   $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion
> $target_path/$raw_dst
> +do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion
> -i $target_path/$raw_dst \
> +  $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
>  }
>
>  video_filter(){
> diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
> index 59b46be54a..34292cf03c 100644
> --- a/tests/fate/avformat.mak
> +++ b/tests/fate/avformat.mak
> @@ -74,13 +74,9 @@ $(FATE_LAVF_PIPE): REF =
> $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
>  $(FATE_LAVF_PIPE): $(VREF)
>
>  FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
> -FATE_LAVF += fate-lavf-pixfmt
>
>  $(FATE_LAVF): $(AREF) $(VREF)
>  $(FATE_LAVF): CMD = lavftest
>
> -fate-lavf-pixfmt: REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
> -fate-lavf-pixfmt: CMD = pixfmt
> -
>  FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES)
> $(FATE_LAVF_PIPE)
>  fate-lavf:

Re: [libav-devel] [PATCH 15/20] tests: Split monolithic lavf-pixfmt test into individual tests

2018-09-24 Thread Diego Biurrun 
On Mon, Sep 24, 2018 at 08:29:05AM +0200, Luca Barbato wrote:
> On 20/09/2018 10:47, Diego Biurrun wrote:
> > ---
> 
> YES!

:-)

This had been a thorn in my side for a loong time...

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 15/20] tests: Split monolithic lavf-pixfmt test into individual tests

2018-09-24 Thread Luca Barbato 
On 20/09/2018 10:47, Diego Biurrun wrote:
> ---


YES!
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 15/20] tests: Split monolithic lavf-pixfmt test into individual tests

2018-09-20 Thread Diego Biurrun 
---
 tests/Makefile |  1 +
 tests/fate-run.sh  | 18 +++---
 tests/fate/avformat.mak|  4 
 tests/fate/pixfmt.mak  | 27 +++
 tests/ref/fate/pixfmt-bgr24|  2 ++
 tests/ref/fate/pixfmt-gray |  2 ++
 tests/ref/fate/pixfmt-monob|  2 ++
 tests/ref/fate/pixfmt-monow|  2 ++
 tests/ref/fate/pixfmt-rgb24|  2 ++
 tests/ref/fate/pixfmt-rgb32|  2 ++
 tests/ref/fate/pixfmt-rgb555   |  2 ++
 tests/ref/fate/pixfmt-rgb565   |  2 ++
 tests/ref/fate/pixfmt-yuv410p  |  2 ++
 tests/ref/fate/pixfmt-yuv411p  |  2 ++
 tests/ref/fate/pixfmt-yuv420p  |  2 ++
 tests/ref/fate/pixfmt-yuv422p  |  2 ++
 tests/ref/fate/pixfmt-yuv440p  |  2 ++
 tests/ref/fate/pixfmt-yuv444p  |  2 ++
 tests/ref/fate/pixfmt-yuvj420p |  2 ++
 tests/ref/fate/pixfmt-yuvj422p |  2 ++
 tests/ref/fate/pixfmt-yuvj440p |  2 ++
 tests/ref/fate/pixfmt-yuvj444p |  2 ++
 tests/ref/fate/pixfmt-yuyv422  |  2 ++
 tests/ref/lavf/pixfmt  | 38 --
 24 files changed, 73 insertions(+), 53 deletions(-)
 create mode 100644 tests/fate/pixfmt.mak
 create mode 100644 tests/ref/fate/pixfmt-bgr24
 create mode 100644 tests/ref/fate/pixfmt-gray
 create mode 100644 tests/ref/fate/pixfmt-monob
 create mode 100644 tests/ref/fate/pixfmt-monow
 create mode 100644 tests/ref/fate/pixfmt-rgb24
 create mode 100644 tests/ref/fate/pixfmt-rgb32
 create mode 100644 tests/ref/fate/pixfmt-rgb555
 create mode 100644 tests/ref/fate/pixfmt-rgb565
 create mode 100644 tests/ref/fate/pixfmt-yuv410p
 create mode 100644 tests/ref/fate/pixfmt-yuv411p
 create mode 100644 tests/ref/fate/pixfmt-yuv420p
 create mode 100644 tests/ref/fate/pixfmt-yuv422p
 create mode 100644 tests/ref/fate/pixfmt-yuv440p
 create mode 100644 tests/ref/fate/pixfmt-yuv444p
 create mode 100644 tests/ref/fate/pixfmt-yuvj420p
 create mode 100644 tests/ref/fate/pixfmt-yuvj422p
 create mode 100644 tests/ref/fate/pixfmt-yuvj440p
 create mode 100644 tests/ref/fate/pixfmt-yuvj444p
 create mode 100644 tests/ref/fate/pixfmt-yuyv422
 delete mode 100644 tests/ref/lavf/pixfmt

diff --git a/tests/Makefile b/tests/Makefile
index 9fec13211f..adca8ad172 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -105,6 +105,7 @@ include $(SRC_PATH)/tests/fate/mpc.mak
 include $(SRC_PATH)/tests/fate/mpeg4.mak
 include $(SRC_PATH)/tests/fate/opus.mak
 include $(SRC_PATH)/tests/fate/pcm.mak
+include $(SRC_PATH)/tests/fate/pixfmt.mak
 include $(SRC_PATH)/tests/fate/probe.mak
 include $(SRC_PATH)/tests/fate/prores.mak
 include $(SRC_PATH)/tests/fate/qt.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 1da1f599c8..f8c3444e29 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -220,21 +220,17 @@ lavftest(){
 ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" 
"$target_path" "$threads" "$thread_type" "$cpuflags"
 }
 
-pixfmt(){
+pixfmt_conversion(){
 t="${test#lavf-}"
+conversion="${t#pixfmt-}"
 raw_dst="tests/data/$t.lavf.out.yuv"
 outdir="tests/data/pixfmt"
 mkdir -p "$outdir"
-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=${outdir}/${pix_fmt}.yuv
-run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
-   $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt 
$target_path/$raw_dst
-do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i 
$target_path/$raw_dst \
-  $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
-done
+file=${outdir}/${conversion}.yuv
+run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
+   $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion 
$target_path/$raw_dst
+do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion -i 
$target_path/$raw_dst \
+  $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
 }
 
 video_filter(){
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 59b46be54a..34292cf03c 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -74,13 +74,9 @@ $(FATE_LAVF_PIPE): REF = 
$(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
 $(FATE_LAVF_PIPE): $(VREF)
 
 FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
-FATE_LAVF += fate-lavf-pixfmt
 
 $(FATE_LAVF): $(AREF) $(VREF)
 $(FATE_LAVF): CMD = lavftest
 
-fate-lavf-pixfmt: REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
-fate-lavf-pixfmt: CMD = pixfmt
-
 FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) 
$(FATE_LAVF_PIPE)
 fate-lavf: $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) 
$(FATE_LAVF_PIPE)
diff --git a/tests/fate/pixfmt.mak b/tests/fate/pixfmt.mak
new file mode 100644
index 00..eaa4cb01bf
--- /dev/null
+++ b/tests/fate/pixfmt.mak
@@ -0,0 +1,27 @@
+FATE_PIXFMT =