From patchwork Sat Dec 18 23:07:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32717 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2958744iog; Sat, 18 Dec 2021 15:08:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxs0G04lP3s081aw3Wm8oiDHQHLTYYuA3t0YICMxbNYOafi9UdtzdeHY7iEdIjk/900VbZB X-Received: by 2002:a17:907:94c3:: with SMTP id dn3mr7379902ejc.600.1639868910936; Sat, 18 Dec 2021 15:08:30 -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 n8si8910095edx.93.2021.12.18.15.08.30; Sat, 18 Dec 2021 15:08:30 -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="D+55yah/"; 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 3653668AEE0; Sun, 19 Dec 2021 01:08:14 +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 9FBC968A588 for ; Sun, 19 Dec 2021 01:08:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MundwLGABtSTiOxJPdAxUBGQ2aA5Cg0Rn9uhThnwCxaEGMBkMk7GTzXs4zq2FdrAiQ8q+UWTWmQP7s6RmPSeTKaUFNzF6lhHqFNq8Os1+/KLn00f13DyqUDjObK9Tv4EJk/Vo2zq+wwodRTMuXimgqsfKiLEzEci7+qulBji6f1Fv59DrkJ5Q/m/ALIDaqlorG9Gg4g2iIyIiHd8kg4N+DZ1HY4m67wxVO5grfbw4RpPQeiuQQoj2SS3PzZuzmS4MX/sRoXufPwHCuTsFc8rWUFje4FxqIOqaauzKje2e8dVqmOoBlPBxrvDrbpcrvhYEfrKLXWGzw4F2ALtql0Nyg== 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=NhKDi6XvUr3FU4aEv3t+B2zS6/zpo7Q42URSPTJF1u8=; b=R1H+4Ftc2nSatoJ2J9qv/GNdjfz1lOLOem+PGstMD4JckLBUfdG+KBQwOmQv1JFjhs8FHbH6rZ0oKPHT3+/91qey7ATA9mZ7qn53VTttUyhGi1Rd7BkFgWDaypBUv1xGj56O1Voy4Z6IbscC//dBiwRV04j0XZTk1vbWgvNbZ8/QAGjAn7t++X4QCnsj8279AOLqX6YraMbj03wRJ1r2wj72j29D5/M7sMtIt8JeeUSILot/PiDTapGHaihz+H122FOW5l/1JEfBxZig/8ENpw0uJvSLnWdHwWZegQR10pgf+wDkxroAeBWg992cRmvYBgv/LJqeDF4EtIXukzjvzg== 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=NhKDi6XvUr3FU4aEv3t+B2zS6/zpo7Q42URSPTJF1u8=; b=D+55yah/W/HEOXvD9ej5h1l8CFrssmZ+Trpzw6gVHbMdO3j6kvqix3/Vr88n0lhdPIz/Yqrtoighd31IGShcskzGx28WfZvogzQyuwUiZCD0NfvqFi8QEU8vV9hVxvAaVGE5Hd3VSpzvL/DGR9GNKzYrtuQ0tOjeZtkJ0/OgItnl/q9JXNOYoBqBNcysvm76EhkAcNLKHMKGwIj6G8dLCvkbO9cVzUtbDxZTRxLR3lYXMm/pxG4fyy/paOoRc40Dh1p87VAsx8t0oxz0MKdukEunie9R1cvcZnQh2AkX2b4W5ajip+a8aqSAqJbCyQrcuH2RN6smUW8JJ4F5vsxO7Q== 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:59 +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:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Dec 2021 00:07:44 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [pohcJPAXUYP/nZwlvRZW6eAnOucLJz4Z] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e330c9d9-7173-434b-b4eb-08d9c27b3c1e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JrzBuQwAbiLqSibOXQaF9EPITTU4tqnQ8zoRPZfdtUf/dDKGp6OIsups7P06xYyqrNKgNUVBkmC6RZWFzYLlPZ00Z6yEuv+NBIgwtfHyeMDP8odKvc3jNDDkcuEh9bYL6bfYfSvACyxrp7Yr1LP5AFV7p7iJirWkVLjp+M4RK7FRspFVma0SmG4pFo9y7h6wzd4mgjCWmGbrxDSzAJHDFMyM7ArH/f4gueTcXosmyb14a5/WuMmy0CH7tCUT1dAXKxp550pH5u1oNsAgiQD/pX9lbNBXQZO/HDlDMPpkK33STIIcieslqFm4Ar3gIXJ+qC7DiEEY2p07+CZHNDsTQUDoSLUTyrhP1IoX1q5NfK7GOIil0AYfQ4i8tRJmQuagbWjilOGUUdZMPlrKvbUKSd9r/QOwqzKDsm1Yut57Bf9I0cdba2oNUyXosVxmvKWeFQqP8NtrXC/4w/xxh4BDw77sGXXZbFGyEkNw4lu4jTXg54e82zLJu1BjgHV8b9g5C3FFryZfi6TCqvlQNjLHbxGzGu70rlAMdSc7KjBJLJauhQP49coiH9m+/XfS8OOv89b5FA2IttHn2ZIzPUhEy9+gUs4ASEY/uSXG5ksAp2tcVDMiCI0ryl5YjOgXeX9PFcZvXWfnOQsd1/aSS893HW6VQmoHVagCdE9CgOQyuLj4YFp5LYHiUXuxvHu5aYKEk7pnSzvHgPT3cFdavkt6jEx1E+Sc1cWDODRaYez2c5DA= X-MS-TrafficTypeDiagnostic: AM6PR03MB3862:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fuqP9wNGUHLLdCjB2/nUMQ+sgCI7GOndrCDrx/XEKspV6cypipuYsAqNY+YjhOHRx1PUx/1BebssquszYdBeCAMlFatiDbqQc1T0D4vEUTDn9Ja/ZGlzbst6RrGIOqA3WktZ+3xHAlwYZqmGtTRCIj9kU1V7eqWPMN2SpwnXBC/aDH4tbyl7uqULOPCphToFIZdzXVY7Dqg7FBqNSi0eSqZgrXCZjk9Qcf5RA7ieoJ4pWqLEJs7Wn0UMI6CIeHKpXbW1eLKSKgGti40CyOSup+wa9er0v5xU+b7oTVohP9wPtNq6195Y+J3vIGi/4HR0LZDzkl3a+s+q/4ZiGp2g1J5nMHshzprG9DF98R71iZydlqFH2ZC9hwTnsmPMiDP7d/Sr+ctTmorGrfjDs6G1OpQg0LPEZs1zmdSdtdRj+Wswq18LAAl6brP9rT3jlPs9yZgWMSXqcl2FrQue+xfJrl5g7DE0WWAowKy63K6vQ3slzNgm4hwAnY+nb9T16UBlYNezBABmJL9vG8CGsXQDcwuzXkbhB6JeuOOOkGmEQEudnT2yJP3mb6pzDjFblkkisrU8hsZRgrSsJNzGIIdmrg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?8VBIIsCvTmlbLOJ1PY2/hPs2erEA?= =?utf-8?q?xPRCBGSwjBDiFcmhSRAa61x9ENichpdGAtH3lObahbX9GyvBCd0wFgQ/zv5+gTgqG?= =?utf-8?q?YwEAk2a2WjYItATcOihnbeEY8FnOzEul8TWszi13HxiijGunbC3TplWuGCCAIOXQm?= =?utf-8?q?b7q+HxN5ASKotIpAPr5Xc7qmSgIRI/+nA2aIc5U/1YmFcsXIEp6kUSjE4JxFJ0JpD?= =?utf-8?q?nk2wxJxecB+fpOn/ui5LkDXRnsgC8reIoqhbX774zkPxAXntVYwKTYM7oJzfSsA2G?= =?utf-8?q?mQe+rxrtQEhgCUCj2+pCrotJ+cnaFAw/F026M5KUr5KM4jcfCaW2XhjRk9ywZFEsk?= =?utf-8?q?T/2YZwzkZ8QeWsYimodsDN1cYrwTC3GeS9PbxRl78oRu4UvrttUvgp4bkFkRb3xhW?= =?utf-8?q?FVOXL/jflObsu/0KU+Q8OmsgoPGCoCn2mHOZHP8m11JWUG/CCwaOWr8KnSTsAW8QA?= =?utf-8?q?rnyhugqsdlYBMotUnR4E8ZwWDe15XhYwtLocXz2/hJ02Elij+3+uut5hsYFdsdjop?= =?utf-8?q?EHjHXl6nUsYqplb6sJk7JjADtTXJ0bNpkNWu1XtW6yN5BWPVDKxHWZ9OLichyhPKZ?= =?utf-8?q?r4zkbFHpnsH95MeCGl/ymwPoGbLm6LkTAKPAXuNcQdqUr51bgWgPQUA+rczKMcrFH?= =?utf-8?q?hpgrI9nENDt5PsVQdJpeeWXGqtjsTFyplNsQBBBvRJaLHfN+7U0DvUFtsA3aemdpx?= =?utf-8?q?miZQWe+lx1/JcrXvOW6HdpHR/eFddy9dOe3yPeEJlhc9TiQwHpXvJnbtL11NNYL2p?= =?utf-8?q?oIT6eCDuoEwnEqTWcqypehH8c7txFU+6XLd45SZk2AnLvuXMIX7evx37/Df6z5R5A?= =?utf-8?q?o89dvTRoLN+qt34SUPduZScwqueM73Hl7sbbINFcQBrwtgr0HXSV/ME4xTzAzlcce?= =?utf-8?q?0v94r1DBsxwVrXCrgzBDK8+C54AbY+Z520iXUwvd/nkw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e330c9d9-7173-434b-b4eb-08d9c27b3c1e 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:59.6921 (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 3/4] fftools/ffmpeg_filter: Avoid inserting hflip filter 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: ypmHCsjDIO0Z The transpose filter has modes equivalent to "rotation by 90°/270°" followed by horizontal flips. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_filter.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 8c929ab9fa..1f6cba2c04 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -761,12 +761,8 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) { - ret = insert_filter(&last_filter, &pad_idx, "transpose", "clock"); - if (displaymatrix[3] > 0) { - ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); - if (ret < 0) - return ret; - } + ret = insert_filter(&last_filter, &pad_idx, "transpose", + displaymatrix[3] > 0 ? "cclock_flip" : "clock"); } else if (fabs(theta - 180) < 1.0) { if (displaymatrix[0] < 0) { ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); @@ -777,12 +773,8 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); } } else if (fabs(theta - 270) < 1.0) { - ret = insert_filter(&last_filter, &pad_idx, "transpose", "cclock"); - if (displaymatrix[3] < 0) { - ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); - if (ret < 0) - return ret; - } + ret = insert_filter(&last_filter, &pad_idx, "transpose", + displaymatrix[3] < 0 ? "clock_flip" : "cclock"); } else if (fabs(theta) > 1.0) { char rotate_buf[64]; snprintf(rotate_buf, sizeof(rotate_buf), "%f*PI/180", theta);