From patchwork Thu Jan 20 16:43:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33727 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6012255iog; Thu, 20 Jan 2022 08:44:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyDVy9Qf0la4bx+tELhC4aGJxnnN60CMx545/WNKxQ/SMjMUZzgZdKqCsQmql1RsUvpNg1 X-Received: by 2002:a50:e608:: with SMTP id y8mr36793689edm.39.1642697050780; Thu, 20 Jan 2022 08:44:10 -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 l3si2159466eda.378.2022.01.20.08.44.09; Thu, 20 Jan 2022 08:44:10 -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=ID1vyUgX; 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 C65E568B171; Thu, 20 Jan 2022 18:44:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074068.outbound.protection.outlook.com [40.92.74.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38DCA68B171 for ; Thu, 20 Jan 2022 18:43:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gm/igbG8ocCVq5Lnymaf+MRwRlX5IbaHU+Z8cor50RZH1hHBB+r5Nk0eOPZwNpBkR+Rh82L/++X30/FlWq6WhCa20VR/waggQUTblc+DmfNoFVRwqu3ZAr7K2mBLc/KaohMJPj4akSFWvHDdMdO8qEyJcB3SPcUAC25UikMp+x8KiFICz1Pl6x+u1BkOPQZWpTIAa1KetJhAnsLZi8an7vjdlO6VDNg2Sd274l6NhboCXm7TVBCSu5K9GcPu7HjMnX5x6zgz2Cf6mfDtwA6YVrj9i1tJH4aD///lQxuFR3ze1ircowQQUBQIFqWQ3B/Tjl2zFenpT4z2OGcz2swmdw== 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=KbkzB+kjtwR20Dlrim3gbYXfmJdt5UNLNceuwIl8+K4=; b=UBMiI4NTQevVTDckZggiaX2pTwoNN+uFkWU5Tkj/NphQnit0AeGw1WTtpuL3KU6B+wslueOupd4V+Db3zdLEUA59LDNdh+TfUg2TZRHuthgxZHlnidRB3evKqqhFxMjoRnpfVgzKZd5nWkymfq3cWml6oVeagdlELUWDTgG74raxpEr0DNy+MWWANYFNUW1OjqnppYFHp98qo5zSailuyxZu5oNFoFk2aIvTh5FFAz+fyCmS5cNlh9OyNTf8tDlxIT09HZXrX6gJXl7KJ4REg+jSA/fnAqj3r+kxja7zRMKSGjI+D42D/FtEwOpqrfsCDijZ4/u/RaQPIwtGPnz4/A== 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=KbkzB+kjtwR20Dlrim3gbYXfmJdt5UNLNceuwIl8+K4=; b=ID1vyUgXlbQ/zIc3V9qhmcBbQr63nr4kRPQ/iPkhesw++xqM9nBZDxq6U6aPBwDhsRoFsESaW5+1v7Eey+emjKq0evoY+z7RQfxF79JmUSVNGd1nTS9L8aEJk3zhc9w6Zg03tXdws4lwQUjtCkR7Otix+E+FzSFB4acNbUDrZZd26vShk2fq5s9NSLRGtY3Im7CcOmrVbsTZ4I6KY+mmDXZxTY/CwiCep3evzZdO6EgmgID2NA7Sj+0OM8JfebF5gZ7n5puU6JSlEWyfD9ui7zm88oL+ypH9+WuyUuBUnIJF7NzY26j9d6oahbs/iQrfjEIPdTrrPLAiMWzA8BMU7g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM0PR03MB3956.eurprd03.prod.outlook.com (2603:10a6:208:73::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.8; Thu, 20 Jan 2022 16:43:52 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4909.008; Thu, 20 Jan 2022 16:43:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jan 2022 17:43:45 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [cb6/npxMek3zdMzf3djWFUEOmWUGFd4d] X-ClientProxiedBy: AM8P190CA0029.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220120164345.1188438-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e117d1a7-bc01-43a1-3777-08d9dc340a88 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvTQeIjQRbdACbPdSmg0zv7v5xXclD1J24+TGzO6RIVf+JlfFyYrv/763Oz+o05qLnkIOhUErDzCzN/aYTMfQEfio+N2DLXC1R1DOE8RuOfZucbfN9OzsgKeown67w5i5/G19TXrMO99C70SIp1d54STqs6t0NC4Y8MCDenQVJOp+sox+o898/DmH/YQmDB7m8Yg0pQjTFtKinTumNwkSJR3z8IXFsf87TJOn9H2x25L7Zyh84wJUBRHYadXQPqv399HZVugwz/CVCm+u6LkzPb+LlNGhPi36jC7fwadOpmvrg266IyRLLEBx9zB1Wp3UBnYC5bicAHoaSVRMqdx1CuXJszX4rdNesrRAfkRSjlej6FMiq2XWQDXLLmIFzeR+rm+KftLcfD5ymlRZpmPBf7PhTMQphTrl5fYdcNlK6XPmpPwq4oQF0CVFX5UToGKsDCl09f4mWh16APvC9QbKbwtCCdyw3p50NhGmjUxEs33Vpixgv2hebeFgH5MpSj/CErNl6mAoYLY1XF3RUa/yx8aLOV6RkdCGAeSk+uLp5dCxJtJciwDz4t0k86uzWkyGdscbi7CbSJnbzmJYAAvFEj9uxFN9Rc2dF2Hfw3sIqiLvvrdA+YSf4RH7bFzlAjPqAJ4ZIQLYIN0Xtsx5Y14RNaMauRYelJA16aAh33uY/C9gLddLlXHnqbvIC3tczeIqiF0lK1Uo3VhJEgu0BwDpJrqctEWP/UJWB/kwcFjAdNJYXfST251sQeK3rHWBhgMjIvsUZ2ToAN8RsW+nQDtgrx X-MS-TrafficTypeDiagnostic: AM0PR03MB3956:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W7j2SYd6Cs4fGfWzlOLAYnnBgC/PxMVOy3jXxivAGtmOKJtD0MIpfSZ8+nfGf++evLrejcblfiQOREUpotrt0v2IIwEQJ4oUZG5G9orJEUGwg954ZSmhvPn1nZYO4qEaf4siDqtHJ99NBcWtqXBI59cVVdavgYh3BQSPuvkL8g5lnZ0wqV3XIpgMOAWIcu2W7u91yySxP962RL92xchGQND1JjVAWwvEEIJxNUI+Q/u9kozAVubFgmjj5QiRjS+TtZNofcXASPEQGPcT3T59A4IOlA8kaGWTHs2nxpHAgVSwCI4dhk1vsNx8BkZY2HaP8BoCVYTpb7JfuPK1mUopRgt99G1/9SPb3RgQ28zxnnRKhlK7GrDbI3TZvzh6cSheZCHCNL3zfttw9SAY1SNtn2FhQxyvzaFGzMdo+k/HDzHifr5DTAXH0EuoC3PLo8f8b8xUiK/B5GKYg99TyvTSx3J+OjnyRoU+Z7oxfvvwXFonCdoxzGUSHFQy9dmsk73Oy+9OG1DkFuW30KncYQwcmml18rPHQsooT/J2mOLMCsNFHOr47IcWr0tF3QCVDfCK3tAkY8XoTDFL9sF4BXJK8w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +vHqj6xcMShnyTg+fjHQzmA7r1tR1/hvFvh8jnNNWuV6ld26+btRqco0AFHtU927C/vYPD7uhXXxA4xaf72H4u/bTPIlbTWhDwV00tfCASFku6St8eTuwQ9YrVieQ9KsaG0XOC1wi8vE6Zt62dfyBSSSLqL0nhgdKYyCn33rtBOFvaM3hYb8T257BUetqtHNVBiBFmCqGV13vaZtqxyZxxabDYsA4xdGPxCWSvLDM18FZzbNIDl7WcSqViYHreKvBbIqz46ppFYi2TrWte4KRxlCTwLhB8Hyem7JHkElL+DWtUnDeTzVinjYGeKOZKbkvHTAEr/+wBIFXQ7RYzIhmAdCmwSLnBbhRJBD1gfzzEpG/BbjOwInbQG+JlG69eAN9wR4hO2vnLVuRK8VqFyk9GS3l21A8CW9OMuf3EbPbY6RdJ4qmIqT+4bdVRdXUem/doXJ3YLQBIhOXRUu15CkeuMS2hlYuvJb/52a32QD937W6UXai3XoFdsSBlJXfkwuUxD/dLwIRUW82eumtf/SAemEK7flZGmVOuLv+FW2/sLQqI+ziq5EbjYrAvv8tSGmWJGeiLv4rTyMlC//389izgsGWHtjilQxdF09a5uaRdjTALoGfQbntDOZcHLX4K+tIi82U0WczewMmvLJJc/YzQ6R2D4KvYhzvSKE4xX96PoGojDlbS8+TZsZmw0k5BmS27Fe7nhtm9usAzxLmh8xsGYIp55p9n1FfqfP08VY9FGXvxAgriUIPayO7VlsK+TaPNA3IqplecYe0OxPRrLLxJPScb8YU3/VMpiVwM/yBWCQ+wtbVXGOHyPJcUTlYDTJSLuhuTzG/ghw55WWayYVuP8XbI0ynR20/fSfd36Z11/UtKX0vK0qMBtE5dc2ncAV8ss5k4qIko7gylaYDEyLJFl/dVukuKdkmwAfEPOX1vUSc5mtuRRFLuaXUYFNDHjaKE1IhryGMzWygXfQNlZpRg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e117d1a7-bc01-43a1-3777-08d9dc340a88 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2022 16:43:52.5536 (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: AM0PR03MB3956 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: Fix writing AV_SPHERICAL_EQUIRECTANGULAR 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: 4RVuAga7aole According to the documentation, the ISOBMFF 'equi' box must be present for equirectangular projections. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 8c10a8c133..38d9485288 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1305,17 +1305,21 @@ static void mkv_write_video_projection(AVFormatContext *s, EbmlWriter *writer, switch (spherical->projection) { case AV_SPHERICAL_EQUIRECTANGULAR: - ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE, - MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); - break; case AV_SPHERICAL_EQUIRECTANGULAR_TILE: ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE, MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); AV_WB32(private, 0); // version + flags - AV_WB32(private + 4, spherical->bound_top); - AV_WB32(private + 8, spherical->bound_bottom); - AV_WB32(private + 12, spherical->bound_left); - AV_WB32(private + 16, spherical->bound_right); + if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR) { + AV_WB32(private + 4, 0); + AV_WB32(private + 8, 0); + AV_WB32(private + 12, 0); + AV_WB32(private + 16, 0); + } else { + AV_WB32(private + 4, spherical->bound_top); + AV_WB32(private + 8, spherical->bound_bottom); + AV_WB32(private + 12, spherical->bound_left); + AV_WB32(private + 16, spherical->bound_right); + } ebml_writer_add_bin(writer, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, 20); break;