From patchwork Sat Dec 18 23:07:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2958516iog; Sat, 18 Dec 2021 15:08:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzopCediYrjP90+nX0t0mlVvHVRJj/Ab2TsUDyJL3J60FA6dlhtgiXn1jLwbaGD/YPy4iNc X-Received: by 2002:a50:fb98:: with SMTP id e24mr9070683edq.80.1639868889074; Sat, 18 Dec 2021 15:08:09 -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 b20si5396006ejz.420.2021.12.18.15.08.08; Sat, 18 Dec 2021 15:08:09 -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=RYFFgcrR; 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 DAC3E68AF54; Sun, 19 Dec 2021 01:08:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2010.outbound.protection.outlook.com [40.92.89.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A63768AEE0 for ; Sun, 19 Dec 2021 01:07:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hECGN3UT8AbB8QduaedtacCx3VYz7aU/E3fdUKyOMeHHbZ3nGSzhM0EcYl00Wu1OZzPRoTUwDUQ1w3NlvF78/BmzTKG8POp4Haop9JCIHOlPQ9b39GMYnA0RAs0eHpikwE8KNLcFqQCuzj7aLTkkIjsj6/SaG0de2/K8BrtNk8DsTMPva/p7wyy7W5aiBael3IFqgwRGjxfZCtWPYzvF/Rqe5RIwLv4XydiuLs3Avwsu/beGlmndRf/CSSyhi238Lv771pt3vc71d8/FYuaNMtLawYMxr04+9o6xmtWNx8mB3MiyiNQGMcKxU3CnpPl47ZAGE9w03bf+soqNyQL4fg== 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=GcH0lB8ijrOjsmGWgHzWQRMjaLN3dqLAkhMoVmO1EAI=; b=hJp34HQhjiizgIaoqk84/tZqNiFjn8UbZP+GpqlgMVolD3ChboDEyzaz8ejsHbUiiVfF4/hoMBOTALFrc2YxUUG3QDrih3kxbqieaIEhCzLdBMZFOz3/V8bMDhuaAJ/7BGuoBJstu775q1JBt8OJlPVgEuLpWVRQJcc4dwt5vDkmlbq9Pow/uRpflAvWLmJQKNAlQ1w4ZIW0m1ccJNoG1B5sVUf5joyqkTN4yj1Yp/COxkv1fFMUjwS5bpIlyAC8ySyuKveiJt/wQhEGaEyZUm1RVxW0MaYvASrT7p2budXYA625yAhwufPLhg4jvvjjvyQmLcJ5ZZs7nBOlFGHujQ== 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=GcH0lB8ijrOjsmGWgHzWQRMjaLN3dqLAkhMoVmO1EAI=; b=RYFFgcrR4JKrIFdfXZJgAG77fLkPS0vXP4SB2A7rtQjqovi3amlqu5FMOcihBxezZnjmWtxQqBhOjC+8rNOO5jEgSbg2ycVev02SimxftEV6G5X+5iL1XcnWlr6869wrOqFiOExTXOMmgi3o98F23dLyK0Omj9QAlMIwejCWlHUF71wYPb79GcsegYm96eRh1j7X8/FO2nHsavvxonricr3/V2mo5qD8OPBvgkAQRDJdD2ISyWyIY8Mc2/6oPEx0GUWouTgFGRHUoduuFvumj0y6By6bMv3s6lxoWPby4jOaKvjIpAcyLHXMFatb1UgvMmJCfn9Aw0tA8VeoNYnoVA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3862.eurprd03.prod.outlook.com (2603:10a6:20b:17::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.19; Sat, 18 Dec 2021 23:07:54 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.020; Sat, 18 Dec 2021 23:07:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Dec 2021 00:07:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [7AKtysYt3miiPAXqguZp6mrUBQveHi6R] X-ClientProxiedBy: AM0PR03CA0076.eurprd03.prod.outlook.com (2603:10a6:208:69::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211218230745.1227624-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ce6e0b0a-f3e4-46f7-8d61-08d9c27b38c1 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ+cHfC79vTguh6WqLpD1ahiw8MyDkfs6Up8o/M5cMpKtLDcgWM49EMqF7PP7Sn2+esacI7V5jcVxNx2//MdbicoBZ5wvV3lJnPklttdt9U02wRXi8Pp6Gd26kKRHf7rqEmAw83sxYxn0f8J4C0/JjyYOx1MqdrJrcEcOPM15yC8Xs5KK2bhbvOh2bNMnHNlIc4fAB8SOqnM8RcezopX5wsfENEzFPJBHaRMNdnFnIedYEu21ux06yEwQnJZrfRvhGEJ5bpfrw8u7M8SEu6hcqBKs3F89guSEmHEXVtEHfIRyUn7EXDBvRFWcNFxZkBUVDQczf6VENAQKlAoR0Q/k40CsnCjJJCFbnTKd6vZ4mXBbvzRyN85L+cn0z4cSUapc4qa/wUL/3QCdOCYr5ad1Ko4AJ4DkNKzpZvupBiZdRSUKkaYHcTMhN9d2gWHJH8/coBwxAnVX5TQ+Fxzc1vwz4iGbU9isc6HhDbIL2BkZ7yAdbJvktOQp8JQN9rBiKg9nHc9arWe10LItVgCwH35Rv6WhVkA4kB9B7krWhFNYrHZI5m5yA4gO5wwrzgJ+rxkRdWIExjhLjruRJccBh34Z/7cTviLYgviugx15g8LwrdU2rlXXDUfOE3dKkx03MgRfHhmDuA5gDzIbXacC+Q83Lffd9gGYlUqsshl6qk2OBTiuc26gjrQfDFHmbr7cE0/vHGaX+ALKHs7g== X-MS-TrafficTypeDiagnostic: AM6PR03MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6qSgEDYJh5uMBfdX0pDVdKTpUzQBQtXr9pYY9zIPDOPZMUI81BznKhYVRfXVRS8vlNsLDx2CDTbZdUAjTXezaCbYTpmN1A1osuzLHiDqRTdNbDEmo9V+/J3A6JKW8WCqYjjke4bf3v0wB/AHn/G+6dqtjavI6CB7ePXYG+EMjcTmgH//LhaE45KzzBYVexYTvZbJIttYs7U0GyszNQq6RhDqtQJysh3qPee1tgXnRDnYqtAdnMUqJwT3/HCt3Bcbz+QKh98LOXf3Yz48ucG0qq+WA5ykGzAK6fr6XsaFwTkfQBM2abbl6YdA5JVAr88QL6m5y4tPDC1YwrbnGb0BNg+0D9CnC9BvM+8XN8ApIhxDZvAFKuacX8JuHPXXwLJ6YFIVpAJnmJEexm4U6/wK2K2rMwlGn+E9C5Km3BEuaADe0HG7xFrh5PdU5MGzz/Q7AWTUri3fslAYqpV6SC4HuVn9FshUV5ELwyyHsq5tOMCc80Z+4yg+8r0jIl0zWb4fIw+8goUcX5vyxLuBT9LIHZ5xxsckSj1t3fntPPITw1/tFv8rBsve0KDwiHtmvPo1hDWZSB6AYfCFizkFih8q8A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s7UjjxXGoHljbZG58685o4P8O4ZZY/XP09HI+X9q/EZoxsgiOJk3LPWlR5GKQ0Fd+8df2kSVrjf9v4IbvIIwyKN00BAe7IcBUlA93PNpicsjaHBw2uusg9uGn20UxtKGnki6puWEMxrIq25CmirhUm4a1UwS6dsMG1CFO5sAy7t+qHCgpRtluDUPEKSi0GjuMaojH43dMAL1zHyqwNUA9MbfiMRDrRxdJWYqOD5CVqsMB4z83VtCis+vjAmDMrefj3QDhhw+PsOQryCbpXxDVBIMKUpHzjmOLaGCOfcsvGgUxGIWpS81bZJk4cMEhbIKMrJdIjTG/mkaw9Oj3ZeNU7OQsL/g0cWRA5Pp0d55RJReDb4Yt/EX8dPG9b3mvZK9elTti43FYcwjyhHU1evNkX+lHK3cDuRYoFpRXyiZuu7nzOe1ZeHtAfLkwv7JrQqPJQYGlBxUFthUElWafExErJfj/yBbS4jR5mofQ+k1uMWTNSU23i+Vqgy19bmo7nKPNB7OQ2+tMIg9L+BYvgQIZIi4uOOFA+ezbVUqbrLUZg4KWIpE4n8PHUC8gZOdPM+WYHhZcHgeQVIYKCTKGuolujWwc+a1L+JRL57FPKX9OK86gZSBLPznHvhk72XFyBT1+K5vFD3I4uDC7nKZaWsTNFAw9oabM+YSXMwQq27dJTamClEy0aBZawAgsdvj6d6pfdlvrxEob3zVAP7++NXbfOPPFGwg+YIwAfT6vt7GLUp6S+Aj8sRlhOiiFSiKVO2HuHnCkGjtxiJ3QuFnemqQEQtrCA8IgkKs+e45fw1O7ycffw8Q50LcmVgn3pIt19hTtLVv+8CReJsip7s/Nl70gRQfLc8a2lM1oat95M9VdaQIdWuTxxrs2n05d9WM60D/34aN9CXaDPjKwbKBLC3AKhiXuGnlVKmwoakqsDSxzOAReKPYYPLtM/OLo6VazqteDco4fsVUbxFPERHZF4xVpA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce6e0b0a-f3e4-46f7-8d61-08d9c27b38c1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2021 23:07:54.2047 (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: AM6PR03MB3862 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mjpegdec: Fix exif rotation->displaymatrix conversion 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: XOHFUnv5mot4 The cases in which there was flipping together with a rotation that is not a multiple of the identity were wrong. Signed-off-by: Andreas Rheinhardt --- This whole patchset relies on the mismatch in av_display_rotation_set() being solved by keeping the current behaviour and updating the documentation. libavcodec/mjpegdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 8b154ce0ab..0dbbc14bae 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2896,14 +2896,14 @@ the_end: break; case 5: av_display_rotation_set(matrix, 90.0); - av_display_matrix_flip(matrix, 0, 1); + av_display_matrix_flip(matrix, 1, 0); break; case 6: av_display_rotation_set(matrix, 90.0); break; case 7: av_display_rotation_set(matrix, -90.0); - av_display_matrix_flip(matrix, 0, 1); + av_display_matrix_flip(matrix, 1, 0); break; case 8: av_display_rotation_set(matrix, -90.0);