From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 17/19] fate/microsoft: Fix test requirements
Date: Fri, 29 Apr 2022 22:23:00 +0200
Message-ID: <AS8PR01MB794484BD9D11E5C992B212718FFC9@AS8PR01MB7944.eurprd01.prod.exchangelabs.com> (raw)
In-Reply-To: <AS8PR01MB7944D402A192D6C7F266ABE58FFD9@AS8PR01MB7944.eurprd01.prod.exchangelabs.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/fate/microsoft.mak | 68 +++++++++++++++++++---------------------
1 file changed, 32 insertions(+), 36 deletions(-)
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 639757880c..ee1a062425 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -1,7 +1,7 @@
-FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
+FATE_MICROSOFT-$(call FRAMECRC, AVI, MSMPEG4V1) += fate-msmpeg4v1
fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1-pal
+FATE_MICROSOFT-$(call FRAMECRC, ASF, MSS1) += fate-mss1-pal
fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an
FATE_MSS2 += fate-mss2-pal
@@ -10,80 +10,76 @@ fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv
FATE_MSS2 += fate-mss2-pals
fate-mss2-pals: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepals.wmv
-FATE_MSS2 += fate-mss2-rgb555
-fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv -pix_fmt rgb555le -vf scale
-
-FATE_MSS2 += fate-mss2-rgb555s
+FATE_MSS2-$(call FRAMECRC, ASF, MSS2, SCALE_FILTER) += fate-mss2-rgb555 fate-mss2-rgb555s
+fate-mss2-rgb555: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555.wmv -pix_fmt rgb555le -vf scale
fate-mss2-rgb555s: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rle555s.wmv -pix_fmt rgb555le -vf scale
FATE_MSS2 += fate-mss2-wmv
fate-mss2-wmv: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/msscreencodec.wmv -an -frames 100
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS2) += $(FATE_MSS2)
-fate-mss2: $(FATE_MSS2)
+FATE_MSS2-$(call FRAMECRC, ASF, MSS2) += $(FATE_MSS2)
-FATE_MTS2 += fate-mts2-xesc
-fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p
+FATE_MICROSOFT += $(FATE_MSS2-yes)
+fate-mss2: $(FATE_MSS2-yes)
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += $(FATE_MTS2)
-fate-mts2: $(FATE_MTS2)
+FATE_MTS2-$(call FRAMECRC, ASF, MTS2) += fate-mts2-xesc
+fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p
-FATE_MSVIDEO1 += fate-msvideo1-8bit
-fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -vf scale
+FATE_MICROSOFT += $(FATE_MTS2-yes)
+fate-mts2: $(FATE_MTS2-yes)
-FATE_MSVIDEO1 += fate-msvideo1-16bit
+FATE_MSVIDEO1-$(call FRAMECRC, AVI, MSVIDEO1, SCALE_FILTER) += fate-msvideo1-8bit fate-msvideo1-16bit
+fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 -vf scale
fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 -vf scale
-FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1)
-fate-msvideo1: $(FATE_MSVIDEO1)
+FATE_MICROSOFT += $(FATE_MSVIDEO1-yes)
+fate-msvideo1: $(FATE_MSVIDEO1-yes)
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += fate-mts2
+FATE_MICROSOFT-$(call FRAMECRC, ASF, MTS2) += fate-mts2
fate-mts2: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/ScreenCapture.xesc
-FATE_WMV3_DRM += fate-wmv3-drm-dec
+FATE_WMV3_DRM-$(call FRAMECRC, ASF, WMV3) += fate-wmv3-drm-dec fate-wmv3-drm-nodec
# discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
-
-FATE_WMV3_DRM += fate-wmv3-drm-nodec
+fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c:a copy -c:v copy
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV3_DRM)
-fate-wmv3-drm: $(FATE_WMV3_DRM)
+FATE_MICROSOFT += $(FATE_WMV3_DRM-yes)
+fate-wmv3-drm: $(FATE_WMV3_DRM-yes)
FATE_MICROSOFT-$(call DEMDEC, ASF, WMV2) += fate-wmv8-x8intra
fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040
+FATE_VC1 += fate-vc1_sa00040
fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050
+FATE_VC1 += fate-vc1_sa00050
fate-vc1_sa00050: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00050.vc1
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091
+FATE_VC1 += fate-vc1_sa10091
fate-vc1_sa10091: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10091.vc1
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143
+FATE_VC1 += fate-vc1_sa10143
fate-vc1_sa10143: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10143.vc1
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021
+FATE_VC1 += fate-vc1_sa20021
fate-vc1_sa20021: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA20021.vc1
-FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_ilaced_twomv
+FATE_VC1 += fate-vc1_ilaced_twomv
fate-vc1_ilaced_twomv: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vc1/ilaced_twomv.vc1
-FATE_VC1-$(CONFIG_VC1T_DEMUXER) += fate-vc1test_smm0005
-fate-vc1test_smm0005: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0005.rcv
+FATE_VC1-$(call FRAMECRC, VC1, VC1, VC1_PARSER EXTRACT_EXTRADATA_BSF) += $(FATE_VC1)
-FATE_VC1-$(CONFIG_VC1T_DEMUXER) += fate-vc1test_smm0015
+FATE_VC1-$(call FRAMECRC, VC1T, WMV3) += fate-vc1test_smm0005 fate-vc1test_smm0015
+fate-vc1test_smm0005: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0005.rcv
fate-vc1test_smm0015: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SMM0015.rcv
-FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism
+FATE_VC1-$(call FRAMECRC, MOV, VC1) += fate-vc1-ism
fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an
-FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
+FATE_MICROSOFT += $(FATE_VC1-yes)
fate-vc1: $(FATE_VC1-yes)
-FATE_MICROSOFT-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata
+FATE_MICROSOFT-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL ASF_DEMUXER FRAMECRC_MUXER) += fate-asf-repldata
fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf -c copy
FATE_MICROSOFT += $(FATE_MICROSOFT-yes)
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-04-29 20:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 23:24 [FFmpeg-devel] [PATCH 01/13] fate/qt: " Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 02/13] fate/canopus: " Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 03/13] fate/dnxhd: " Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 04/13] fate/ea: " Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 05/13] fate/vbn: " Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 06/13] fate/vbn, tests/fate-run: Delete intermediate VBN-files after tests Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 07/13] fate/vpx: Remove unnecessary eval Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 08/13] tests/Makefile: Add FRAMEMD5 auxiliary function Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 09/13] fate/vpx: Fix test requirements Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 10/13] fate/vpx: Move webm-dash-manifest tests to a new file Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 11/13] fate/prores: Fix test requirements Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 12/13] fate/gif: " Andreas Rheinhardt
2022-04-28 23:28 ` [FFmpeg-devel] [PATCH 13/13] fate/gif: Remove nonsense requirement Andreas Rheinhardt
2022-04-29 20:22 ` [FFmpeg-devel] [PATCH 14/19] tests/Makefile: Remove unset FATE_TESTS Andreas Rheinhardt
2022-04-29 20:22 ` [FFmpeg-devel] [PATCH 15/19] fate/hevc: Fix test requirements Andreas Rheinhardt
2022-04-29 20:22 ` [FFmpeg-devel] [PATCH 16/19] fate/lossless-video: " Andreas Rheinhardt
2022-04-29 20:23 ` Andreas Rheinhardt [this message]
2022-04-29 20:23 ` [FFmpeg-devel] [PATCH 18/19] fate/mpeg4: " Andreas Rheinhardt
2022-04-29 20:23 ` [FFmpeg-devel] [PATCH 19/19] fate/pixlet: " Andreas Rheinhardt
2022-04-30 6:25 ` [FFmpeg-devel] [PATCH 20/24] fate/qtrle: " Andreas Rheinhardt
2022-04-30 6:25 ` [FFmpeg-devel] [PATCH 21/24] tests/ref: Remove unused reference files Andreas Rheinhardt
2022-04-30 6:25 ` [FFmpeg-devel] [PATCH 22/24] tests/fate-run: Always use -bitexact for ffprobe Andreas Rheinhardt
2022-04-30 6:25 ` [FFmpeg-devel] [PATCH 23/24] fate/hap: Fix test requirements Andreas Rheinhardt
2022-04-30 6:25 ` [FFmpeg-devel] [PATCH 24/24] fate/h264: " Andreas Rheinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8PR01MB794484BD9D11E5C992B212718FFC9@AS8PR01MB7944.eurprd01.prod.exchangelabs.com \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git