From patchwork Thu Apr 15 20:16:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26938 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 99CD844ACE3 for ; Thu, 15 Apr 2021 23:17:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E57468A5AF; Thu, 15 Apr 2021 23:17:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2096.outbound.protection.outlook.com [40.92.51.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF25668A40E for ; Thu, 15 Apr 2021 23:17:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kJoOlbTi88nkxbawE0+iRo9Hmduv2QnFK+vTRGe/woJW5kvvuw7GESQ7JhnP47NoaQO4ixRwByh4FjopkxZWsppHoVF6Pd6dXP9Rcgooo/7/MSaIqXoUWczvfNEfcVOuipkeBFONgP19DmEln0F/ECKLnS9mujbd6GPJPSygkMcMCd+Qm9RpuQFaZLDl6vBgntK/78qflZKc+Yiit3G6/Bs/jZnLbe1NT3Fds2aX9guyvhVg8oT73aNjI6GtH08x7VxBPKkiWh68GFcracsm5us+3rCvA/IWXaCbXrSbdZQAT25WmTgSl6vyQgkCEhMgcHT4zBx/ZcHkgH46sAdMoA== 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-SenderADCheck; bh=O0Vn8bsrglypPgYWF8DT7Ba6Z5mTq1wsn6HjwfMjdfk=; b=kv6GzE9Il3c7FiNaqIqsYx8HG6fb3veIxL9CSH367keNaCYAFbn5VFmmmZ2sHLxgzUjhqQ/b7QMNYPS44abKlVsqM0OqgJvLqf0tLWJv4TN/s5erzFe7OFKKgt5x4t5GUnHAPzGIWd9HgJCmqL5iYq8JLWyNMTEghHtrxysPlZ9YU8f5f0gkz7rDGjGDXbxrsM4jzuQdYvKoYIfE5qVlknhqmk+lA/YVCCTtzuRR0QTWS3H8rs7nzfSioj0qXTyp6FLxlqc7Vtbt+lTMm2ZYsF197SujqKTqlGlA4lqOC6EjtpY/j1BbI9eHb0dP7HcwnEzeMiTdu+J0bJ6386LSUQ== 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=O0Vn8bsrglypPgYWF8DT7Ba6Z5mTq1wsn6HjwfMjdfk=; b=sBuDNch+HQEu+XvCeEe956V1XeGPkDPMX4v4Px8tSHV56t7s0w7JZ8S1GwrZY5mtoqRPfuPm3RaFlnQFtVV1A9p3SFv0WbapiMBq1CPwhj6BlfVUBpXBmaBicZHMXYyNN65Efgv0YLnM3xMQmVVZJ67IsLmX+K0dhxv/wAQ00iexgRoIGLucZ+58DPr7s/nef89n+OKKu4vbg2cEixpHMyMD/XW72TIR3khknlYuzONILc9KudA2V0jVG8J3ZbRM3/7+dMiLnHvJKTHjRMSEW2xg+a2YFE1zcrJ792bWI59csYViESXsKAm6HyYKVyEG2KGS/wKuOkooG50GTG7LaA== Received: from AM7EUR06FT022.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::50) by AM7EUR06HT088.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 20:17:29 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::53) by AM7EUR06FT022.mail.protection.outlook.com (2a01:111:e400:fc36::388) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 20:17:29 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:10FC7C58FF1E030C54A415FF9CA301EE6154CB622C8DAE4943C8E4841F489D58; UpperCasedChecksum:DBDFB9F4999AC9D4705B837062A9F6172B25E3F1EE25CE31B2177477DBAACF84; SizeAsReceived:7586; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 20:17:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 22:16:54 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [DTxZywJHKqxtsQGkuqltzlOCzDr/+e9Q] X-ClientProxiedBy: AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415201659.1810798-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.18 via Frontend Transport; Thu, 15 Apr 2021 20:17:29 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d8ca4579-9da9-4f3a-be43-08d9004b7e82 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXFKoSKZyiLYcPwGDHzH9eVdYxpe1tw829RtbugVryvznYRGr03OlcRlroRgN6KQZzVWpgmelYW00F1znRihr7kBc03QzB5nC2BTF9vUC7nU+0+XjOFHrX0bjd0aMLR7m8lw0goX80tyPcCQPwWzWRB1X9upGSWH3xaRN9sAPubpZqBMSXsLZ+jvQdpgIIO933f8Ev7umnJ0lmkQoBye/D+dyOvLjNCTDFVyZsL4X+3eqJtXdmk0aY53N5J0PY8XV8IV5b26SRqI9F+b2njNxxAAXepp5twW6sCEGbfi2HJy/qZmDSRatFTXMCemoiVYEVZ+noH3q69YLZveA0FvuCbb6w8Nru38IIpijpt2qz00ZM6RzT85WS/8M1JPgWD2Z867Rn65h5XkdthazDPshFRBr3ezl2HncQicDVWmF9cA8alT4oGBc/4b2cyu1sOAnkJ3ceafW/SuQ2BWnHmA1ugtmaD2Eyeb2b1CnYqjjP+cwW1SU+TjKwz01XNgMuPzSGemHbNEI5t9bc8pZ22TdtvFfj4JpuLCtSiCPGxvMy1fNWKz4588LgcTNPri6LNw+FXIkANH+G0TDlWtnGTbf6g3DjnkSlkQCEMnoG/qDMupcRz/iBBoI1fgDMkEw/wEnQ0yuvQPmj0a5y1wfm+FXE3w1H7wdS2OmqJ+fcsktMSyq8vZeFeMKTt4v1PamEaLidZ+VgjrX1G0l6HvVBZHRPwOmBJTYLn+vE= X-MS-TrafficTypeDiagnostic: AM7EUR06HT088: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z2TocDJd5pU0SC9ULFrPtAwKDy9srnPWigSauT7hbQf+qWEYuNGD1oDsXZwhP1kd4RGandBfrfvvwFWNX8RcMf2031Wulrk6QxBz9EHeZauAZtL1gZqVGpYmsUD7mBqvuXgpWpQ64y/V9TGTJqjQ7XDpNI/dSMCyGW/dnyCoTgKFG0DyBE2jLrGTnhjkHmlevZArQoEoLpbLAb++2cl5mgFXZyiSHdZSuQuKnCU/W6gV9hRasZREYJt9i4ipGpX3SDerENX4co0QOxCTLjrUuf21aNh/wj8BXFWbE/ROt06dQGEjY6vtS3ckTys4yNDkDsqgXMiS9C0k8q0KCPjGt+jhAE0nt8UTVy1R1IjvaYpXZDU7+B+l24BSESxeEoweaJdZgs4qs86XyZ9EJcei6g== X-MS-Exchange-AntiSpam-MessageData: X2iEVRalb+VZVlhV9C8eOsVVtgOIJOf6UkynwXMT+z4/K9c1N5O2/B3ei35QsaSd+i1AHgVnyIUli6dCWTeJ3msYsHOVpkiOtyDV2spDi2TfrgXTIhxGnY3r/raQxACoEjlLkITq7GMkNifKFrECfg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8ca4579-9da9-4f3a-be43-08d9004b7e82 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 20:17:29.6609 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT022.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7EUR06HT088 Subject: [FFmpeg-devel] [PATCH 05/10] fate/id3v2: Add test for id3v2 chapters 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- tests/fate/id3v2.mak | 5 +++ tests/ref/fate/id3v2-chapters | 66 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 tests/ref/fate/id3v2-chapters diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index 1bf95129bd..fea7545270 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -6,6 +6,11 @@ FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MP3_MUXER \ += 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-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) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes) fate-id3v2: $(FATE_ID3V2_FFPROBE-yes) $(FATE_ID3V2_FFMPEG_FFPROBE-yes) diff --git a/tests/ref/fate/id3v2-chapters b/tests/ref/fate/id3v2-chapters new file mode 100644 index 0000000000..5aa8f82af9 --- /dev/null +++ b/tests/ref/fate/id3v2-chapters @@ -0,0 +1,66 @@ +4a68428e97f0af8d222a91404ae0839c *tests/data/fate/id3v2-chapters.aiff +2458466 tests/data/fate/id3v2-chapters.aiff +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +0, 0, 0, 1024, 4096, 0xc5b6547b +0, 1024, 1024, 1024, 4096, 0x0f27633e +0, 2048, 2048, 1024, 4096, 0x6c66e3dc +[CHAPTER] +id=0 +time_base=1/1000 +start=3104 +start_time=3.104000 +end=4720 +end_time=4.720000 +TAG:title=01 +TAG:description=foo +TAG:date=2021 +TAG:copyright=none +[/CHAPTER] +[CHAPTER] +id=1 +time_base=1/1000 +start=4720 +start_time=4.720000 +end=6286 +end_time=6.286000 +TAG:title=02 +TAG:genre=nonsense +[/CHAPTER] +[CHAPTER] +id=2 +time_base=1/1000 +start=6286 +start_time=6.286000 +end=6542 +end_time=6.542000 +TAG:title=03 +[/CHAPTER] +[CHAPTER] +id=3 +time_base=1/1000 +start=6542 +start_time=6.542000 +end=8261 +end_time=8.261000 +TAG:title=04 +[/CHAPTER] +[CHAPTER] +id=4 +time_base=1/1000 +start=8261 +start_time=8.261000 +end=12801 +end_time=12.801000 +TAG:title=05 +[/CHAPTER] +[FORMAT] +TAG:encoded_by=ZOOM Handy Recorder H4n +TAG:date=2020-08-28 +TAG:coding_history=A=PCM,F=48000,W=16,M=stereo,T=ZOOM Handy Recorder H4n +TAG:time_reference=2350992000 +[/FORMAT]