From patchwork Wed May 18 15:34:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp391854pzb; Wed, 18 May 2022 08:35:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMR9DhZYyR+Nirf2VsxwrLNRiuRDBdk58XSDcKZLWPzMVQVFoXgoo+TeiwzmHpbPuH/5Jn X-Received: by 2002:a05:6402:c90:b0:42a:98c7:3fe with SMTP id cm16-20020a0564020c9000b0042a98c703femr361018edb.270.1652888119260; Wed, 18 May 2022 08:35:19 -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 mp26-20020a1709071b1a00b006f42491e0a0si1154857ejc.655.2022.05.18.08.35.18; Wed, 18 May 2022 08:35:19 -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=fjLuFIaD; 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 4F0A968B3AF; Wed, 18 May 2022 18:35:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074068.outbound.protection.outlook.com [40.92.74.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 961DF68B1CD for ; Wed, 18 May 2022 18:35:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nH77BNP5DGgbJC6Orn9km9ridHwCEeTUPmOT7odGYpaGsZIAwziBtTQXi7PahaJ9OPk/nGL0viCKMHwctWAJ+hr1cvKZ6yQSTb2ysXV1Z/feZZ93l92VbE08ZOkYVJWGx2bRJSl5H5Ogm5R0FlamJs5bbRZkgC/Irssf+zqltOy26pzOI1LC2zur+IuElEO6GDM+5IELFtgm4pyJQ9lgUhC7w23occPKVlqn3Hbd8dH4XKJ+//ditwOMEWYvqEG4TSVCc7mxAwSCbzQxgZ+v/Fp/mn/iu/qgwwJcby6nsrATwKieEEkgvAKRY/kqb8CCPvCglp/Hfg9KoYq2mFva8g== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NUTVnjXOrQITMfacBez+VGU6pwe/cJ5GqqJ4+riN3YE=; b=HIH5nYfX4VuW89Qa7WIfOYFaPvKSgpNHymjXCR06dpy++ub6NHjKMFVDEeTbomxPY2ZtVLO0QJz/wWhUFEfw+2jROHDWYmF4y7bdb0z+CsTnTYoNTcFtZSqSZHJR+8JqPULkuhpp16QCySAu/6JN1oHc/DyDpz1zFnFmYowgT8gSSTMwxl5ADkW8pD4EjCacPtcqgJA5o8X3t1MSLKVVReJVo3+JHt8m2Lv7gwIA6Oh+ZIkwlow+y19PqZqzjc5o8xAS2GJJ/nPQcReriEMZ+zrztvJWKe4d7XPEokxex8sz/DtqcnmGKDSW0xazjR3ZTXT2dmWckxfMyQnyE6Skmw== 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=NUTVnjXOrQITMfacBez+VGU6pwe/cJ5GqqJ4+riN3YE=; b=fjLuFIaD0/yij0yDtvgBM9yPei4sYqplCOQrvj+CoUYVI2wfM37oXDfL6H+HQOS38HXPmsVpAumYqEFHMn0U2LL/HPrfE2xDIp24Hby25cwDlUPzWnntPqx9Au1IiIOi/OLfzlPmZdD7LzEYqG6rG0sXyBYHwzmUwodxUK+tv6fjFAJtUQPco2FzfINnAvzKIZMcrN17P8u5xXG84a2v/qOtmMcuH/Mu+CFf20fBE/et4atvkVhVrcbhdzFb7Mvm4KbDljgUtVELYamZNI2t1Ifuejb0aBhn0FJCSRu3igeyh0yzY8Kfc9pyH1VK5C9abtqSXYeTg1cM4G7u/1ANvw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8352.eurprd01.prod.exchangelabs.com (2603:10a6:102:21b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Wed, 18 May 2022 15:35:07 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Wed, 18 May 2022 15:35:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 May 2022 17:34:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [r/RhDSMCJNmyIGTGWVLNcmlXAS0ELKHa] X-ClientProxiedBy: ZR0P278CA0099.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220518153458.1388575-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ebb8a85-7128-43b0-c22a-08da38e3fc1c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPyXc9TS18sMDu33WFsXWebnCsQb0RZ4Dgz11zNQ7GZJ+ijb6ALeOruEi3e+JEsmOiT5hmqgEjd3qsG1nkGN1SCSbUwE9+FcYdPflxLfckzfJsydTeXLFfm1o3QEdR2qHxpZUG7qszRPCQWB8MVfDMJYEpC8fNa3qXhO8bt5i+bekeAE4t/7Df70sMHyskSnQYjiqOYxBiQK13D2B+jSsOqKeDm+0MikP9t2PJbdeKAW9dsPlKclIgEDmiSJM7CILi/rN2MI4yH86GfJJGNmn+Vsl8MMQJoWSg+HzAh8zXqtLgHMBXRytprU70BN0X0G28LzdAgWeTfhyl+ilStqZLVGJ0YfArt8FwrDHa5az1JGxtCAdhUiBme6CgiP9OHhz4lFvgrHJj4UvXe71IIhBbylsXPc4yUQf7VdjG2egROHskHJcOR9VVwVvOt3yXhMqee4l2H0p4jTJAUGw3FQzcykq2XD3ay9GDecJeQeRZDiOmYmBfCebmUXeHrNEidCrqGSuGhIvRkvGezv5Zv6duDt3hLGFJ/cfo3v3nNj2IvUWMEEiWELOc0Lw572kbJ2wfZBLv/ECPP34t/MOD5vJc1L6gW4k8r8oRqUb0pIcSuxKqKYEZ0bS6OmasoT7+7gO3YrEvTYR5Is4GXEiE59LwbvVA/+JXDOo7LgoF/BD9eFjFgujq92fMGetXOOMN4ZNOM4yFby2qdcFaGNal/fIQ54/8JTOJfOG7iqsYS8HjvOZ2DLc/ld4qdh4AAoIB8gg= X-MS-TrafficTypeDiagnostic: PAXPR01MB8352:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n6bNyhfGuRLZQkPNvEyC/2JAMQzcU+EXgGSdd4S+0E1x+P6LEe6zEmuM9wGen1LKkfOHoha26BLle86YR8VIs5nC2U2WQKgB3OHGbv/qb3ZWz7SFJ3HvGvWpKkncrZTvL6ASzi95t9JusIvZ7XYpDqECnandrxyHOMpzB357MENrl+fIjofDmf+WJta0ex16eirrmwQi8kbh6xEc+abN91EOCNG4xlVO+SxpjvV/xIvy0T89U1tOkKjkDpTMd1h2FfLRPI0ZiREp3mym4692oRaLFuJzZ/hZ3OKnAdWX4H5UW7QQsxj3ADttaHuqITNXtezWJJen/E/WqDHZMv0u2sbh9X15Hpj2gj6/4xpKxtVDfyvXat4kAYzzE4uEiXMxjqghuvuznDXigsu9B3CnaoWpYXJDIKDF8AcUng/4lEhKr4lj++Z1IzM79P8ZT6PPiP6Bt8heSVbpxbNcYhewDlbgDq0uVPO/9KjueEx/NsMHomlfqRdXjdyH+Uu4PuXJvqP8WphHJDwcO+VjV543js0dr0wmaI4GBL5T+XOP1ZChKrv8SaOewIVS4FLjftnnh5uN7ww1NMKZXgz9fpRbxg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: egJrdlnggmCvEiMlfSEOmjfVZhKQ6woz7Py6g/vupIdq0QHiR0+Y82i8Bxipm0pEJzLiPzMCGLCNYyQc2C6eICXIEvBfGwrYgNOCbhqLyOyvXQu1Ct0v9Dn8Uy3BXeIe5fGbfqFP6YxnWXvk7eMNu/Fezd/Kp5XcR4eqxILlHs2X8xzGF+3Np+2a9IELyGlxTtf7BLq8moKpHRRfXIFeC1uQIqQahKCauJw7oQL4XORTZiioCjL2G3rojtqVUE08fmFULNTkPHgJv7BCd09IMvck1fV+l+QMgRSlxLPexuVbeamBhiF16Roe8s8a9Y5nMprPETrp46OmO/Wh4OqaalM+H1ntD+qzUCac5Qak+fEVVK0DcgS6Gpxqbjtp/hv44jF+apEU0+O9EabDSyF4kib2GYDdvxqxZ5abXrHoYz0+8SLEjjJRhq/9hYLcTjnrNSZyYgZ8FW/J04wgg2LPhlOR97HuBzE+nJ/hZbquXNlD5GnJ/ZPk54tgDOLrPpT1qyhFVuSIvPY03pmGEHoviyB8FPH6sYtv8g3q9aUNvsFZrWKCha8MUdUjzMHg4+C8AnnaazxYfn9BG+sFw68+vY7GtxqjJJwW8MYnFkZrlBvzRg+sGCsJOJdAVAiXR9vfomoe/XQfKt/czQFpitXXdZZDk6XW/8EguowGroG9VQE+ZfYGHorx4yZ1yAvW2XCm8PV6k14gLMiW06186UmgmNL1/fu3Q6EWdNKr58MvNRa1qIwIpE8nMZFWIVw3yHzBXEmAY1VUN4/qZuxAP2RB5//G5H2Fpwicy19RvwyLumPBUAOuLhcsnXwwy8MuCINaWLNj8MukVmlOwZaWGsFx7dUGCenSkQfAn4PlweWQjRQTnmulblsZBA8+rMxn5TaRHzWrjUfdzdYbpqnLVl5JF02r10fIfuq7uzchTQOZpSVZlaPJ+x6jFuxxQlxDCl+BuoUskshhU0mELOEZed0EoQE+G2E5Y0DFfFv1m+R9LRc1GBHENXyncdX6VnTuHe9jji86dE0gY0qAxdcN4jexIBlkSEQa1ZmFtehfwovjYQQGImqbwmBmGhI5ex1vEAihcYD1cVpUru3dfPag19FtY4Dd+NnnP21ttBbZy1ObMoy5bU5jorwwVSNOEdmIKlA7AodlRm2tbK7OsEEFc16ymS5KK2I2sdT9zdP9MljbnSSYw1dAusZnZurTqIqYwdyglmDpqnYPUzSCBWQuozVlQDNrGDdoZp3n9klJmfIyufM4H2nZatvudYPiCi5Xz4aba0Dp4SYH6h41mlMuIo2LjuqjfEVFKL8OfPzrgcSN0SGtxlMCmRhaJ8gpKh1i4hZkjq73gi/aC4UYPlaDxGX45prIBkV4Af7DQqsgf8vcaV3nf5gsWjNtyRSWSg2ly164WCUM3t5MnC9xBVAK73y9jmnHTXRgZT6Mg5HSWMyU+wEnP32Ayh1kMgHs4aQ3SDdEukMeDIfpSSfJczMgJnyrpg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ebb8a85-7128-43b0-c22a-08da38e3fc1c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 15:35:07.1852 (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: PAXPR01MB8352 Subject: [FFmpeg-devel] [PATCH 7/7] tests/fate: Remove intermediate file of flv-add_keyframe_index test 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: Nm4Jng2UECgn Do this by making this test a transcode test. Also fix the test requirements and don't add this test to FATE_AFILTER; instead use a new variable and a new target for flvenc-tests. Signed-off-by: Andreas Rheinhardt --- tests/fate/flvenc.mak | 14 ++++-------- tests/ref/fate/flv-add_keyframe_index | 33 +++++++++++++++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 9682f4a2ba..5032fface3 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -1,11 +1,5 @@ -tests/data/add_keyframe_index.flv: TAG = GEN -tests/data/add_keyframe_index.flv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data - $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -f lavfi -i "sws_flags=+accurate_rnd+bitexact;testsrc=r=7:n=2:d=20" -sws_flags '+accurate_rnd+bitexact' -metadata "encoder=Lavf" -pix_fmt yuv420p -c:v flv1 -g 7 -f flv -flags +bitexact -fflags +bitexact \ - -flvflags add_keyframe_index -idct simple -dct int -y $(TARGET_PATH)/tests/data/add_keyframe_index.flv 2> /dev/null; - -FATE_AFILTER-$(call ALLYES, FLV_MUXER FLV_DEMUXER AVDEVICE TESTSRC_FILTER LAVFI_INDEV FLV_ENCODER) += fate-flv-add_keyframe_index -fate-flv-add_keyframe_index: tests/data/add_keyframe_index.flv -fate-flv-add_keyframe_index: CMD = ffmetadata -flags +bitexact -i $(TARGET_PATH)/tests/data/add_keyframe_index.flv - +FATE_FLVENC_FFMPEG_FFPROBE-$(call TRANSCODE, FLV, FLV, RAWVIDEO_DECODER SCALE_FILTER TESTSRC_FILTER LAVFI_INDEV) += fate-flv-add_keyframe_index +fate-flv-add_keyframe_index: CMD = transcode "lavfi -graph testsrc=r=7:n=2:d=20" "foo" flv "-vf scale -c:v flv1 -dct int -g 7 -flvflags add_keyframe_index" "-c copy -t 0.1" "-show_entries format_tags" +FATE_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes) +fate-flvenc: $(FATE_FLVENC_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/flv-add_keyframe_index b/tests/ref/fate/flv-add_keyframe_index index 1c4da65d90..39c4bed85a 100644 --- a/tests/ref/fate/flv-add_keyframe_index +++ b/tests/ref/fate/flv-add_keyframe_index @@ -1,12 +1,21 @@ -;FFMETADATA1 -hasVideo=true -hasKeyframes=true -hasAudio=false -hasMetadata=true -canSeekToEnd=true -datasize=629776 -videosize=629381 -audiosize=0 -lasttimestamp=20 -lastkeyframetimestamp=19 -lastkeyframelocation=597963 +5f38d76da3ed4a5be06ca604c53666f2 *tests/data/fate/flv-add_keyframe_index.flv +630192 tests/data/fate/flv-add_keyframe_index.flv +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: flv1 +#dimensions 0: 320x240 +#sar 0: 0/1 +0, 0, 0, 143, 9597, 0xd91d5859 +[FORMAT] +TAG:hasVideo=true +TAG:hasKeyframes=true +TAG:hasAudio=false +TAG:hasMetadata=true +TAG:canSeekToEnd=true +TAG:datasize=629776 +TAG:videosize=629381 +TAG:audiosize=0 +TAG:lasttimestamp=20 +TAG:lastkeyframetimestamp=19 +TAG:lastkeyframelocation=597963 +[/FORMAT]