From patchwork Sun Sep 19 01:49:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp318693iob; Sat, 18 Sep 2021 18:49:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyURDfHgyaEyrYmINQCdkBEtRzcgWv4Wv0FSBpNp6avmnQoQXNTESpOPGD4vWMwMf7c3qJo X-Received: by 2002:a50:be87:: with SMTP id b7mr19446048edk.333.1632016180625; Sat, 18 Sep 2021 18:49:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q20si12011215eds.112.2021.09.18.18.49.39; Sat, 18 Sep 2021 18:49:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=qekCFIGU; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28B2368AEE4; Sun, 19 Sep 2021 04:49:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2043.outbound.protection.outlook.com [40.92.90.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C51736802E4 for ; Sun, 19 Sep 2021 04:49:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RF1LUVbEaO9hlaIrAPM+e4VFotOXmU6/4uLDmuEvhp2FL1vJaOgaw3v611vq1FF5lzHzn8vgtapdn3CD0CRWpt2zAnhtO9ZWaCTXGbzmgI0jxQoMRD5eLcSHcgVP6sMCFhBOGyKoVckIQ3K5K/pEBMO/yWvfWUP3u/nmmdZmRKU+LVuliEkJ7OX3o6uIAjOGJ6m881CPdVyRTSOIKbJo0OfgSAUoiIoPhFFoxSpRPqFoEHdzSOQJ79FQtgtFJeEJKwWqjTD0j4qVyF96kh4HgLqOuyanxKHlLJRXK6arkbu0QBgD28JS12rJJ+kos0h/nqf9YV9VhBfpNPBbzMaWDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dxlkWC1llB7vb6G2zG9ZLjMkt9Hzf91okDUeywdfzLk=; b=NSk/zaa2Z7PmYJ5cJuwGzHQNGjn5NSzmzvTjMKw/VBKmc9BNGnt9dRuvWJT0DjWoN/V1+NYtdX9fLChVhn3Wn9u1R+p9jEJoJXDwO8RJPKtFgtTHX0pr3qqUWtc1VYJl09EwABIwctf1kBkWfgXxPHqkw/w+RnoKDk/nnSp9hU681SpJfEK3/fDWlaJKka5Ouj/xDWjWQMdUnv2bGF9ZcRlBNT8uVd5nNi091jwhf0jurAI3BGpbMaVoh2ucMkmd8wuPnkhvGVu0cGoQRBAFy6z3OMS8fH+Ry8/O49MnRly/yasYbfnunSabKlhYd0Q5HzrdzKjn14JuJt5sRFNCng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dxlkWC1llB7vb6G2zG9ZLjMkt9Hzf91okDUeywdfzLk=; b=qekCFIGUyFuCSoQEMRVJUPRouzDga8ofTPGtA1WHQWhMsb+RpsR2/lrqE96CZCb0+mi4+bfrbrkwKBhh3V9Auu3g0//zcnOjD8VR+NORfdPkMz2WbTFDuh+rGH0Kmss0iJrbQ73rirlBhvmLkd9jXXzsWMb5+ODS/dgzhzRXTJwOAeJjTfwFd6Ir6nd0/LSOTISQNcx8eGgGjNCa23E0UEq9JgxFjZkywe6X9Wtb42NAO2Qv66lBYgFBjIM1rvBHjPlyKvDuXJdqyhyeFYv2oTqNKfDixrpZHVr4QEsbI5DDvgm2RJanm6sSOXPI39YRZ1klC6KTbUCWlQ3H+wHZAg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AM6PR03MB5765.eurprd03.prod.outlook.com (20.179.244.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.18; Sun, 19 Sep 2021 01:49:27 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Sun, 19 Sep 2021 01:49:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Sep 2021 03:49:18 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [JJRqGwDFV037orN2bapIcbDAPSzAlCfo] X-ClientProxiedBy: AM3PR07CA0137.eurprd07.prod.outlook.com (2603:10a6:207:8::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210919014919.2431315-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR07CA0137.eurprd07.prod.outlook.com (2603:10a6:207:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Sun, 19 Sep 2021 01:49:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7ad823c-8684-489e-0750-08d97b0fb696 X-MS-Exchange-SLBlob-MailProps: EpEO96k6Wok6BVvod2FmIc/Zu5j76HoE26phsnRrb/wqr/7RfhQ+53kkuNEEOPBmDtsgxnyrnoL0dOL8V67QOvLmkI8sUwpjajKANyw+gUIx4CJs7sX988Q6OhyoN0N/cmQvLnfTbKrAM+yqyJqsNlE+N3z2pI7lO2gP7fiEhRfye32DhmC0GQNPr+TahhUrFHQe7liZAxQPNjIK3SGpZkhJUxGY0Nsu34pU8UXz6Ml95wkD7rS+tZHAjTwlWmT62/HJxHpbNCKgQk8u0V856MxMCzGhEg1Q1EzAm3RHiUXCsIRdlQ5b9y79KiOXU5/5wpDi07jB0koQQnE1xIGdkb+JxoLO4F4pcTQj3hmvQFN5OwxFLS7eKJIARRoiqHaS9xn1rw3+ZXSFRz7OC/35re+Xyi7C0f48UKKMJgcrZrEaTweyJmVb9y2uRnhNNA2D6lyX+bWzDluWzEnKxWhZO69SuzLpUdBl6XKYVbL8BBqfzp2tOQOwpBgNjzVygNpJQV8MlQRpOalblxmOAHoKkO50Bv++0MfMD9OSrj1EJnWUxaRDUtoR5muDNVJy1V4aDVlDXi2oKMxvtVCJwU0GRiadDy/SIpHfCJFSlwf9pxYS/Eae4ORQPvrMWf2p6tBO0XnZpH268QOY3pZkFxPB3+Fjymikl2o98qKeozPGxa285CbhPUGxsmXKgVFuLbewoRbvOpPXiZn8v4KGQw2/5cz7+GKJhtzROCwAP9DwjqoUL5l8SE53Dk9GzDkGZGL/qGhWE475F/s= X-MS-TrafficTypeDiagnostic: AM6PR03MB5765: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GOXuzydrbJNadeFSmjLXGFwzEwsG3JrMTOXPkbPVaVCjxwU55JGUIfFTBtQ5/DJiTAZQknjjFro4Tfu9El8myo9G8wnIGkcTyDfqXfbWBGEEB8m5RRh2sFCFwgdcXTeafJHHCmX19buMqNU09FDkaFTq5XHFIzLwLQ1HljFuGBy9ll8G+g6q3zj1TuQmaEZRWJAqLoLAoAI1GlK2E/VPzxg3W+scCiodQstVj0zyu4ZS+7ikK7qTLfS63LxuLeCkrzTQSrFKZ1vzVHtqHaUjSbNY9Ly/RHUWa0HJIXVb10/BtEphv+TATq+crGiJZb6Lk8ivNPP8ItsxbQB+FhW7YiCsV1fGzbMk7iuwDRm3gkifjy3HMdIcI0SZvri12dqtahlpvAkc0AA1k3vS6nwA7EqIAhIPiM3KHAky3zfgbuFjunjIQeXNh8sverlYhyjS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b+LH1kn8BqW9YCChY5Mbw4EfZEhy4mMRSKfiRa/POMd6cMdaYBp4fQLePTY2JHQDoTRPvG+N7DUESLbNY7XVoNH7/kY7Pl1iu5lShHdv1G65hovO6Pr5LsA7yh9PlmZnlIXEiNFTCR1zxWKHPFFBOw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7ad823c-8684-489e-0750-08d97b0fb696 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2021 01:49:27.0514 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5765 Subject: [FFmpeg-devel] [PATCH] fate/demux, gapless, image: Add missing ffprobe dependencies X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DuW/AUhp8wM5 And remove the unnecessary ffmpeg dependencies while at it. Signed-off-by: Andreas Rheinhardt --- tests/fate/demux.mak | 14 ++++++++------ tests/fate/gapless.mak | 6 +++--- tests/fate/image.mak | 8 +++++--- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index ab49be94cd..6ddbbcbd4d 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -48,7 +48,7 @@ FATE_SAMPLES_DEMUX-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_ENCO fate-fits-demux: tests/data/fits-multi.fits fate-fits-demux: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -c:v copy -FATE_SAMPLES_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux +FATE_FFPROBE_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux fate-flv-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/flv/Enigma_Principles_of_Lust-part.flv FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux @@ -79,10 +79,10 @@ fate-mlv-demux: CMD = crc -i $(TARGET_SAMPLES)/mlv/M19-0333-cut.MLV -c copy FATE_SAMPLES_DEMUX-$(CONFIG_MOV_DEMUXER) += fate-mov-mp3-demux fate-mov-mp3-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mpegaudio/packed_maindata.mp3.mp4 -c copy -FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux fate-ts-opus-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/opus/test-8-7.1.opus-small.ts -FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-small-demux fate-ts-small-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/mpegts/h264small.ts FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv @@ -100,7 +100,7 @@ fate-nistsphere-demux: CMD = crc -i $(TARGET_SAMPLES)/nistsphere/nist-ulaw.nist FATE_SAMPLES_DEMUX-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -c:v copy -c:a copy -FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux +FATE_FFPROBE_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux fate-oggopus-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ogg/intro-partial.opus FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggvp8-demux @@ -157,9 +157,11 @@ fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -c:v copy -c FATE_SAMPLES_DEMUX-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy -FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux +FATE_FFPROBE_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux fate-ts-demux: CMD = ffprobe_demux $(TARGET_SAMPLES)/ac3/mp3ac325-4864-small.ts FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes) FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX) -fate-demux: $(FATE_SAMPLES_DEMUX) +FATE_FFPROBE_DEMUX += $(FATE_FFPROBE_DEMUX-yes) +FATE_SAMPLES_FFPROBE += $(FATE_FFPROBE_DEMUX) +fate-demux: $(FATE_SAMPLES_DEMUX) $(FATE_FFPROBE_DEMUX) diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak index b035e18d03..68a396e187 100644 --- a/tests/fate/gapless.mak +++ b/tests/fate/gapless.mak @@ -1,7 +1,7 @@ FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3 fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3 "-c:a mp3" -FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3-side-data +FATE_GAPLESSINFO_PROBE-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3-side-data fate-gapless-mp3-side-data: CMD = ffprobe_demux $(TARGET_SAMPLES)/gapless/gapless.mp3 FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-audiomatch-square-mp3 @@ -122,7 +122,7 @@ FATE_GAPLESSENC-$(CONFIG_FFPROBE) = $(FATE_GAPLESSENC_PROBE-yes) FATE_GAPLESSENC = $(FATE_GAPLESSENC-yes) FATE_SAMPLES_AVCONV += $(FATE_GAPLESS) -FATE_SAMPLES_AVCONV += $(FATE_GAPLESSINFO) -FATE_SAMPLES_AVCONV += $(FATE_GAPLESSENC) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_GAPLESSENC) +FATE_SAMPLES_FFPROBE += $(FATE_GAPLESSINFO) fate-gapless: $(FATE_GAPLESS) $(FATE_GAPLESSINFO) $(FATE_GAPLESSENC) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 3b58972a53..e99fa0e1ce 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -374,17 +374,19 @@ $(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP)))) FATE_PNG += fate-png-int-rgb24 fate-png-int-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png -sws_flags +accurate_rnd+bitexact -FATE_PNG += fate-png-frame-metadata +FATE_PNG_PROBE += fate-png-frame-metadata fate-png-frame-metadata: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries frame_tags \ -i $(TARGET_SAMPLES)/filter/pixelart0.png -FATE_PNG += fate-png-side-data +FATE_PNG_PROBE += fate-png-side-data fate-png-side-data: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames \ -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG) +FATE_PNG_PROBE-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG_PROBE) FATE_IMAGE += $(FATE_PNG-yes) -fate-png: $(FATE_PNG-yes) +FATE_IMAGE_PROBE += $(FATE_PNG_PROBE-yes) +fate-png: $(FATE_PNG-yes) $(FATE_PNG_PROBE-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 -vf scale