From patchwork Thu Apr 15 20:16:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26937 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 9141844ACE3 for ; Thu, 15 Apr 2021 23:17:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7132D68A569; Thu, 15 Apr 2021 23:17:34 +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-db8eur06olkn2045.outbound.protection.outlook.com [40.92.51.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A2EC68A571 for ; Thu, 15 Apr 2021 23:17:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iZ5zwRHJKlEvXzZOh4ck9XA62CMbFuUB2U5CaW6xbMkFG+U+9hXfcXMIQ0nwWgtM7FtjbeKBP/JWEP483/8rpQQa6q6d39gH8t0Eg/w6HVbLOSaEYM+IksLs7QOgBhYOjNBRTYqrngsMRZA4XbTKKlw5BBsMCgkOna7KzisOz06TI+tJsAQ3nIuQjeDJngVX54JC3FPrOyYVeEbhfXhoDO3MCRcIeCbA+RQT7bRZGHyUl4PIN0kdQL5JL4bN74o53sNqAePCaliD9wsrav3CnWDIkHec5PNAfjCxg+tUWTGN8xLLRQkfbB5o1kfXbh15BAmDILi67r+ObBtoenR0pA== 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=klvZi9kCgSppo5NbmmALssF5UfrFdwIsIK4q/+jP3zI=; b=EyHD8ywxBse52fiMnY8kMH/oMgATebKTY0WdJBPwic3W4UzXqSsgDe1zbZPfrxMH4dEB5mjDSdDTFBzKY1B7YfzC4JXcOhBV8YlOWIb87/b8t7QMK2BZ0T/QR3SP73sIvb6s0IukxTZA8qu/81dv96tD5xVPvsisiQJaHP+aSvajThUwg6gcgXIg8jNRaEawvoa9eCZrnYkHD8NvtRJeK/642R/iti4+8wKnxSVZasQ7gNTAF6kCDxi+gRiL01US9s0ZefCgXjURebR5mllE2w2YTpuPIfJBd4uTwJVglEDWvT09rGvQ5/wU9xc0VjhCsnFKNs6IjSpI8WTqm52+kA== 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=klvZi9kCgSppo5NbmmALssF5UfrFdwIsIK4q/+jP3zI=; b=G9mwdxuUYBqJVXwoZ5I9Mpv+OnIkf+N3ekkzJEswwH7IxhJUW5LSHflX/HJ2CvPkfAq78/vqsBlCHpRS6sRU3KnucnSCVsCpuc/P9iR1TNq7V705dDUNuY/tvTOV9NL5lxzzyDfSBz09Rr4jOUuJ0dU4Z1Uakgpb23iy+vLhfHDz40df/94airba5bN7AELG21oCJbL4/IaLzF46B05CQcngeGsd9vsBjnivR8IzOV0drDRqfvNx44F3zgzspc40MEYzLfa78M/AfinrzDkW/Qdrf95+FBPE+L5Bx/DGQDzbzQCsns53VvPdKtoeu7MeDul2sdWV1odHkLDSfisV5A== Received: from AM7EUR06FT022.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::45) by AM7EUR06HT160.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::380) 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:27 +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:27 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:93C8B7D1B6BE2A017C30F1CD9C743CC391967FEDF7B684A4FC52E485BB002504; UpperCasedChecksum:8AFAF89D1DC0176D8ECF763D6187A0DD0BC97B50286E946E8355FA74498AB95B; SizeAsReceived:7601; 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:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 22:16:53 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [SF9IMb3czbjCNHvytW4uJ33xUi3RluXn] 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-3-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:26 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e5bad23c-26b0-4b77-7a67-08d9004b7cf8 X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd8UfAEv7bxV2BrPJs14GlAeMX0sEzlVtiQ0/PwFDI+6egaYTNMb3mGoezuyjzfYy4rHmh9vVpn27MDug0tOhbu1UavmzEHFyCaqwZx0R8nkpg1u+0uO8LqsB8qbw3kDXXNdmbXJi324Cg3g460UX/40wu/izz+z6rN72x+Nhl+SEg+kZHKVUpG181xH/fczNkiq5xKytNP+anOFdPnxjRqDwXtLh0UbdOxmLAUxrUafW1lGNiJdDjdxKU0peZhKGeIEy7cdgZqxfPoVpvFKI4jDBnJpYPRM9OJnyLiGGyvdSaOWxyV3TVTpyfsk0+rkiYzKpVQkPQR/VJHOpKFSlMmEGL0qf3eCIwnJ0VrzfT7onLdcaf0yxCbtIvNMOJI8OLxBpH61P1KJj1uuVyyPzgCdakOYxJx+jXWXYrH+ihGPg3gE87PE4/tqdDuBY2Et4c3e2wU02Prq2RkCdCBSH2nbH49im1FqrdAGWJ6Zl8ZUW40E3evrRmaeF2e3SglCp/xWesjxfoNzslPoyQaGRgYQh8rHiBNG2r3SdublNsdDmaLmWxzNOl3D/2B/t6RAx+Lc+NEifUbakiInW42+KNuhSTDggwNO0ZQpcRzmcsivIjVS1pEeUcEAYJBGqDiHIfFv0fMGX5DG0q8yq6ah8ADzM+dbWw/J5NWZ/alfSmDTbEJi+fL5VNbHCqn7zA2trm9Ttc3uEyk1xZhjNVD9gKZ+be+w5ZtySZWA0FPcfOhLrwFyfgvn2kwcpGehdU7O/4E3Dmw1ZIXufQlGFMOCho4BO8pjvC3k44wNT/fsqR73tYokO0CQiOR7 X-MS-TrafficTypeDiagnostic: AM7EUR06HT160: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JG3OXBewVl1UYTbogRu17uyI72TKm5jM4+3xO+aadjrp5sT4qfMzzUC7q1RNiuX4+A3WPfz4iSA5o/m/k52Ab+/foVhyR67QInTU9Zo9okqMrjFvoBouriw3Zm53DVFWi6HMFk+smpuU2XUUrCLcVrCRQfqPL6jauVOfIdMZahQd8H+7Iq1TBRu8h4kP+GiLWkSz8Ec+pSL8b52WA2zHQGzHXSx2NVPT5/di7VwyZuO4Lz+NdD3dC48YCi+M05j5Z1WZBLvsXJQakwH33MRy2AVQPDRs6YxzTq/tcmgHirdt9nV4Gr/l3siFTKoa2hBSmqVc4olS9A8/u6AyLtu3GVPbyE3oXxXEdk0Swrf4qj2mDiS+d/Bc2gfpjlikgDBfNmAnOuXyEP6I3c8fkYlq2w== X-MS-Exchange-AntiSpam-MessageData: DCwvk8UaOG2zrU9n7KcqCXQi7MdhbMwdH3BueCkuytAx2tGtpe42jjyJk/NqGqjHK5gkU32lPWjPYaFhrRfEOdDz5SdN12C3ztK1uEZlPsDLWHGa55jrdnmOZgtihBy76bRi7EEtNFILdP0ui6y06g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5bad23c-26b0-4b77-7a67-08d9004b7cf8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 20:17:27.0581 (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: AM7EUR06HT160 Subject: [FFmpeg-devel] [PATCH 04/10] fate/id3v2: Add a test for remuxing id3v2 private tags 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 | 12 +++++++++--- tests/ref/fate/id3v2-priv-remux | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 tests/ref/fate/id3v2-priv-remux diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak index 873f593d8c..1bf95129bd 100644 --- a/tests/fate/id3v2.mak +++ b/tests/fate/id3v2.mak @@ -1,5 +1,11 @@ -FATE_SAMPLES_ID3V2-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv +FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 -FATE_SAMPLES_FFPROBE += $(FATE_SAMPLES_ID3V2-yes) -fate-id3v2: $(FATE_SAMPLES_ID3V2-yes) +FATE_ID3V2_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MP3_DEMUXER MP3_MUXER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += 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_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-priv-remux b/tests/ref/fate/id3v2-priv-remux new file mode 100644 index 0000000000..0fdd5d9d0a --- /dev/null +++ b/tests/ref/fate/id3v2-priv-remux @@ -0,0 +1,18 @@ +3e99254aa892a9578ce31da17b012a44 *tests/data/fate/id3v2-priv-remux.mp3 +8542 tests/data/fate/id3v2-priv-remux.mp3 +#tb 0: 1/14112000 +#media_type 0: audio +#codec_id 0: mp3 +#sample_rate 0: 48000 +#channel_layout 0: 4 +#channel_layout_name 0: mono +0, -155528, -155528, 338688, 192, 0x3774510e, S=1, 10, 0x00bc0013 +0, 183160, 183160, 338688, 192, 0x856c5b02 +0, 521848, 521848, 338688, 192, 0xb86e557f +0, 860536, 860536, 338688, 192, 0x3b6c5cb7 +0, 1199224, 1199224, 338688, 192, 0xe1bc5c76 +[FORMAT] +TAG:title=id3v2-test +TAG:id3v2_priv.testowner2=\x00\x01\x02 +TAG:id3v2_priv.testowner=testdata +[/FORMAT]