From patchwork Tue Nov 9 18:01:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1492134iob; Tue, 9 Nov 2021 10:02:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8Mr5Fgk4Rg0CvuwAVUjXityQwFCSJn6pil4fLnCtZv7gq36X8YxrnMZX67G+b5dXf9MZD X-Received: by 2002:a05:6402:438f:: with SMTP id o15mr12649750edc.235.1636480935327; Tue, 09 Nov 2021 10:02:15 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cs15si35266029ejc.331.2021.11.09.10.02.15; Tue, 09 Nov 2021 10:02:15 -0800 (PST) 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=pLN2fd7V; 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 B04DD68A9C8; Tue, 9 Nov 2021 20:02:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067068.outbound.protection.outlook.com [40.92.67.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7779268A817 for ; Tue, 9 Nov 2021 20:02:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KtUVolu5nR/S+NZYkQPUNKdWXrnH7QkBhnty5k0d4PHWljaxdFX+iHlHPgSg4IWHIO5X3bgTWrzzLUX+PLLihzS7chuwgY889ZK+QNu7oNIYSyMglQBHPpiMEEyeZShqplm1tJKH7/GoTQuD0mdOidFVP0V9t0NmA78YtNG7P2L6eTFDSqXaGdcHqYdwmmgZmpzYukHplw4FFnDp3uxd8/Utic6gG49G/om6tIV5bMjA92w38/R3L9n2xegiBlkHRVnTynG/MD1fqWccuQZPcu3JJKsdxyE8to0ep4rhAY6UyUJBHfFNI6BKbmjCCIZ7hnCD32Vp8dWq91E8/BfEtw== 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=W7fJawGD6coAadXPkgTXEgdJcYz7QTnEKd0J44WrJc0=; b=LlTxhoR7qe1lIsBLQSOsxRgSR9Qs4KG8Q6UFKmmO0LKCYYli22qYaOkTlC//bnDe4Pu0TdtqVou3MBzxnn16DW9l8ckDk6wcHJIW6Hq1NlCRvHchTSg/qDDydlSDgrduU51wqgZBnY8QhGeArCEsVbJl47TVfoc2dD+KdZbpxCu7Lp/tVhwDa9ZZrbBIe3fYL7d8KO0IyOVQjy47r2PAeyC8esP8xj+PL7shch3Yyarkd8suf5zebq9hNQM9ZummHNYTgsfW1xTI+VVUFfMhr0UUFpJhonTrA1p0G2CUAvC4NvXakYqDTsVTpr0b3h55e3Mp+ZmSYPntEazeTuHFnw== 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=W7fJawGD6coAadXPkgTXEgdJcYz7QTnEKd0J44WrJc0=; b=pLN2fd7VJeTcb/KOCRFVfl4wEapoZ4MmkgO3pRjZbGZmlRVih3p9+JBlwiiu+uEDjCwvvyoNDa1ivFxpL0StynQP0C2vlsZPsxCigz06w9xFtqeQOk7jP037QQmwiLriPSgPEDEizRq3aa+w/8lo/d2R82eafDjbMlphlmWcV1r16lEkuC5F4otZ8AmiBNOhSDzIptIU9y7e6T7MmjdDJTVPKqo9Zzl4zLQGDinoFaWlNcuETexyeima2Ryhrj92axw6mwsKwMV0/JIu74nRJpLaCy6QggqRzkkxyH05nyQE2+C3fuXzN/7T8tsf2Q5oAcRX1/zoIhQKkLsCF7rlcw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:04 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:40 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [STOJj/MAGxlQzdRLC0Z9/Wt07T9zw+D8] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4b519ca-cecf-4c16-5cde-08d9a3ab0930 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsZzfSrvjW+wulzEDwo4mtcUNyroHX896XhgkNHPaLARCxTKchXsf31QlothjzpC+G6STRdvTYzNJW3jyUl76+J+tFHitkmZ7gshxSp8WlCeJsEhofojpIQ+tRmTNnylNp5KPDIwqOb8nb6iCpCIltHE6xAFTxCbLeZ3bFQoDdUe907veF7bgZAvzXNPqGtMI9qlsNjwaS6yRE259Vi/zkb302b8N81w70k4Mqnwfl0WT8j70aalfCq4nzX9Z+eTULmU3PqVYRDz9GKMYF8HXn9MB22sPX/IoQdONAKirKE+jHTFwTWIuYU7yKaqN+FyCFHi6RtoTrzlf5Cg7q4hjSNEVg20syWxfpCogHMRFHgi6uyl96Sbw93bhOe9Wtx0UO5N272z8BfERSVJ578r5V5biV+kg5h+r6wqVddYFz/8Cs2DNnjx0FbFtTqqpWU7oBaHXNT6kvv8H3VDvywahKDb9vTwKqiVDdHPIxIYD5ebrYC5oY+/vhKvptfNYUcbmxBBqEr1r5upBjia7tnW5F6vFvEf06lB3a3NiGHQwZxSIsuC+rKKNhFiKO7QARqfLkMi7b70vu8GH560gfdpUeGtxbQS6cSkWb3wp95CT25lDyydIcMWI5NywBMcFHYxtWXdkOZ6mrF/cbKFzQ14/MI7ZdjaKdayuvUuiwl8eul+Te4WVRmtVzXkL/F/QLKKAG1fwNLUS2w7hkFPnTV89HFE9ssTs1Jdb4Dk3prV56AS4PzhefdWvYWd4TvhDljjD6aYxFTt+OyMZxpubF/giQZ X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mC3Wf/keDhl6pNI0gdtuvDdFZG//ZfIh9hRoD/ckPxz2NhuXhjRGLklsaWENm9Yt2693LAhlvhWjCoEUNeCK5m4qerQ95Morm2tcOaalLAbwhZ8zKCD3LgmBLMA2TKO2oYJrTYT8b5WdM6ocOyXIY1PoLQ1RAuGrC2DNBq3fEVM5/2CUWYsEpE3hZXjJ/zluxQyjEuQ+bCAxZXA2V1O9f5STUEa7CrNd+EfBjqcHZRYFnvOIDdU5DlFy+l13JOkLAJ6PYJzyQ9IVrN6nVPlWxQj23050YWNkuPa/EqrOQeFvAhRK4NJbpSk0YkaEg7qjay1bKgf8lR6bX2dQkZ4NYrdc43uIn3yjVhdUaFgim0rBOWfV4i0Q0eRmGKyJjaSwLeanf74J9+qTZCPV8A8RhrThfrPeY8OLUEgxLy2Zewuhovi/Z4UiEUdaAJkbAH30HUCVtl489Fy0dIjung9SMU9DQEnwlgbznHd8y4cfiXKItcZh+ny+5cD2i/ADNund6SMi0BZdpBJT20H0EDDwFH5hvNCNcxhQLX8bNdSqBUc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O3qB5qhBwyMTkPEPi0ciVgEZgOk4/JqteHWV89Cb5g3phK1s1lomfJo58/yujyWEwj6Ejl5RMBPSFVB1Dp4Il39oH/9PrBNfoL+BGqL35Vvu4vslKLTFur29bDA7/AaHekTlZnL+txGI8coInbXyRykiudTO1HRpJO1bCXfLFj2n8egEHarx/DthY+TH/I0NOA4Qee9i6xdfNMMGFfU2GrBAsxzsu4FPZShczKdxpipxhZwbxTNMYfvfF3gcKsoBa20MdorcMBJe8hkMYRmTCeFLt0TJYTvnb+DEQ3lNPsMQAMwoh/q2EmvitkHpIUZTZhc/ftaZSDqCqRIr9knfnq7i8kOM+UgKZwM6ilmfdA5AxFtETAc+i3JIRzx3McybX3Pt/LGFjHq9lhl+4HDj79SudupNaBZUJWcFYO6MXnUAHFLdpJJiK1iy0DkK/ogFkOoa92qs/xqkwZ0thrBa6jw54IC/i1ntco95clMn1qEKqLuY0g2znm2dBZ2St1O1LLoHJdbLq6DJYuUbK+Uj4XCEAUKNpn6O4yJOnUXDg44sIKXkbWguwf04OPqfjgswyxbi6642VTxR1y8FoBvL6RuI8dBeSmVhtKUL9VYkC8U9Yvhz2QgVzpOr4zZjEJ9zHvMMo0nD2IfXYV6vpxXBNN5DCD02csO8+MmM1DzzVOBDb53EhZtG3mlgFPSpfkM+56HlDGNxsoq3nzdrJIPXBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4b519ca-cecf-4c16-5cde-08d9a3ab0930 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:04.1203 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 02/17] 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: +Fx5radhVCyg Also covers writing mastering display metadata. Signed-off-by: Andreas Rheinhardt --- tests/fate/mxf.mak | 17 ++++++-- tests/ref/fate/mxf-remux-applehdr10 | 68 +++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 tests/ref/fate/mxf-remux-applehdr10 diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index 3a1096176f..f96f4a429b 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -37,6 +37,11 @@ FATE_MXF_PROBE-$(call ENCDEC2, PRORES, PCM_S24LE, MXF) += fate-mxf-probe-applehd 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_REMUX_PROBE-$(call ALLYES, PRORES_DECODER MXF_MUXER) \ + += 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_REEL_NAME-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-reel_name fate-mxf-reel_name: $(SAMPLES)/mxf/Sony-00001.mxf 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 @@ -45,7 +50,10 @@ FATE_MXF_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-u fate-mxf-user-comments: $(SAMPLES)/mxf/Sony-00001.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 -FATE_MXF_D10_USER_COMMENTS-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER DVVIDEO_DECODER SCALE_FILTER MPEG2VIDEO_ENCODER MXF_D10_MUXER EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER PIPE_PROTOCOL FRAMECRC_MUXER) += fate-mxf-d10-user-comments +FATE_MXF_FFMPEG_FFPROBE-$(call ALLYES, DVVIDEO_DECODER SCALE_FILTER \ + MPEG2VIDEO_ENCODER MXF_D10_MUXER \ + EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER) \ + += fate-mxf-d10-user-comments fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -metadata company_name=FATE-company -metadata product_name=FATE-test -metadata product_version=3.14159 -store_user_comments 1" "-c copy -frames:v 5" "" "-show_entries format_tags" FATE_MXF_OPATOM_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-opatom-user-comments @@ -53,10 +61,13 @@ fate-mxf-opatom-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-opatom-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -an -vcodec copy -metadata "comment_test=value" -fflags +bitexact -f mxf_opatom FATE_MXF-$(CONFIG_MXF_DEMUXER) += $(FATE_MXF) +FATE_MXF_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ + PIPE_PROTOCOL FRAMECRC_MUXER) \ + += $(FATE_MXF_REMUX_PROBE-yes) FATE_SAMPLES_AVCONV += $(FATE_MXF-yes) $(FATE_MXF_REEL_NAME-yes) FATE_SAMPLES_AVCONV += $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) -FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MXF_D10_USER_COMMENTS-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MXF_FFMPEG_FFPROBE-yes) FATE_SAMPLES_FFPROBE += $(FATE_MXF_PROBE-yes) -fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_D10_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) +fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_FFMPEG_FFPROBE-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) diff --git a/tests/ref/fate/mxf-remux-applehdr10 b/tests/ref/fate/mxf-remux-applehdr10 new file mode 100644 index 0000000000..cc9ea1df6c --- /dev/null +++ b/tests/ref/fate/mxf-remux-applehdr10 @@ -0,0 +1,68 @@ +1b71f29a5c65646cdcc16f1311594113 *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 1: 4 +#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-29bd000c0000 +TAG:generation_uid=adab4424-2f25-4dc7-92ff-29bd000c0001 +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]