From patchwork Sun Apr 24 03:33:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp1219404pzh; Sat, 23 Apr 2022 20:34:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHdaCkQzHVNG0w1OJn7QrfCmn2wtFg1TGcoQaoWtPSqmg/kpEbit7vRbSVabckT9yRAJSy X-Received: by 2002:a17:906:c10d:b0:6ef:9503:3372 with SMTP id do13-20020a170906c10d00b006ef95033372mr10680869ejc.408.1650771277710; Sat, 23 Apr 2022 20:34:37 -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 m28-20020a50999c000000b004240849e896si1027506edb.283.2022.04.23.20.34.37; Sat, 23 Apr 2022 20:34:37 -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=RIwauoAR; 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 AEC9568B2BE; Sun, 24 Apr 2022 06:34:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075041.outbound.protection.outlook.com [40.92.75.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 54A6C68A34B for ; Sun, 24 Apr 2022 06:34:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NdZaKt5scAHALw4YC4Go39GRMSVw5ICSz5Z+91c8ztD5/S7Aza38+dSaCQj81Gd7eQHo3PuEGcqP4j5swr957uPQ/h2HpnJMA/7LH4dHKBDQJKL22wCyesHxt9Bqyi3ddscwkCzSB0Ua6FIFzXzXvtVVfrhfLHOqDcok9nL6pgMFi7TFks5eZWIlt7JNxZhVHbhPke9Gi0OSb5zOYidinqA3NT1WPXIHdRkeyQXXozXkEBAW3aLVEuAAZcjhOf5OgVSwGdCLGAFhrlhbR1PzzE2E+0i+u4QepJzRWhPhxpHC/02Q2baBGkiRdX8glIZcNyojW7PHtm/as05NxNUG+Q== 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=am7z466FPcXHgEyW5ovcbWEZYD4MaASDd1yb4/Nc/L0=; b=WP9B+5GbjGl/YpA53R/xrrrD4JveX3OceDl8U3H+bS0ZfzL0I1mW6t0Y0/K2qk48AJ8iDO4DQG1y5th2PhpI3POufr5pwrTivX8fmZp6LjzATNhZSJ1gvzuQXUk6FKeWXemmJRIx84Uqb0Z/w0pmapyDRDDzcFjFlGGgiwUiqewdTc3k2n0lPfZMGg9joaKQrkh4vA5tdNRdNgYkL+tcXfqAGfWRRol/bsbSK7YX/oG+TPgQEiShMkkgl4r34uGa2xwDZ2btwkhP3Tk9A0AdEL0UHKleghgM922I22F53a4MR4J3PyBiUSS8ETFnAtICrkxRwhPmCD7r+7q3l/JCtw== 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=am7z466FPcXHgEyW5ovcbWEZYD4MaASDd1yb4/Nc/L0=; b=RIwauoARlJfS8R8XWFT86zXBrcTqQLxbtQ3GUrR9AWH9/uguzB7j8WMlMp0kcMwYzfWFZEIPEblvuATiv3oVp1tqkg8UJgS2Pr6cJeTx9tNUHf37+WsAL22gHIAVb6Jyey2Xy4F4PbT6WlbeZKTMSgOwloZ+McZzjqn0DJxl85ZnvfFXqzYbMrvPvvJ2/fxYdsZQ0WAOejEdqjphqFamvI0irh55JO+CawWhjjhZpnFSdog7XXOcrzvYu/lCff6qlEDqaH9kj/E0BZKAz0n8VBOpAQrHPgUq/kuEKFbYcR7WSpgjDpqTj/j11GvESvb9NxIqUpkexmrvPfsf3MDuMw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3062.eurprd01.prod.exchangelabs.com (2603:10a6:209:b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Sun, 24 Apr 2022 03:34:26 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:34:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:33:47 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TzI/l3f9UXAs+QXI07/PXre0GyK+cpTF] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de023854-2170-4b3a-9153-08da25a354c7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDlrBbF2eBXCGf1wRiPw2WITzqtHtrbHlZU38eKZERJgBlwHgcL0/5zSMlSU8oymsUs6UiLNVE4dCaljPMf20KZ/jLE6jL5FWOX6tXpzVUCQl4N7ZvvrEsKXMvdfyqSwvvhFIy+J8GbA4BK8Dk5wHaLgajcDyVtHYWLs+NjBqA/OufaB8FQWnGyjcQG0NaWibA+AFeFwMy78veTVhT8nxDS6IFM9GrEAHSmosHPYdcdvJtACF1mbATL4t81H9ePc6I23x5J8yGpvbSZ1RZ+mwGpaXbf6D54GdWcQNmAr5kqkCgD5wPOvxh/MOQptxxmSo81b4eTsjUamhMU1npnoFla61DmyC4gtt+NpB1BXzqlHV+LAElyGYbltguO9G+x+HfTug2lVQ/t17NWaOPmCqbDIZ1Fn4MXARrotKOFuBgjdX/r3yBxoRRJa9Z94vLtjiMyn/90t3jekZ3YHKKAounQnyGmCIBwKORixnpF0yH0rFa2Z2fqIvYN8Nck/FxuqD3jgWfo1zRCdB34c1+S+3cPQkz26uldLreHSzj/NuKJ4MsFwSncZoduCckt0ALkU4OhvUuq/Ocpgndos9FpXbLjr6YYPkea30Haro088vnNPQvv/3Ogf0WTWyJRaChpoqp0uPGxEGCmZ3GTsVyNTIXhuICWhqYp8C8Tz742R+c8SL7vRKh31khLztpUWPWK/ZdtRG1sMeqkXshXyOUu3hcbNo6jrZ31AWxY0rDRd2kWW0= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3062:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8dq4hc0oRZdIspVu/scPv15myi42h/+JE0//j+QZcTwLLfD5aYw8gYDYgtthX+Mnam5SeB5iKCQ68AT+9bfo0gqs8FyNPsEi2Z0frX+dcPcfkr6pfDsvnl8O/ZPApFIMy3SbGUQ9BbvC0AXZKJ/bTqTNrY8NxWCb0gt2k1jWOOvCDjTXpnetJpEdqaV8nqsPItOln0Bjxf3Vi21gOfK8TzRJRNd2VgrewzMuG2k299wBhMezcqnbMYM0x40cs35wLhOwaJtx6hIa2acvbE0mOs4R3KxuY144UrXFfgnqxu/HeQ12QS6nBgIlN27koI/mDAcQJ4dW923Cgt8kmUqPnFnfxpw2zzQffcVqwZY/YkR3wXLXSEceGxMmvmN+qZJTZpKxvj0DOJf9FadqB7oTfyTHfst4NyBaWXDQtTiefcWOigCsefje1cnXBzBg7su4kPNS7DrIvsgnsqP7zR2LuBf+A2fUwd7IuELyy8oqhWCMNSVCUXf8kEXHWAmZIQ5wsUZlsswPWLt6Mm5lvcmsDw4/VM7rkNGntM6AGb1HZa2vx+gW1g4dQES4ksm+rBNbwzAiGk0NPb8ualpNN19vPA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6eEoUv9l1eHT5GM/jflum/qm/bl+tLWC9r3zE2ddG9t3uZtN1QaX++yDZGnUv6X92m1F+gQS68nTr0ZbWSYSd5foUZ8gKHdH2GmNq+0QFPGfz34xDjsozMnSwot+EJRncWvrEby7/8pFEys4sT9Hv0odiBKCOujWiLy9JYlWz70Tztr9tf1ile9sw2/lb8wpUJnXOT+MSaCn32SDYlsjHhKASdwuPruVINCIE7WF5XZFniIG5T1yNQLHrJgUqM+zibjJ/GTVvcNvaRHiY2f+uBfrXBNg8Wazu1TKcgMRRm3H+21paGcWh+UL1Z2HTz8aIQdiPaE3+KFPRMip90mbwaWR5Asglvmngv4534/8zngHNoajPqq6EMZ1vivcjb1FPHYLxjl9OhdEP3SY/gWSM0C+haFDTh3mToWizc5y2hPDEqZ6nNrJEW+MtkOUIlvhWLg/GFVLv0ekcAoCHhFaoF3MgB0Myr8GefWlKfCpAkCELG2a5VB0qANRHwFLlk9kveeTn5zXqEw8izKGSu5zNpqqBgs0rcB9Q4h9Px7teqrFZ7JCVREf46UzWvzazut9/0SZgwmOCQ8oP3lYXbHhvjKK9RsrrHNP/dmRnFSOKOXRipLi6iCQwE3Fm/tIT2CGbL2QPZ66zDlr5oq8+ET6xJCKe35Yjw6w7CmQOWv4Sf2suwXmW4GUqsWOmbLELRQMz71A/EMFxtzaE3BEl+wuQEo1gNA9kZRWdfDZNMPQ0vZKV3kRYYQwhuv6GHK3KrtW1d2uH9qSvMAJUrnurF8SHITnJGzg2PJcEc5tkQuXY9eCEMnmz50rvvN6MB+cfHt74JYvRjsPLHLzBAMSfvRD6wBKeERy2Xmzel4g3uCU/VBPgYyctlyxTm2vtOE6hrbR5pCil7oEY7TYIKcRg/P1rgBjQ5u23cv3TOz8DTRhT45TqsgVUmY8HaxlfjArgLP0gw+YeZno+mgFf8EZFLSbNPYOahq9D0/JUF98II6wOtUDC0XWt3xJtRuE6ry27IFJXrgUOnAuVQMZGWI09hSY139BSHf+tcj7VVq30twpVj4Cn3Za9bjqTikXxYbNkDU/H+QTbHAesP2fmwmokvH6V1sMW5t8VTESX3gaKyD6SKILP4ETyuGoNNEsZY0QCREnPW/H7HeWm412gLJwW3FTUOD4kSOg4XUZ8VLX3xYanYFstj/B+AehP+Cly4AkCsCYu7aVP3vnlH9+AwmmgUWFNBsmK7ARLLhIy+xfBu0BX7zBg7L5LAKdWzGw7P3up6BqdSfLiHAcSrmaOd8v6NRe71sx8ac6CjPtnnHYpwfuAPpwAx2VAD/XGZoYVKuczvafWuEVeZ5HjlExfUHmPkJxDP+jZbmV41UiIDu9F+nbCO/udYJ9dUR8uOp4S038HkKG67ypyxQzuuZD4oX4jDVNyl8qlG/CY8M4da3qPx5dHjutUbnl117lJVZBDamYaGi38MA6gy1nN5TljMbRF5kKcg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de023854-2170-4b3a-9153-08da25a354c7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:34:26.0638 (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: AM6PR0102MB3062 Subject: [FFmpeg-devel] [PATCH 02/32] fate/id3v2: Use REMUX where appropriate 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: 9eSwiuyvOdjv Signed-off-by: Andreas Rheinhardt --- tests/fate/id3v2.mak | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index fea7545270..fc574e4487 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -1,14 +1,10 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 -FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MP3_MUXER \ - FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-id3v2-priv-remux +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "" "-show_entries format_tags" -FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WAV_DEMUXER AIFF_MUXER \ - AIFF_DEMUXER FRAMECRC_MUXER PIPE_PROTOCOL) \ - += fate-id3v2-chapters +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "" "-show_entries format_tags:chapters" FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes)