From patchwork Thu Mar 9 09:49:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyaqiang <1035567130@qq.com> X-Patchwork-Id: 40620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp197474pzb; Thu, 9 Mar 2023 01:50:15 -0800 (PST) X-Google-Smtp-Source: AK7set8LGrRJhzMaW/xavuBB1SZ8Ea3lgT2cjLUOwrfvL/+skkQ7gKyKsKINBypVMLTL7hxy2Y2Q X-Received: by 2002:a05:6402:1291:b0:4ad:66b:84a5 with SMTP id w17-20020a056402129100b004ad066b84a5mr19638152edv.22.1678355415632; Thu, 09 Mar 2023 01:50:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678355415; cv=none; d=google.com; s=arc-20160816; b=lEDTg+e2OmQm8QZYOg0hWTdwaUvNnsmkB4E8N6d0P1tVuwPpWp7Lxhwy1Kg7AeW023 e0NR8wl0JGAl+DUx2m0JvGnAAek5mpNsjHhwaAWXtTphWXSYlyqZrldjfzKju/XlUqdz NtVrKQm87B/jVbonXhfwxBjskf8fgjEPKldOqO8M4eKV8bkUqAE9YnxS11O/fB334NRT C1tw3cJGr8qWWOav9drnB13aExZfa3R5/G0XZnatJyTx75NDeGU4QDuiIZf0TBrC97C5 XzE1X/F7AZvKD/jqG15xy0rwlEB4sBTCGPPxTOxbWKQsGi0cEF+pvbP3NBziYTx3xu/N o9fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=IHNCpPL+ltRp34hOZvN/kMA3Ll1mai4yZAZs1shYXp0=; b=zaiLkOq0HVjGTwzwaH+TyDOa0URpWFeDyPjCLzmuu0cFSnTT2qMx5kUVSATnYtVsy6 QzTQCGfAxqA60hkHaoOwqOs92t83FLkCG2tDTooVpJA9RZrtTxFUbBSRBpBR783rHUCh 6jDY9KoFUWGharcxBA3ht/choxYORUrH3s8wr1Uh+3VHeNnaGGoBz9ktUQ0W74nLDOuv im0Lxh/2KxgzNnD9DszFCBPiOZb39YOJEKmTAbAgCjohcOii8AVW3YpQ7TKHvuUuYsEM msA7pbn3zkAOmCzfQmLrneEpfaY7kii/nPK1uwrRfH/Pi3KO6byObBpoYANIuAk0ELgP xS2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@qq.com header.s=s201512 header.b=KgeecAcX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qq.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w6-20020a50fa86000000b004c2822f85cfsi5223452edr.506.2023.03.09.01.50.13; Thu, 09 Mar 2023 01:50:15 -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=@qq.com header.s=s201512 header.b=KgeecAcX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qq.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A86768BCD5; Thu, 9 Mar 2023 11:50:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD26268ADCB for ; Thu, 9 Mar 2023 11:50:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1678355395; bh=P3mDyC9qBi8B98VkdtK1grMIvC8u9ZFfkai8LzNLV7s=; h=From:To:Cc:Subject:Date; b=KgeecAcXoMumFGur5u5joVRdgUqJ+A7wTTgTBhht1A6oox/Ek/ztg+2/+3miB+uzd oshnw4Xb/VAos/VKJCHB9i1Y5ioY0wsG/SX6CnU6NkGox3k81Za4XnIMpB2Z/A1Msv THutadFKG1JwG7ZI7mb4l3qMr/WkXmVHIGyUzp4o= Received: from localhost.localdomain ([103.107.216.225]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id C751DEA6; Thu, 09 Mar 2023 17:49:53 +0800 X-QQ-mid: xmsmtpt1678355393td0uq5pqp Message-ID: X-QQ-XMAILINFO: N4r4IakIsd1k9OPJH8zkljAUbJOQIWkPh74FXsx+wzDQdCNL/hIt/CVUqGE5ss Nw4WP05W5Kr+ZIYydoNjSHKzkKpnEkGTwKHOwNLrBHNGOq1SX4l/2SROsdAdR8nJsP9YMMwPI8nd K+o+opZkKD3/VASARQqmPsB5a7tWBB6uWOlVGGrom6yyVl6WWeEeC5DgQ4XuGF4OoBQLi0PmQ4hd x/vR9fx55TsiRUFlMTKcEk3eCNZg/KyEy9vUqgugVaJxJzxQIb4A7HD+yMtURj3k+fH6IL1qJ8LM Cs8XwR5kHtR2Mfx4bIm84GcFNpK3oPCQ0pxvbtr5QhFPuRFWL3lwkU8hOkwevhwCkR9OQ3cnyVVf LAUePvD6Noka2Uj7s5vWF94kbNp2VzfrRzf+u1pECRX/upRxRNelbZVYW8FK5QAKN4ne2N7R3mt1 iibmOHlvuvUsxH7IwbMTh2FH+ypmaU3tAeNNVEE993UbfGvvr1y2XF6pkGjAwqvd9BCHNvLpeg2l JRQYCyc8QyjjqmrYfF+PcXH1Pb9s+ebLAN6ZqN99Da7olRoH1l/hC6VzXPlBPE5KhhFt2B7zGuNO gO+8lmcAbcMXoN1jD6YqiSkx4jNfkN8sv/rpvaSs7jCCOsUYPB64rgsLaF0het6MYkVGyMyrwZR1 vsg2NGcE4BSalejaVbbpXLJ4qfoduDIB9aMArj/CGGxxhbmA9Uo8nmHsyJ7IOUs+7yb29WO8S62x dDGsavdl03lGPTBTd8/2kRnyz5uqfomkFNXlG/wWS4erT7b42NWoK8EF+RJ7qklivoJlaTciAmpD LhjevBki2ATRLjQUGqOn84nsnbSTRfQR/ocgWULsKztHmQuR6AK892fKvzdPwdXSEnYU1wIF3SDx U+vO6ro5DkxHDQtE4ZWr6bJoBD1816rGEQJCB/z8QhVGi5Q1x4zr8MOqfo2tUeR8aZeLwi5ZMCXN Cqlq2pK0o7VW8r6Sx2tKvv+058OHHu From: 1035567130@qq.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Mar 2023 17:49:50 +0800 X-OQ-MSGID: <20230309094950.51906-1-1035567130@qq.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffplay.c: fix rotate error when displaymatrix contains flip 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: Wang Yaqiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mf7iPQxn2qam From: Wang Yaqiang The angle is calculated by the get_rotation function, but it needs to be combined with the displaymatrix to determine whether flip or rotate, which is consistent with the processing logic in ffmpeg_filter.c Signed-off-by: Wang Yaqiang --- fftools/ffplay.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index d6479aef5f..860bac367a 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1925,16 +1925,24 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) { - INSERT_FILT("transpose", "clock"); + INSERT_FILT("transpose", displaymatrix[3] > 0 ? "cclock_flip" : "clock"); } else if (fabs(theta - 180) < 1.0) { - INSERT_FILT("hflip", NULL); - INSERT_FILT("vflip", NULL); + if (displaymatrix[0] < 0) { + INSERT_FILT("hflip", NULL); + } + if (displaymatrix[4] < 0) { + INSERT_FILT("vflip", NULL); + } } else if (fabs(theta - 270) < 1.0) { - INSERT_FILT("transpose", "cclock"); + INSERT_FILT("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); INSERT_FILT("rotate", rotate_buf); + } else if (fabs(theta) < 1.0) { + if (displaymatrix && displaymatrix[4] < 0) { + INSERT_FILT("vflip", NULL); + } } }