From patchwork Mon May 30 14:03:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2292759pzj; Mon, 30 May 2022 07:04:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcMSnHybESoK6tw1omWlG86eabO/h3wEhOVjx3WO/aLuGmI3g1YiPIVhpep5L9WJMqC4L4 X-Received: by 2002:aa7:c706:0:b0:42d:c4ad:ce0a with SMTP id i6-20020aa7c706000000b0042dc4adce0amr10539382edq.272.1653919488665; Mon, 30 May 2022 07:04:48 -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 hp1-20020a1709073e0100b006fefeaf7082si12926106ejc.599.2022.05.30.07.04.48; Mon, 30 May 2022 07:04:48 -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=TbelJoYk; 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 4162768B611; Mon, 30 May 2022 17:04:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069014.outbound.protection.outlook.com [40.92.69.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16BB168B475 for ; Mon, 30 May 2022 17:04:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M9ZSmKIcuLJZ5A1e96K/bTM8a5cK9wlSeALRL53mUt603GBjO13WhXsXLTSkGFvBbFIaF3esy1JK1nVj4oeLulirFKKpjX1O412e6G5ib/nWGnXAwEk1XC98xBsiqdveKjqadCFsFP32iGu+pSLASCEk5qJv+eugvUi8mWupeNlrA+NIboG32fEvucw7ORsR4BT8GqNApLV4JQi1E1c8fCa6J+WxkSQlb0DkNvIQPVloaXUI2ZqB7PiT5fTSACX+zOcyJ05w4TDncgsKD2eNKSjrY8RLccUHSiZIX4vEylfdjaOzISqgCe6oyuCuBHr1tgR3BuhoAnDDqi0hs00zXA== 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=6CkQaoJ6bpPjtaP5JPkUME+J1re+Sw0mCXchjdOKs7c=; b=b5d4sEb7A+6JOOEvxoBb+Q9CLvJs2fhKRcZXeTvEDchwuAKFb9i4Ai4umSeI7StfYVQlGLJkh48g7GJVhUoRvbYOMV3cyPu0+10EnL5lrQBzuxJy7d53ZxyNNVJai6ClT/Kec+uj9Cx5R7grqXv67kPU6b386Jin/UuVVM36JzgIb0pfBz4+TZxH/P3jTAvrSvvlO8ri+WOgmVtvFoy8R0xarmETKeRAG6+2jkyQm86vft4Ufzco2pHS0+BdTziR9AycoEOWKYLdIBM0s8uDLCOkUURvarC+GxfIqfyH61rMEw5ZE874+baBW23egxvM5emA5CLyvl8XOniNFu1aCA== 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=6CkQaoJ6bpPjtaP5JPkUME+J1re+Sw0mCXchjdOKs7c=; b=TbelJoYkjvvnhL5e+H1cvWvAp3xyvLy1TZTlaFc4QMx+x+vAECsbawCpymFCmf/O2lLlgD/yYIDBPHCHyGDezvXq7D8/Y7rsj/cJQWFmAC8j7wA/94CiXqNMmBveg833pNa/3xRptFmPKUnXkSo9ExtaR2dk3sXTjy8TJJ7Xxnlxn4DP/Nlg32SUqv++Sqi9Io4n/yPnjlsBCyzUaEwSeq9wzA7zl6ILPCtuchjRFujG8ZjnRyyOhCpMBfc17pNIXSjUI6xM8uiYtcyEkZfT/u2byz9nXeaAC5o4hjtrcibByQ+dWCMeTou1aTLfHbQQrUEfdv9NZIkip8aM5bZwGA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB9018.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19; Mon, 30 May 2022 14:04:26 +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.5293.019; Mon, 30 May 2022 14:04:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 16:03:38 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Dxz+ELZzhTU8KIlcDSfEmmPrw5L+7mpA] X-ClientProxiedBy: ZR0P278CA0008.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220530140338.636468-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c2c4473-3da4-4e84-d243-08da42454e5e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfmMn7lLS9sz2Hw0V/NPQ79PEq9nQLtZrS2wfIj7oeY70VWKLbdsMQnPEZW3AWP+8QElRVAgK4C/Sf/qexxRmkS6oJxJZjfEMbCa6xafQICoJwG1JJRZe5uUXEzze/xYtHshOs4TuJJTqlcojf262vfe4FxhU4ZvuzBuySpaLuVJr4nkxBg0c0OJP6Dkt016V9eFLMtWEK9cUp8oJMFXCICfXUOuJ5XVipnGaQofVvrRWMotq03z8rSV7bc7HY6FzqV74TT/cXu8/Fm8v6QLFUWdU7DAfxV8xjGpQqB8+LAKObjVYjKeOtjZKVwC2ZZrg88ICiGTjeMyzLIOSlAFo3+48EyYHjKwmPvD/J0G2ul5w4wJlfZAldczHYjwGnYt8KPSuhllqx5LwGc0DKsPvTjFIJTVPW63wDNofSt9hs9Atxjq54YFWvXsOX7Duhzz24QZtXmlCVxOGUY6Hp/gu4qODjHll96igL2r065oDee/DQH2YZzihOIsuhvA7DZc4wGQPX3LP68DlY43ALSh3hfPr3VvWMzvgCwSvRReKk0zaayuXlGA5u53bw/El5GnfugcRnQ7Bjd2xf5t044UxaMTUAppGyR3/YlKz+Mc+JYB5K9V8nFH5mGn71Hx4lt7pBMdYCbvBwCF0zZWnIrCFAZ8u7BERxkuBwuP7ers7/hGo1khWcK7rq7hc0pGE4EYV1YxJxvEibmVnyL7wfILMFL0a+s1zWDhRKpB7odC+sUAxiOnYMJI2nqQU8L1aDrxg= X-MS-TrafficTypeDiagnostic: PA4PR01MB9018:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2KfmUa/DwOwShJ5HK5oRLKA8Bv7cG+t8lOoR6ybJv4yQNlh+rd+KsXwsmjw0UiYhN0VNNENNaGRLsVZxcjxwdrMqNhsExnhKp2BvIVc1b94UDoZoSt8gwTH88bGCIuoQ6t8bT22agVAaA1K3dM4ItGjII6gizByPF1VVxEsVp9RZQcKX5YTCkO0iaif6sz6+zunmZqm0gF3euEUWwm7k01teeQYlROL/YDmsWru4YNTJJdz0oGWnrCQJbtSXZlwEzvsPqHZhrGuB2fFw/2COO+AG64Pt9YDdThB7nY/1J6oj7R/+7hlCTF0GCTB1OI16TB9t8Znofq3SKjzhSc/yLSEOebMxBPFthm5ec4qZ03l6Vp9r7HCLOJHdMRX6dWKiTJF7tXzZ97WwYpuY+pIVbqcnKl6wXxvqxofjiTuRGEkA0I9uQhV+wKO2nS8A7dauYYpStRZVH3wKDViGcJz7tl/G35D6JOE8z0MAmwJeYcYrwUzIvkVCl6Z6OY9MPtZYGIN7Sa5NeZcIea1sQnmcLlx/zE0fxNK9df0KIdXec3Mhi/hXHmBfV2XfEroFdfjaqgqrQLZX56OXQh2II0gwig== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?zINiogHZRmEICg6zIFNMUX0L/N3B?= =?utf-8?q?8kYBWDq2Ed+kQkB2ZybmlgbI/70CoCJ6AR1sksLB5U96P9HaHSQ4mzAnJW05QSFPJ?= =?utf-8?q?L+gT+QCnG2707UusEmaGkxIMUjPr/JLN5N98bq9/ujTiu/+m+kc/o3mKT20mOlARn?= =?utf-8?q?rTKEDGk8l0JwIHeZ22ZBLnEqYrN1ok1/ARyBrmKoPeOvp1ANydGkw8HgSd6htcGKU?= =?utf-8?q?X3kBeLztgHmQH3ik7Heup+0oP0vloQHZPgZ6mmN3GZ1IZm4FME988d8IlKYkFWaSa?= =?utf-8?q?4FOZg9T9d20UHVY2lNJGlv7iQdpXrNDA0gvVgA9OvEWGGPqBr0ux1CElcl1YzPXi4?= =?utf-8?q?/4gZk00bomZ6YCq2kp+KKevStAd5kN0VT+DOxV8FYTH+dE83ej0mdwBSpdp1/pQf8?= =?utf-8?q?j4PqUnCg9p6aD2wggytGWD8ZyWRSaF1jp6OxecjDdu/ZPJb5OptsmUZ6Hl27IQ6rV?= =?utf-8?q?gPMHZt3OUISJxyp+PQZ13VcOtF54mpgPKHyvVFqMeoUHpQE88gvSo9/7uEP6mW3KX?= =?utf-8?q?a6nUJN71K5Yb/V1UApXgsIVFYTTKjaQSQFjaEfUjfgoTRaFd3EtI45UraqHvijkoP?= =?utf-8?q?5lxuBi4QaJiCaYG+gxZQIN1k35Vhfix5ZomBuwMeEh3f2I3jXymM73ZwoOQLPSbrr?= =?utf-8?q?mwIOkhzAJR30Ckd3DpEtyK8IVGgppFFvj4/HvAeTcDGtR24J1Zr57QyzsxyaIsPuu?= =?utf-8?q?7IKRxBlZn7rJAuApDDizEk8Qae7xI4POsdLztsG5axAZGTVA2vekIkeOAOOTetjet?= =?utf-8?q?+Iv3u7Kl/LPqzOQCLCuUDl6ryV1Thu+4g5JdP+W+VzyU7aZP0taVAAYEmckXb+PYp?= =?utf-8?q?SqNbWW9h3+/jpqSL0+1IQK2U8Kk7wanQdOkRrUJ287FMCOaGOKeWqyKVxsuH6er8c?= =?utf-8?q?AplPhpOHvZRKHKJlMUfk/EbEgDU3NPdjMnR/lJiWzBA/pLJxwIMF1ttoqIQdjsCf+?= =?utf-8?q?oY2Y2ZWTrDNXMXf1B3pQOSYLmGg9vI9vSHqIWqN8dvQ+txdRv1qanwZDldz95Lufa?= =?utf-8?q?EGo7wOuj/yfqhmk8TxhS4tzIbZzD5fggiJID0ZXwpVOR51W7QelhYiwNqDowC/vfm?= =?utf-8?q?oAx/R81vYiEKiqkyZffvF7N6EpfAodM8c5jyETko1ZlT5ZPFcw1d+8av6l4BuOJzu?= =?utf-8?q?cnfhO7efn7kLHVBpN5XVJG1/GeRxFX6EYoDty9++3DfyMehVIXAkkMkfyNaYJUZjS?= =?utf-8?q?0OAyn94St+7Iy7BWOzV/Ijm661Pe8u4vvxaxLMq/E/UecIr3xB3IR374XLQ97d+pF?= =?utf-8?q?0KWn1Hg7RzxHl4ajX8zGVBhvpC+vysPomxuqrwBnUjLKldvW8afNFy7oaS7LOY5vm?= =?utf-8?q?mV5TqbSNOimhBpAP7CZAoo3YtGvWe43yZxVfuIwgBEyhR7Kj3Ykal7xjvfbvMVCe7?= =?utf-8?q?vKsxPWYlQmbRQI+JkYyJjOZgnIX4lTGclgmg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c2c4473-3da4-4e84-d243-08da42454e5e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2022 14:04:26.4328 (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: PA4PR01MB9018 Subject: [FFmpeg-devel] [PATCH 5/5] fate/wavpack: Test APE cuesheet tags 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: Sv92LMrBqguK The cue_sheet.wv sample contains a cue sheet as APE tags, yet this is not really covered by fate-wavpack-cuesheet because the metadata does not affect the output of said test. So add a proper test for this. Signed-off-by: Andreas Rheinhardt --- tests/fate/wavpack.mak | 7 +- tests/ref/fate/wavpack-cuesheet-tags | 98 ++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/wavpack-cuesheet-tags diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index 900e509aba..c684d93f99 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -77,6 +77,10 @@ fate-wavpack-clipping: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/clippi FATE_WAVPACK_S16 += fate-wavpack-cuesheet fate-wavpack-cuesheet: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample +# The sample file has APE tags containing a cuesheet. +FATE_WAVPACK_FFPROBE-$(call ALLYES, WV_DEMUXER FILE_PROTOCOL) += fate-wavpack-cuesheet-tags +fate-wavpack-cuesheet-tags: CMD = probetags $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv + FATE_WAVPACK_S16 += fate-wavpack-falsestereo fate-wavpack-falsestereo: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample @@ -102,5 +106,6 @@ FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S32) FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_F32) +FATE_SAMPLES_FFPROBE += $(FATE_WAVPACK_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes) -fate-wavpack: $(FATE_WAVPACK-yes) +fate-wavpack: $(FATE_WAVPACK-yes) $(FATE_WAVPACK_FFPROBE-yes) diff --git a/tests/ref/fate/wavpack-cuesheet-tags b/tests/ref/fate/wavpack-cuesheet-tags new file mode 100644 index 0000000000..be6b694ae5 --- /dev/null +++ b/tests/ref/fate/wavpack-cuesheet-tags @@ -0,0 +1,98 @@ +[FORMAT] +TAG:Cuesheet=REM GENRE Zydeco/Cajun +REM DATE 1997 +PERFORMER "BeauSoliel" +TITLE "L'Amour ou la Folie" +REM REPLAYGAIN_ALBUM_GAIN -6.54 dB +REM REPLAYGAIN_ALBUM_PEAK 0.972900 +FILE "CDImage.wv" WAVE + TRACK 01 AUDIO + TITLE "Newz Reel" + REM REPLAYGAIN_TRACK_GAIN -6.47 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 00:00:00 + INDEX 01 00:00:32 + TRACK 02 AUDIO + TITLE "Les Blues de Crève de Faim" + REM REPLAYGAIN_TRACK_GAIN -4.56 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 02:18:58 + INDEX 01 02:21:30 + TRACK 03 AUDIO + TITLE "L'Amour ou la Folie" + REM REPLAYGAIN_TRACK_GAIN -7.06 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 06:08:40 + INDEX 01 06:10:47 + TRACK 04 AUDIO + TITLE "It's A Sin To Tell A Lie (C'est un Péché de Dire un Menterie)" + REM REPLAYGAIN_TRACK_GAIN -5.28 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 11:29:30 + INDEX 01 11:31:40 + TRACK 05 AUDIO + TITLE "Eunice Two-Step" + REM REPLAYGAIN_TRACK_GAIN -7.72 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 16:18:13 + INDEX 01 16:21:10 + TRACK 06 AUDIO + TITLE "Charivari" + REM REPLAYGAIN_TRACK_GAIN -5.47 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 20:57:53 + INDEX 01 21:00:37 + TRACK 07 AUDIO + TITLE "Boudreaux" + REM REPLAYGAIN_TRACK_GAIN -4.71 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 26:23:25 + INDEX 01 26:25:65 + TRACK 08 AUDIO + TITLE "Valse à Pop" + REM REPLAYGAIN_TRACK_GAIN -5.20 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 29:25:33 + INDEX 01 29:27:12 + TRACK 09 AUDIO + TITLE "Can't You See (Tu Vas Voir)" + REM REPLAYGAIN_TRACK_GAIN -6.17 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 32:50:25 + INDEX 01 32:53:10 + TRACK 10 AUDIO + TITLE "Les Blues de la Prison" + REM REPLAYGAIN_TRACK_GAIN -5.44 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 35:59:05 + INDEX 01 36:01:62 + TRACK 11 AUDIO + TITLE "Danse Caribe" + REM REPLAYGAIN_TRACK_GAIN -7.46 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 39:26:73 + INDEX 01 39:29:47 + TRACK 12 AUDIO + TITLE "Valse J'Aime" + REM REPLAYGAIN_TRACK_GAIN -7.92 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 43:35:25 + INDEX 01 43:38:15 + TRACK 13 AUDIO + TITLE "Courir avec Walker" + REM REPLAYGAIN_TRACK_GAIN -5.19 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 47:30:05 + INDEX 01 47:32:70 + TRACK 14 AUDIO + TITLE "Ma Vie S'est Arrêtée" + REM REPLAYGAIN_TRACK_GAIN -5.60 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 51:31:08 + INDEX 01 51:33:72 + +TAG:Artist=BeauSoliel +TAG:Album=L'Amour ou la Folie +TAG:Year=1997 +TAG:Genre=Zydeco/Cajun +[/FORMAT]