From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 942DB46B90 for ; Mon, 4 Sep 2023 11:26:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D49F68C795; Mon, 4 Sep 2023 14:26:00 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2069.outbound.protection.outlook.com [40.92.74.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 537DE68C36B for ; Mon, 4 Sep 2023 14:25:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PUvHkV8HexXzDzwLIDRRqIzZK1+d3rhqxJVvp9LqiMzIOxQIsqqe42x0KI0A5p2zNlTt9F7kFtEmgwy+5dVR0qMBn+GZVnpsGkFsIxIdUlCuP+ReSUsIFqNTp1ZlVgylAnoqccn7TX5BNMbnz45+vNYkVXIoAoBONQq6FEWJJvE7S6HpVQw33CbFpX3JsR37CpQqFlxQ7yhRaIeMNLM+0offC0WeTIHGBLzT0MLPFBSbPbZKrNsu6fFqtG+dMz7C8f8DWFcqbYeGgkFBTQy1MfgzzFq+vqrpjVzaXznCYhINeMmmhr65QO7Yza0pLNpHFzbUnyN0xplpBPklE5uVzA== 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=BtMlc+LVjVZLwo+nbPZe+VqO4hYT9OR/lJb8Zmv/5aI=; b=ByF3xelSRH22OC1fUoIBnPT47dHu9UyZ8W5qvu+Esixs5o+2tCrxfybLJAbMqUOzLZQTMVYY7AYm2rF3IoPkauVTu+MoNcy6JG1Wcig0UDZSOIKgl9YcHEKsChcCb2yFFMad/AyK5f2AlRyCM74NuBZ1KaIAP6NcMYVWY7PUNlt6nMw6V6Mso0ZsWzhCmq5TMlDwQujWq8o3Z0r4nOL7/o5KjWtJUA1fiP2r9fgrKkQdDR8VkwZ05QKVqjQDWNweHSm9UGX3q1jBylzrD5gDkcfJBDH4miERF6Lds8/+41ZZ4njxkBosYqP2LtdKS/nVCFcpgseP7Y4iiVI2kTUoVg== 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=BtMlc+LVjVZLwo+nbPZe+VqO4hYT9OR/lJb8Zmv/5aI=; b=MPfYeVtQeEk9sZ+Iw+iRZphw3DClN7zhIhaI6kDG9Go+bc0gKvFxKnLq44TFP3CI1a53Gs6pYX8Co0RV7OOoDO992LyMs2YcdWovqGlDyval1VjFEDnY3aNO/AU72KFbl/etl/mGu5Ao2/bRfZ9qSZStUTaBgxQkDkMrZ/84wzX5ps6Wpt7U2VPoj+shcnMtD7HxJdII/heOJBfz72Po1g5zTa8BI6KHhKZ5Rsg2og0Hw2vjICbI2JUJ1w1z1JZqGr8aV1LOGZtRGkL+DTrzseWofruGsH1MleF8CKcOx2ZvisAmyZvMu+TEbWnP9lyyBUnGX3h0UdjF3QoGlOaR3Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0333.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.30; Mon, 4 Sep 2023 11:25:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 11:25:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 13:26:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [hJ+DXbSN6yYBaCI8sku31i+lBpIHhcXxK8vLy9tZZrE=] X-ClientProxiedBy: ZR0P278CA0123.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904112705.2651889-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0333:EE_ X-MS-Office365-Filtering-Correlation-Id: 382c859a-a2ef-424f-c818-08dbad39b29c X-MS-Exchange-SLBlob-MailProps: 70qbaZjg4msS5Ik6K0Q5QnvM6p6iC6nwhluHNzxwKojGxCbF3oNwaOmDW9nfWchaPzLpeVvK/ep1N+sqpGpTeBcoHDhj/O4Wo4/Wki7AH+6VTZVcikkcFmn4NC1dCdageFWeqpZVRdHYaj/7tbB68CmmGrCkpD5xNRJd+buPyJJ+mcZ3MUBXqiQ1YRbjRklPjziyduO2JxJoYO2veHtFWzP/h0EhwQn1ib42TnobTmb7pZ9zuJZMLZ4x7PbPjCbfiA22Xc3odG9iZVep/iz6nwpYMM6eJqN0do4CZOHCg2Dg3tUp5Uf8ybMKgLSVKszdmH+nWehRJhNapXy9l6fnQVD7CPkad9ZjtIEP2aTDq5goy5BCkcvnNehOCaD4PY7HC4mzvg+wzt5Xyur5RnhFR+FZ60Aj+w1YStCkuKfQEKJ2PG2ZIaKRwrtuqTRSGll+b7xEID0qpWF/HN2vbojizVH59VUYjzXaWqtg9pR8NOmSOP3dGahgpGG1QBUPy20pcY2R75jOzO05ZEa2kv4GEuIWHCDqN5lHkmssNYki+DcfPI6gqW7f2SQIbz1cVqYWyeAGggD6gX/H72cxbDzWX5oVxGozAWjC/M/VnjU8yEWFJn4NT6dguYpSYCjWpdRSnd6rnwourvyaxXuXxzIflRpgkxEOyX2+SFFFZV8Uf2UOr4kysf4EsroH8QNpMWjunDc8bRuPMjcJ934cPC6BzHKL81n8auxJFe1TL2ULwK1/Bx7nYap8WQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hsbfZuYhf7ykhxF0QUA05H6L0r5+V6WQ6vKHgbI0oz/4BGotmF0QVI46J4ye60PipQw0RFilduGwdnCK9sFxdov5HL/4QNOmo6KNAJTDi9nk/qJKDwjjmd5yZbObQpMQhRXkoQfqQNqRqLvuY38W4x0voCNC1tQ05iv+C88Bj5WjedG+TA6on+F9sSEy3qjhktfXT9FcGB+Jwj8n7WWfmqkqK7lnjglT1f/d25M4cAYCUEWiZ9pe4Fd3n/QFSExyEf5rWhxg58g5hoPiKzDcc+dsqrqcvzBnGayKpHqcI219fIOSVxCNiB0HWNCywCsIEoo6l3HBhjggwdDHSq+O7GRw+xx9s8p/6f+MzhHu0BjJ63Brr02CnUbxrWyFAtHsV+R1KfGfImKbMZXaqtl9b7Qe7YhqvGeTSal6KjMZTzG7vSyUzLUnDof1Wp8xkJcgJOnsEofYq16OaN9c5AOTZfQ3V6Qv+NtMK0my3mChSExTOIVNePUrUMYYzlfWBD4ML7b3V3P2Rv0TBVp+5SatKyQy3eNA6C5YizaMBOXcVMz+NTEiAHUsR5PncYCgl8dG7B3mBOlXMRYtiwDoqHiEmTjXX2EUtpASuL1G/ZosXhgqAUL65zQZ4VzlYTF4eShO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?v4u39C7yA1r62dStAD4E4xWCmBkqXRHinxKqJtntZKNrUXXrYZdOQKGWtyZG?= =?us-ascii?Q?NFUKKsLig+UKt6TYy+c/4khZCaSp/CQ1HbzcPPRBqRWJYhogffcno3i8MItE?= =?us-ascii?Q?cYW0vf3ss154sEIsKEMsYV54lXrEbzTZAD2zPHbs1B+ZFHZ4+N6m3ZKRS1B2?= =?us-ascii?Q?gkyvhn2NtZTdeKTWCFeYS2rCQX5WnArbOEVQSkdsStxDxTu2TAgmBrD3KX9E?= =?us-ascii?Q?DMW37EFNv7Aqzq+Bc9bMq27ENEntXePkxLStdO0wMkO+HOvEx8k+XDR6bfb4?= =?us-ascii?Q?uiM4BfrHEGO0h7UCOdjckZqEgvJT/KTAvKo/1i7VhtFyynjOV+oZwPAgjLRN?= =?us-ascii?Q?ofVzqwtXK5yySOFZQyMK6vxEKf6ci7bcPRUUtl37fVP9Aq6PabxLWOXxdIPL?= =?us-ascii?Q?vts/FSXINRP/AK086pMP7op4sxZlNHoLkK4egRIWv2bnevtYWcLXnUCbQmN2?= =?us-ascii?Q?3w7E9/BziAJHCG9QPpv/jCVaUjOsNMHJLquDqXZ5rwsXZ9EIRClY2c2J2ycS?= =?us-ascii?Q?3vTECyOxkG77h4pYy/t8ojhgLu9QMJdXmBmGgysdNaX2L9lZ7ZqrsG4tCFwl?= =?us-ascii?Q?vbPaF8kFaZ6KADIuRpsoMSwWvnWdjYccP3cY833vzIIhSt/dwRFmOjoADBC+?= =?us-ascii?Q?6ltYy0EKl71UJzc4qkF59aTY1zZSbPF7If1N079H5K0Gx0RTkjhfjycmcFdu?= =?us-ascii?Q?awu9/n6Z1gJPuXpHHaZ+0LFJjYJ1CMyN7af+cvRj7bZC2lQdcxn/f0TBXFkg?= =?us-ascii?Q?Vu3Woel17NTQ4idmtevT1pdTGYMdk4ED913K9Vf0gKSLw87oQuPpIppkhJTY?= =?us-ascii?Q?P8JIQADo8LcuI7EEwV2hx5leKYDc0b+W/yRFoDGkDUXWPW9LwUZ8mbhqPNgf?= =?us-ascii?Q?PPryPkD7ctbwh+LkncUvIcax9ai4drCuQ+094+Rmd+ZXdxK9mGCAwRpeEM5T?= =?us-ascii?Q?S/AUWHeuk7M57PfUJTzg1lLTl3BO/4u2t2Da+RUordFqnLM2P5w3xO7VWGyl?= =?us-ascii?Q?AXu/V8aP/S60nKTnKuLaR/BfRA3dVO94btyMz4zrQfvt5bARWAeZQAynCqtV?= =?us-ascii?Q?LWK4iBTJDoyGvl09ZBsHmbkdEutjLCJ2LBB63JnHzrHgzhVF/eLL3wscljwO?= =?us-ascii?Q?y3U9k61/A3iGfcgjWMMIoxSWqWK1u2fSsrNXcow2uylPtyxqMzw0oIGVgzoV?= =?us-ascii?Q?J/ZZmRiJoiBKHjomN3cBWTEEcyjDw6AaMK9PGQ8mF64mrMX97whk2VIPr8Rs?= =?us-ascii?Q?2hj6zspTe3/4jaT5FwLm?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 382c859a-a2ef-424f-c818-08dbad39b29c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 11:25:52.7048 (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: DU2P250MB0333 Subject: [FFmpeg-devel] [PATCH 01/20] fate/matroska: Add test for remuxing non-rotation displaymatrix 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This provides coverage for the case in which the displaymatrix is ignored. Signed-off-by: Andreas Rheinhardt --- In this case, both the x and y axis are rotated in the same way, yet both axes are scaled by different factors, so that it is not an orthogonal transformation. Yet one could still argue that it actually has a well-defined rotation angle. tests/fate/matroska.mak | 10 ++++++++++ .../ref/fate/matroska-non-rotation-displaymatrix | 15 +++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/ref/fate/matroska-non-rotation-displaymatrix diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index d1c316e998..ed6bd58cee 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -90,6 +90,16 @@ FATE_MATROSKA-$(call TRANSCODE, PCM_S24BE PCM_S24LE, MATROSKA, WAV_DEMUXER) \ += fate-matroska-move-cues-to-front fate-matroska-move-cues-to-front: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav matroska "-map 0 -map 0 -c:a:0 pcm_s24be -c:a:1 copy -cluster_time_limit 5 -cues_to_front yes -metadata_header_padding 7840 -write_crc32 0" "-map 0 -c copy -t 0.1" +# This test covers the case in which a displaymatrix is not a rotation +# and is therefore ignored by the muxer, i.e. the ffprobe output of +# side data should be empty. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, MOV_DEMUXER H264_PARSER H264_DECODER) \ + += fate-matroska-non-rotation-displaymatrix +fate-matroska-non-rotation-displaymatrix: CMD = transcode mov $(TARGET_SAMPLES)/mov/displaymatrix.mov matroska \ + "-c copy -frames:v 5" \ + "-c copy" \ + "-show_entries stream_side_data_list" + # This tests DOVI (reading from MP4 and Matroska and writing to Matroska) # as well as writing the Cues at the front (by shifting data) if # the initially reserved amount of space turns out to be insufficient. diff --git a/tests/ref/fate/matroska-non-rotation-displaymatrix b/tests/ref/fate/matroska-non-rotation-displaymatrix new file mode 100644 index 0000000000..c48a4afa43 --- /dev/null +++ b/tests/ref/fate/matroska-non-rotation-displaymatrix @@ -0,0 +1,15 @@ +3d9eac5b7551c5d644443a70451c809c *tests/data/fate/matroska-non-rotation-displaymatrix.matroska +7860 tests/data/fate/matroska-non-rotation-displaymatrix.matroska +#extradata 0: 34, 0xc1d10b51 +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 160x240 +#sar 0: 1/2 +0, -33, 0, 33, 4133, 0xc48cf152 +0, 0, 60, 33, 1077, 0x15a71a8a, F=0x0 +0, 27, 27, 33, 355, 0x1ee8b91a, F=0x0 +0, 60, 127, 33, 1110, 0x4e1a2b12, F=0x0 +0, 94, 94, 33, 430, 0x8724d62c, F=0x0 +[STREAM] +[/STREAM] -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".