diff mbox series

[FFmpeg-devel,1/4] tests/fate/vcodec: drop unnecessary options

Message ID 20220520093653.26035-1-anton@khirnov.net
State Accepted
Commit aa7d38f27caf9545118ad347e09876cc08dfd4e0
Headers show
Series [FFmpeg-devel,1/4] tests/fate/vcodec: drop unnecessary options | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov May 20, 2022, 9:36 a.m. UTC 
jpeg2000 will be chosen by default, there is no reason to prescribe it
explicitly. No other test does so.
---
 tests/fate/vcodec.mak | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Andreas Rheinhardt May 20, 2022, 10:17 a.m. UTC | #1 
Anton Khirnov:
> jpeg2000 will be chosen by default, there is no reason to prescribe it
> explicitly. No other test does so.
> ---
>  tests/fate/vcodec.mak | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
> index 3c9b7f1ff7..c19fb8633a 100644
> --- a/tests/fate/vcodec.mak
> +++ b/tests/fate/vcodec.mak
> @@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
>  fate-vsynth%: FMT = avi
>  fate-vsynth%: DEFAULT_SIZE = -s 352x288
>  fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH)
> -fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(DECINOPTS)"
> +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)"
>  fate-vsynth%: CMP_UNIT = 1
>  fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
>  
> @@ -218,9 +218,7 @@ fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
>  
>  FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
>  fate-vsynth%-jpeg2000:                ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
> -fate-vsynth%-jpeg2000:                DECINOPTS = -c:v jpeg2000
>  fate-vsynth%-jpeg2000-97:             ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
> -fate-vsynth%-jpeg2000-97:             DECINOPTS = -c:v jpeg2000
>  
>  FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
>  fate-vsynth%-ljpeg:              ENCOPTS = -strict -1

LGTM.

- Andreas
Anton Khirnov May 24, 2022, 11:58 a.m. UTC | #2 
set pushed
diff mbox series

Patch

diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 3c9b7f1ff7..c19fb8633a 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -6,7 +6,7 @@  fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
 fate-vsynth%: FMT = avi
 fate-vsynth%: DEFAULT_SIZE = -s 352x288
 fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH)
-fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(DECINOPTS)"
+fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)"
 fate-vsynth%: CMP_UNIT = 1
 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
 
@@ -218,9 +218,7 @@  fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
 
 FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
 fate-vsynth%-jpeg2000:                ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
-fate-vsynth%-jpeg2000:                DECINOPTS = -c:v jpeg2000
 fate-vsynth%-jpeg2000-97:             ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
-fate-vsynth%-jpeg2000-97:             DECINOPTS = -c:v jpeg2000
 
 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
 fate-vsynth%-ljpeg:              ENCOPTS = -strict -1