From patchwork Wed Sep 8 18:34:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 30074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp687851iov; Wed, 8 Sep 2021 11:35:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvnttaB3XrmyIgyr+Oe9/aN5vxvmgTe8uRb0oPf/hA8cwCoXjBgc0iazEdct3scEK0GdI/ X-Received: by 2002:a17:906:6148:: with SMTP id p8mr1331532ejl.17.1631126150891; Wed, 08 Sep 2021 11:35:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631126150; cv=none; d=google.com; s=arc-20160816; b=HZBnZqZCtXDwozGVDJemZB/DrhNYeCoeO7P3Qu7ohiRghGVr8TuJOrlCND2/XdGgek i2vRIyBB9TM9BSuZzQMPRjJIx1B7ZrTY3XUIZfDUJPiHzTPWo/P/K/EC0LGGipp160Ba iiyX4d0yxIs6GvU2P5oreMqEGHcxiZlW0KwENCTfVa5aYeZeKNIcSYC7ZWXBuE5LopjH fF6Nt5qTUKu7dZ9zNNWct+Ufu15gCWRR2WG062Hqim+Nk0pi57urLMNE66AI46YBIhXN pYwf7lDVQ/KPfcffUejp4N04qghTqM9yb0Oby7zgvk3Jmf3t0mcDLx96n711oU95yFxD CPlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=54+7bBpu18J4SVtpagwO4wWZhPagvbafepaDJjYfGFo=; b=Tt6YAdOMJuQSGjCaEqzMZBt9hP6PjY73nevSIAeOcdEyNMQ0Ss9oxOGinHu3D41CkE ftDywomsiUpMfDo6F3x/mXUCt04x1HYNv1m/os9PCXcp9vfalmPAqstbHTLpAdNZHJua kBVyNCKRkF6AHSFz5+zqadMXkryMsOPIrK5Be3dCkonlzi0dSlhlZHM7zC6UuHwU0J3u iUGUmNZVJ88nuYL/4wg5oR2plvePaPaK1I65OBlnfRVCLmY7riV7J9YH/f0Jlj+2yXld Ry/22HgbpKopk88IJPk6nWYenH/ssuIUdEKdcSZLumdnH39Lfkgh2YD8iiSKwlTXqwM8 1q0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HIhcmdhU; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d16si2799496ejm.114.2021.09.08.11.35.28; Wed, 08 Sep 2021 11:35:50 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=HIhcmdhU; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6BED68A7E6; Wed, 8 Sep 2021 21:34:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF76168A4FA for ; Wed, 8 Sep 2021 21:34:48 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id w17so2729530qta.9 for ; Wed, 08 Sep 2021 11:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9TaAV+jkVFbhQUy92e1mjGmZEELaqndqfodQDBotDaQ=; b=HIhcmdhURm5igas9OZ82iBPvEslpOkhBSI7qXX3bj8n49TPnfRETlquAv++vcEM5RJ yjDMUs8GUnYs9J1wvKQTtXT6uRIxfPLsf8hl97epxc6ERYFH+VljrI348cIUj3K3mFXy 6ONdj2u63vNhflct/JR3fnIr0nuLpDpz8SkIFZhnaQ1YeceyFvyNzOa+IuRljFWisEJ9 OOnb0U9eKkwuCr+sWAt3/7t5DHi44WDj0nBVyDGepsz/y2JLvBp+HQIcgEXGhczMU8at 8QKgaRbUsZZBbl/qsF5+bPAAT2e4++tKzKQqme2O+CMYJB9g/PZLWYKFxgE0/XvoHoE5 5acw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9TaAV+jkVFbhQUy92e1mjGmZEELaqndqfodQDBotDaQ=; b=lP4XpA1NPoR3EQr/q69vZcQone4mlVMXt7Rctisqoq0JlqSPzjc8hVZr2CQ5nENCWc QTUVjFcdF/TAsLY25kXcIFCdTx/bUiRz7F/HCvdZ+IPpjdeQoYOOi2Jzyp3C/xOPqhIV UoOeZ0mkv79RnDZFlFmgATXRfHZhRc/chj8AraWwcInD+nEF9sjmLr0QQBuJ6eQJxjmv 3f86B2L0SsCMQw79TybEJ+jAb0MmSGelNxuSoV48UkpsfdENajCQGnFx63GERdrDS7uk r5OjkPylgb644ND2MAlAoNUELZ4AclVxIc94ChhmnknLOOWixJk5zRE8ghNNydWfZmZl k37w== X-Gm-Message-State: AOAM531q4bZveMIzoEm3E8JMJwSF1KqGbRTIVHZdUP2WCqxxfxy5nzyr zfq6aPQ0c8syX/OHcQh7t+fixDf3mUE= X-Received: by 2002:ac8:1404:: with SMTP id k4mr5051253qtj.278.1631126086666; Wed, 08 Sep 2021 11:34:46 -0700 (PDT) Received: from localhost.localdomain ([181.23.66.70]) by smtp.gmail.com with ESMTPSA id c4sm2516108qkf.122.2021.09.08.11.34.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 11:34:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Sep 2021 15:34:26 -0300 Message-Id: <20210908183426.53347-4-jamrial@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908183426.53347-1-jamrial@gmail.com> References: <20210908183426.53347-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] ffmpeg: take into account image flipping in the display matrix 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0KVUmKo6d+t3 This covers only standard rotations. Finishes fixing ticket #6945. Signed-off-by: James Almer --- fftools/ffmpeg_filter.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index a4c2de07da..da0d4faf54 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -765,18 +765,36 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) { + 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", "clock"); } else if (fabs(theta - 180) < 1.0) { - ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); - if (ret < 0) - return ret; - ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); + if (displaymatrix[0] < 0) { + ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); + if (ret < 0) + return ret; + } + if (displaymatrix[4] < 0) { + ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); + } } else if (fabs(theta - 270) < 1.0) { + 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", "cclock"); } else if (fabs(theta) > 1.0) { char rotate_buf[64]; snprintf(rotate_buf, sizeof(rotate_buf), "%f*PI/180", theta); ret = insert_filter(&last_filter, &pad_idx, "rotate", rotate_buf); + } else if (fabs(theta) < 1.0) { + if (displaymatrix && displaymatrix[4] < 0) { + ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); + } } if (ret < 0) return ret;