On Sun, Feb 09, 2014 at 07:28:17PM +0100, Luca Barbato wrote:
> From: Peter B <p...@das-werkstatt.com>
> 
> Signed-off-by: Luca Barbato <lu_z...@gentoo.org>
> ---

I'm assuming this is not meant to be pushed right now?

> --- /dev/null
> +++ b/tests/fate/ffv1.mak
> @@ -0,0 +1,314 @@
> +# This Makefile checks for $(CONFIG_...) variables being set, so we can
> +# include/exclude tests accordingly:
> +ifdef CONFIG_AVCONV
> +FLAGS_FFV1_V3 = -strict experimental
> +else
> +FLAGS_FFV1_V3 =
> +endif

This needs to go along with all the related ifdeffery below.

> +DEC_SRC = $(TARGET_PATH)/tests/data/fate
> +
> +fate-ffv1-enc-%: CODEC = $(word 2, $(subst -, ,$(@)))
> +fate-ffv1-enc-%: FMT = avi
> +fate-ffv1-enc-%: SRC = tests/data/vsynth1.yuv
> +# Limit the duration of test videos to 4 frames at 25fps:
> +fate-ffv1-enc-%: DUR = 0:00:00.160
> +fate-ffv1-enc-%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p 
> $(RAWDECOPTS)" $(SRC) $(FMT) "-t $(DUR) -c $(CODEC) $(ENCOPTS)" rawvideo "-s 
> 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"
> +
> +
> +FATE_FFV1_LEVEL1 =     v1-defaults \
> +                       v1-gray \
> +                       v1-rgb32 \
> +                       v1-yuv410p \
> +                       v1-yuv411p \
> +                       v1-yuv420p \
> +                       v1-yuv422p \
> +                       v1-yuv444p \
> +                       v1-bgra \
> +                       v1-tff \
> +                       v1-bff

Aligned \ would be a plus.

> +FATE_FFV1 = $(FATE_FFV1_LEVEL1) \
> +            $(FATE_FFV1_LEVEL3)

nit: no need to break lines here

> +###################################################
> +#  Decoding:
> +###################################################
> +#  YUV (8bit)
> +fate-ffv1-dec-v1-defaults:       ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-defaults.avi} fate-ffv1-enc-v1-defaults
> +fate-ffv1-dec-v1-yuv410p:        ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-yuv410p.avi} fate-ffv1-enc-v1-yuv410p
> +fate-ffv1-dec-v1-yuv411p:        ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-yuv411p.avi} fate-ffv1-enc-v1-yuv411p
> +fate-ffv1-dec-v1-yuv420p:        ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-yuv420p.avi} fate-ffv1-enc-v1-yuv420p
> +fate-ffv1-dec-v1-yuv422p:        ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-yuv422p.avi} fate-ffv1-enc-v1-yuv422p
> +fate-ffv1-dec-v1-yuv444p:        ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-yuv444p.avi} fate-ffv1-enc-v1-yuv444p
> +fate-ffv1-dec-v1-yuv440p:        ${CMD = framecrc -i 
> $(DEC_SRC)/ffv1-enc-v1-yuv440p.avi} fate-ffv1-enc-v1-yuv440p

Generally $() is preferred over ${}.

