From patchwork Thu Apr 23 07:20:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 19195 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F3E6C449E7E for ; Thu, 23 Apr 2020 10:26:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD2EE68BDFA; Thu, 23 Apr 2020 10:26:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F6D968BCD1 for ; Thu, 23 Apr 2020 10:25:54 +0300 (EEST) Received: by mail-ed1-f45.google.com with SMTP id r16so3578107edw.5 for ; Thu, 23 Apr 2020 00:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=fUNmgUVvA16/47b+z4dAxvlOb0A0BL5cAs0M0cAjcmg=; b=FYcR7EdpWMekGFUPoFzXeE8EwdFzBQ1Zj8scQGVFugzPvduZ/HXmb5dL3uidxAVVM5 gqD4KEW5aqFU6cYbnbFU2ZIRryk9rEWSb9QhwYwI+eDbJ+g4mB+O6hDn+Ka4rQxam4r3 vAzSecshBcFB4uzIG7Y2s8IcBLHUnBSyR+HtwMxGZA/aEFnh8LCkH9wbd/r0M/IWVnxM KWmn3QwM0eY9yu4SR9fTI2g7X6hn0MMfF+n4V7qOnU5CSfLrkeW2C5Y5tPZ72LPpplGg e8x0grd/1nM1PED9ss+o3ecT2Xoe1DOjd+W+KE6wPSHURiUSKusaPV6tywpf7iWq1uqc N7Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=fUNmgUVvA16/47b+z4dAxvlOb0A0BL5cAs0M0cAjcmg=; b=fYczFHzcxYWeBBM04SoMvqoLVd6AgL+kYo8dkNaMhSDiPKdQkLPbmlJL6M/L2oko+p alOIZ35EVFbdL1SX/qfHXaWZemunMPlb69qpWwmBdukUo9QwcnTFXmeSXGdQK2ARwLJa 0LtK44SdTvDdLa+dAIdwv1/7dctgzpIOFqJujP0zvSzVzKYGHjIcmvqQ/+Na2Vinob2n DeTRweOCRzLtkJMZnORgycZqksiYdH/ivC4UoSCuuP8EPbyC3owwYADRnrlDYFSwEZ5q d26lkLbcNmceTlwewFPTviNSeB8uPAx5VQBbhkxGSjHnfV4lfDDdbDC9/b6hIPI6VxS8 WkyQ== X-Gm-Message-State: AGi0PubmlqoJpMWdd3yGBof158pL52YNFnC0GsMCd7gGZ4zz68Vso4o3 cloC2Lsyt/gD/Mm2QTyJusO7Z9ThZ+g= X-Google-Smtp-Source: APiQypKHPf9XcbLRSGwfA1MORyZUFr/Wbm5MJNxhJ8mQJxnUMW52Z1MbfqyR2WCtdkfw7teFIL40mQ== X-Received: by 2002:ac2:4a76:: with SMTP id q22mr1520357lfp.157.1587626431969; Thu, 23 Apr 2020 00:20:31 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id t5sm994735lfc.69.2020.04.23.00.20.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 00:20:31 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 10:20:30 +0300 Message-Id: <20200423072030.12338-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] fate: hevc: Skip a few large testcases if large tests are disabled X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- I've seen spurious failures of specifically these tests, in memory constrained setups. --- tests/fate/hevc.mak | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 35af3e43ac..65c5a262e9 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -160,6 +160,8 @@ HEVC_SAMPLES_422_10BIT = \ HEVC_SAMPLES_422_10BIN = \ Main_422_10_A_RExt_Sony_1 \ + +HEVC_SAMPLES_422_10BIN_LARGE = \ Main_422_10_B_RExt_Sony_1 \ HEVC_SAMPLES_444_8BIT = \ @@ -169,6 +171,8 @@ HEVC_SAMPLES_444_12BIT = \ IPCM_B_RExt_NEC \ PERSIST_RPARAM_A_RExt_Sony_1\ PERSIST_RPARAM_A_RExt_Sony_3\ + +HEVC_SAMPLES_444_12BIT_LARGE = \ SAO_A_RExt_MediaTek_1 \ @@ -206,6 +210,11 @@ FATE_HEVC += fate-hevc-conformance-$(1) fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le endef +define FATE_HEVC_TEST_422_10BIN_LARGE +FATE_HEVC_LARGE += fate-hevc-conformance-$(1) +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le +endef + define FATE_HEVC_TEST_444_8BIT FATE_HEVC += fate-hevc-conformance-$(1) fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p @@ -216,15 +225,22 @@ FATE_HEVC += fate-hevc-conformance-$(1) fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le endef +define FATE_HEVC_TEST_444_12BIT_LARGE +FATE_HEVC_LARGE += fate-hevc-conformance-$(1) +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le +endef + $(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N)))) $(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N)))) $(foreach N,$(HEVC_SAMPLES_422_10BIT),$(eval $(call FATE_HEVC_TEST_422_10BIT,$(N)))) $(foreach N,$(HEVC_SAMPLES_422_10BIN),$(eval $(call FATE_HEVC_TEST_422_10BIN,$(N)))) +$(foreach N,$(HEVC_SAMPLES_422_10BIN_LARGE),$(eval $(call FATE_HEVC_TEST_422_10BIN_LARGE,$(N)))) $(foreach N,$(HEVC_SAMPLES_444_8BIT),$(eval $(call FATE_HEVC_TEST_444_8BIT,$(N)))) $(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N)))) +$(foreach N,$(HEVC_SAMPLES_444_12BIT_LARGE),$(eval $(call FATE_HEVC_TEST_444_12BIT_LARGE,$(N)))) fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact -FATE_HEVC += fate-hevc-paramchange-yuv420p-yuv420p10 +FATE_HEVC_LARGE += fate-hevc-paramchange-yuv420p-yuv420p10 tests/data/hevc-mp4.mov: TAG = GEN tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data @@ -241,6 +257,7 @@ fate-hevc-skiploopfilter: CMD = framemd5 -skip_loop_filter nokey -i $(TARGET_SAM FATE_HEVC += fate-hevc-skiploopfilter FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC) +FATE_HEVC-$(call ALLYES, HEVC_DEMUXER HEVC_DECODER LARGE_TESTS) += $(FATE_HEVC_LARGE) # this sample has two stsd entries and needs to reload extradata FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload