From patchwork Wed Sep 7 15:03:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3964400pzh; Wed, 7 Sep 2022 08:03:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR7sas7tXTonzoiihycqBMnsuDXxJbbyxEUmXSdLOqC7Kps6yc0xpq3L+P3Xkz1uCllGmmkV X-Received: by 2002:a17:906:6a03:b0:730:a20e:cf33 with SMTP id qw3-20020a1709066a0300b00730a20ecf33mr2705491ejc.620.1662563009083; Wed, 07 Sep 2022 08:03:29 -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 go14-20020a1709070d8e00b0072a84586c63si12203668ejc.564.2022.09.07.08.03.23; Wed, 07 Sep 2022 08:03:29 -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=ErNAwORQ; 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 5C03468BB9E; Wed, 7 Sep 2022 18:03:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065087.outbound.protection.outlook.com [40.92.65.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12F1A68B9C9 for ; Wed, 7 Sep 2022 18:03:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E41fgGDOEDg3tEZUYlsPTl2EmhCy15OHZJgLCLL3tkafk5qWQWax2YkLpsD6juEfymTjzKHyELxc+5IRTlObMbukOXWptw9arc7KBx+CN23Ie5+nJpsBKR0TbOqwi04l4EuwZ7mIzSFOfIYN8bff82EMaaKr542vpETdyghAQ6ngT38ZQ70g32qP4oCfHTMqHkhRSw8gxebnyhzHcmvhHLK6hjhcuu+xYF5WzHu7INBbGH71RoKzekHiWk2ypOsK9GlW64LajW5UftlYdZWMcFYt0JV99kjK/oF1WL6+meT7gsJqX1H6iYF3Xw/hVpl/8lcmj775cUQyF2LNEFCX4Q== 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=jIXY99w+Fn6svF5BhV1wvzsfVhl32yGxPh7U9Yipx9c=; b=IVwQxMc3ge07P9U3wvv3LypbGByV/QRLsIUtPrIIzrJsPFOwaZVEJxQ0eJlpFxrLNrnH3OmH3dCMlkJzM1wV8Xh9cbWFxRxiv0pdBf06Skw2yXsrgo4mk7OiVjVLzIjt2nuI7G9Ga05Y1tK65xhvCWdpPQWefJIaPFVBs4kjnKux6jixsNizeTkCjQRzlD78lfoVdiU3MWSQ2wC/FOYDfi5VXpxeZTt/P0DFkLxiwcheEIVv1euz6QwtauUNTeyX6eVndZSC6JCNc5UnfszXJT1yNYKyFsRUg6isn2AuLcqnC8vI9UDBxQhLYyic7aZpZijX9thamHyIIt4WSyfLDw== 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=jIXY99w+Fn6svF5BhV1wvzsfVhl32yGxPh7U9Yipx9c=; b=ErNAwORQ2SQBZQAOXtnxGKBQX4LibqrDJ7W+SyQFJoOF3E0+DEITbn9UNL4oJE/x7aVpfoF7YQIOe4TagG+i1D6Law78PYLEp4VhiED6vdjClTfzPi36jg/fOO39rJu6CKuHQ6tnD+n09Fd5cH0T+9gKv06MIES3Qc5mn+q/08C3IagIUkuew1rtQB509vraVmQjl3wpxQ+d5Eh6dwBHrJ10ToGkilvA7t+FFR6bjblMvOmTRgZGOkw8lbl6RmEMosB04QMu3Mft8fHRWHrjNX523Wmj4yGiUh3gsuf6VTPMuUCpu0bprMoH0yovDYNnUmuLYcT/6+9PkQsVTlJRCw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Wed, 7 Sep 2022 15:03:13 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c3af:c609:301f:beab]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::c3af:c609:301f:beab%9]) with mapi id 15.20.5588.018; Wed, 7 Sep 2022 15:03:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Sep 2022 17:03:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oQw/3rpn32Gq8LHDUndPmYmcrFiaustdRxvMxSYFCH0=] X-ClientProxiedBy: ZR2P278CA0024.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220907150308.1883205-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77acb516-e5b2-479e-cced-08da90e215dc X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3oxwVIsTjJ86OAi3OfxBoqt7kOYKPCiDfZrE1wvgzcdfa4XvuUJOcnB5NkyQuyeA6LOJ21btsQEHn3S+DNSeCIjAEkWBwZ/y2og3gmLjiOGs57JYTk9h8nigjZZT6pKRO/4WSKHarI8xJw0uNW/SflsnIzUhgCWkFJJsEUF+sfAU6jIlCCufWt5v6mWHJaGpMcapFAIs4WIaue9lGyzvLmZ0uiPTEafOBswN/HhZ8xCHEMPMo/vErNIKuH+OxhzDBiqszRn/Anh1ADTNRCmrDtTl15q/El4FbIqe1SIoXANqpMxb7O9mztW/ZWpIq/OzXA8IMRe5WGHBxSKkMNJvqWU6M48MrqeWKsc1KsaSXGf9qLlhjBUVl4ONR3L6UoFLatNprNRlxxjuaXZG7AoCrRzrx/jmIutUz7AwtwPt9ca3lxbww+2qZ+bKo5l94aTrsN06k8Wa2CrN8KNYRq8b3yoVxnHjDw83ktZZnzlnZPiYCKkcGW+KFN27zFDiBx6338IvX87S7BouJAjuPVG2Ga02jo9kcfG7erYdUx3qiv+Kat6g8n4OQslSSRTGOSfUjhdzxuEjSJJLefobBRq1TuPlpLT5YIXtZC1oJYUlVAH4IprArWdejl3CHmfQ4gccMV6kT+EOC7J0TX/5W+z4qhbQDg9TRvBAUvetFXXbvmVBg0T0kKpBwgXLJhn9iKsNfoDu+Og9j0Erlc3typ+yTv59Bp7HqDH/xPZ3RUH1p97tYJ2D/8/0afO6PO91y7fGqybuWKrYO9jOTBgpWAReB9UDKjlTx0RFc2bqmCQRYEc87nC3y5QEKiT X-MS-TrafficTypeDiagnostic: PR3P250MB0021:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v1U04rJnKJEICHNS8qK/7vVWWv3xUAFrBWW+St9Q5+AhSWdv+DcXpz4LEAR8jT8hFEuVDonM2liYvgAK2LGc0mMRDNyXstNBXX8Tlhykf6CyIMIp/2Ufw8Xzt9JVH65QlUpIJXmA/GSuvfVL4PdGu2eoRNeLtNodEsusNEiFWhffhNdsBBb3q6dqnmms6eFEacmWLSexekk+z06rX/oKK1nbw7w+9IJfwRADqR/XVjAy5fDyXV6PRQFGX90QrAf13iMEAF81Fu+uxeYV/wlpMk0i7Ng1If4MsMnZdTA3RunYLB+gmRT9gnQTqAW10jk/EqWFyEbLVkZw69Rru8wua1S9CjziY38mMl5to4dZ0ovFquReTIQAl401Poit4uGnVXuv3ziT32REW8vR7Qc8UZqihFqW0N5l6CVm8CCUDla1ww9RD6HDIdiYs1zr/tG6uZKKkJWrGd0pz8udetuVyK3zFVxrJpwvFXGxLq2L/CfrzE5NGBskLw9I96Kensex7asg2+yu6wNfiZoi4l5Pn1WormnIfXkpEnkpMklP0ozZQf7Pkj18MEyPOEa4gHfmT8pKU4I7bo75iCLWnaBeRmQLN7jIZ99vmvopcRXj1hxJnrq7Z7cCNmZSHMDdv8Pt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3AolwVaevdRCa1s/t6Y5JzRyDYnBcm+7frTMpCOmnQ4u/Jqus3TqdlPJJD45bG2djgmyVkR+fnmwJAvuHwaemFwxhGSZGJ/CRRqa6ZmjFapapOhClSfVa2ufttxoFd2BkWBsJKrq0Qnj/MCNo4IE0qEp2mz29Y1hJWA8PXUftNuITLXjbCvRiuDd7Nl8Ps8BadvcUWW+BkTVU04eL1kafT1JX8h4Xk2RKMCmgh0+CcvrdX9YZTT3H9DJyWCTBusEgkeKr+6HZRIDAYxuZO8UhVMu3d5mH21ACsAhKT1UB7doWxDGll31aXrpHv4pWmtaY8ywQiksD1oD4otA8e1xwEqsaU/mrFgneKdgVU7t8JP/F3yBC+e3XxeEMmxnWKd26C7WXE6DI+LRcFDC4R7//zJydtDCCS9qPgET2CaUsc2qQkMoUgH2f42BIooynrPqKUy6ZrMWYOC34oHWCUoHN7piZcVxqfW0XQv8ADPjvFaMxnhJUUlnZhlSuMkEX3XFQYJs2+YLPtC4WpNS6mxM5aP9jCg8LeTPuXHu13FfOMW6u1mDHq671CX51fFsDGIYPFvAHsVKhzI0K9fAvXA7JHqrKPQAGhFkZeodhmm994TO+774vg8F8ktHjhwp9ZEVgpppcEka2dw5+zp3AlAtxObXrWPfPw1viMOAHsQfaMPFk1NP8+OBswQhBmFwYUC00rxHH0Hfer4W0aXFfYdsLCGiv6MLP1mH1/5gpFyzZj68WcE24Shfu2WrnYNrO77qWOnadVmYLpVZQMsoDgJ4HC2nUr752o7cbSwmeGjVQbNKpruaSqmEBWwWDzqc+U8WO58z2dhA1pq/WoEjbLnywCHzA8JWQTACWJobWxS8r4De3WRYGTxduZJqzJPt3n7VLKVeClB3VafqGqLNfMMvDQBV2g83QM4AlpKNGTUlPbZS4FEibCRZmb/2Dvceuj5jmww5b0Mz6ckc4ryOdA4+VnMNGvKftnTTSbM1XoQzXAH+dD2zZZHSFdNx37DmjNoUYk9vaCUN2wUMKpa1JtnahYVWegMXzUGfmLndv7+rmbFtWagEnpKaJbJJ3uJmNn8RLOOQ1AjUco5oE+Z+qIjsPvXDjQ9YDgwcOnBkDZubTxpQ0Dg3CW8OdyLfLRnegFsWz+SCVghwOfj/MWllfocxSRmXZElywNdgqgYGfIxHKRoUBw1bxDqfVVLt3oOCTKNaDT53qNJD29lpXPAxF+OzxJFvQPcZ1M54ErzwaTyhyw2DUwK3NtU1wgXvqTcB69KWIBKwUi7uUoQv8qJQ8jgiYYdCtKA4ZmR8dqDgRqz5nrvE8+XI/keA3/4XgzyL76Br X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77acb516-e5b2-479e-cced-08da90e215dc X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2022 15:03:13.2040 (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: PR3P250MB0021 Subject: [FFmpeg-devel] [PATCH 2/2] fate/mxf: Add ProRes remux 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: OQKeaQu+9wgv Also covers writing mastering display metadata. Signed-off-by: Andreas Rheinhardt --- This is an updated version of https://ffmpeg.org/pipermail/ffmpeg-devel/2021-November/287641.html tests/fate/mxf.mak | 4 ++ tests/ref/fate/mxf-remux-applehdr10 | 67 +++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 tests/ref/fate/mxf-remux-applehdr10 diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index 3f13170eb9..41c47f84f8 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -35,6 +35,10 @@ FATE_MXF_PROBE-$(call DEMDEC, MXF, PRORES PCM_S24LE) += fate-mxf-probe-applehdr1 fate-mxf-probe-applehdr10: SRC = $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf fate-mxf-probe-applehdr10: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" | sed -e "s/yuv422p10../yuv422p10/" +# Tests remuxing ProRes as well as writing mastering display metadata. +FATE_MXF_FFMPEG_FFPROBE-$(call REMUX, MXF, PRORES_DECODER) += fate-mxf-remux-applehdr10 +fate-mxf-remux-applehdr10: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf mxf "-map 0 -c copy" "-c copy -t 0.3" "-show_entries format_tags:stream_side_data_list:stream=index,codec_name,codec_tag:stream_tags" + FATE_MXF-$(call DEMMUX, MXF, MXF, MPEGVIDEO_PARSER MPEG2VIDEO_DECODER) += fate-mxf-reel_name fate-mxf-user-comments fate-mxf-reel_name: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -timecode 00:00:00:00 -metadata "reel_name=test_reel" -fflags +bitexact -f mxf fate-mxf-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -fflags +bitexact -f mxf diff --git a/tests/ref/fate/mxf-remux-applehdr10 b/tests/ref/fate/mxf-remux-applehdr10 new file mode 100644 index 0000000000..29e0e03a72 --- /dev/null +++ b/tests/ref/fate/mxf-remux-applehdr10 @@ -0,0 +1,67 @@ +5e03bad42adeb396b6614890f30aefba *tests/data/fate/mxf-remux-applehdr10.mxf +323641 tests/data/fate/mxf-remux-applehdr10.mxf +#tb 0: 1001/60000 +#media_type 0: video +#codec_id 0: prores +#dimensions 0: 1280x720 +#sar 0: 1/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s24le +#sample_rate 1: 48000 +#channel_layout_name 1: mono +0, 0, 0, 1, 57008, 0x43416399, S=1, 88 +1, 0, 0, 801, 2403, 0x00000000 +0, 1, 1, 1, 57248, 0xa06cd7b5 +1, 801, 801, 801, 2403, 0x00000000 +0, 2, 2, 1, 57200, 0x5623da10 +1, 1602, 1602, 800, 2400, 0x00000000 +1, 2402, 2402, 801, 2403, 0x00000000 +0, 3, 3, 1, 57152, 0x52d89d3f +1, 3203, 3203, 801, 2403, 0x00000000 +0, 4, 4, 1, 56960, 0x431d5189 +[STREAM] +index=0 +codec_name=prores +codec_tag=0x6f637061 +TAG:file_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000001 +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=34000/50000 +red_y=16000/50000 +green_x=13250/50000 +green_y=34500/50000 +blue_x=7500/50000 +blue_y=3000/50000 +white_point_x=15635/50000 +white_point_y=16450/50000 +min_luminance=0/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/STREAM] +[STREAM] +index=1 +codec_name=pcm_s24le +codec_tag=0x0000 +TAG:file_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000001 +[/STREAM] +[STREAM] +index=2 +codec_name=pcm_s24le +codec_tag=0x0000 +TAG:file_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000001 +[/STREAM] +[FORMAT] +TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010900 +TAG:uid=adab4424-2f25-4dc7-92ff-000c00000000 +TAG:generation_uid=adab4424-2f25-4dc7-92ff-000c00000001 +TAG:company_name=FFmpeg +TAG:product_name=OP1a Muxer +TAG:product_version_num=0.0.0.0.0 +TAG:product_version=0.0.0 +TAG:application_platform=Lavf +TAG:product_uid=adab4424-2f25-4dc7-92ff-29bd000c0002 +TAG:toolkit_version_num=0.0.0.0.0 +TAG:material_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000000 +TAG:timecode=00:01:15;26 +[/FORMAT]