> +#  YUV (8bit)
> +#  - This also iterates through all coder/context combinations.
> +fate-ffv1-enc-v3-yuv410p:        ENCOPTS = -level 3 -g 1 -coder 0 -context 0 
> -slices 4 -slicecrc 0 -pix_fmt yuv410p $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv420p:        ENCOPTS = -level 3 -g 1 -coder 0 -context 1 
> -slices 12 -slicecrc 0 -pix_fmt yuv420p $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv422p:        ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt yuv422p $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv444p:        ENCOPTS = -level 3 -g 1 -coder 1 -context 1 
> -slices 30 -slicecrc 0 -pix_fmt yuv444p $(FLAGS_FFV1_V3)
> +#  YUV (9bit)
> +fate-ffv1-enc-v3-yuv420p9:       ENCOPTS = -level 3 -g 1 -coder -1 -context 
> 1 -slices 24 -slicecrc 0 -pix_fmt yuv420p9 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv422p9:       ENCOPTS = -level 3 -g 1 -coder 2 -context 0 
> -slices 30 -slicecrc 0 -pix_fmt yuv422p9 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv444p9:       ENCOPTS = -level 3 -g 1 -coder 1 -context 1 
> -slices 4  -slicecrc 0 -pix_fmt yuv444p9 $(FLAGS_FFV1_V3)
> +#  Gray
> +fate-ffv1-enc-v3-gray:           ENCOPTS = -level 3 -g 1 -coder 0 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gray $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-gray16:         ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gray16 $(FLAGS_FFV1_V3)
> +#  RGB
> +fate-ffv1-enc-v3-rgb32:          ENCOPTS = -level 3 -g 1 -coder 0 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt rgb32 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-bgr0:           ENCOPTS = -level 3 -g 1 -coder 0 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt bgr0 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-gbrp9:          ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gbrp9 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-gbrp10:         ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gbrp10 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-gbrp12:         ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gbrp12 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-gbrp14:         ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gbrp14 $(FLAGS_FFV1_V3)
> +
> +# Slice CRC: On
> +fate-ffv1-enc-v3-yuv422p_crc:    ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 30 -slicecrc 1 -pix_fmt yuv422p $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv422p9_crc:   ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 30 -slicecrc 1 -pix_fmt yuv422p9 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv422p10_crc:  ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 30 -slicecrc 1 -pix_fmt yuv422p10 $(FLAGS_FFV1_V3)
> +fate-ffv1-enc-v3-yuv422p16_crc:  ENCOPTS = -level 3 -g 1 -coder 1 -context 0 
> -slices 30 -slicecrc 1 -pix_fmt yuv422p16 $(FLAGS_FFV1_V3)

nit: incomplete vertical alignment, more below

> +###################################################
> +# Testing error resilience:
> +###################################################
> +#fate-ffv1-fuzzed1:               CMD = framecrc -i 
> $(TARGET_SAMPLES)/ffv1/ffv1.3-yuv422p-fuzzed.avi
> +#fate-ffv1-fuzzed2:               CMD = framecrc -i 
> $(TARGET_SAMPLES)/ffv1/ffv1.3-yuv422p_crc-fuzzed.avi
> +
> +###################################################
> +# Testing invalid arguments:
> +###################################################
> +#fate-ffv1-invalid1:              ENCOPTS = -coder 1 -context -1
> +#fate-ffv1-invalid2:              ENCOPTS = -level 3 -slices 3
> +#fate-ffv1-invalid3:              ENCOPTS = -pix_fmt gbrp16
> +#fate-ffv1-invalid4:              ENCOPTS = -level 2
> +#fate-ffv1-invalid5:              ENCOPTS = -level 3 -coder 0 -context 0 
> -slices 24 -slicecrc 0 -pix_fmt gbrp9
> +
> +###################################################
> +FATE_FFV1 := $(FATE_FFV1:%=fate-ffv1-enc-%) \
> +             $(FATE_FFV1:%=fate-ffv1-dec-%) \
> +
> +#             fate-ffv1-invalid1 \
> +#             fate-ffv1-invalid2 \
> +#             fate-ffv1-invalid3 \
> +#             fate-ffv1-invalid4 \
> +#             fate-ffv1-invalid5 \
> +#             fate-ffv1-fuzzed1 \
> +#             fate-ffv1-fuzzed2

Commented-out cruft needs to go before pushing.

> +# Requires generating vsynth1.yuv as input source:
> +$(FATE_FFV1-yes): tests/data/vsynth1.yuv

redundant comment

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

Reply via email to