From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 276BF4560B for ; Thu, 9 Mar 2023 20:28:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0610D68BA00; Thu, 9 Mar 2023 22:27:59 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7780B68A084 for ; Thu, 9 Mar 2023 22:27:52 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 66B6DE6538 for ; Thu, 9 Mar 2023 21:27:54 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Y4xG58fWFq4 for ; Thu, 9 Mar 2023 21:27:52 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 936FAE57AF for ; Thu, 9 Mar 2023 21:27:52 +0100 (CET) Date: Thu, 9 Mar 2023 21:27:52 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <283ca88c-4db1-3fdf-864c-9fd99577b7b5@passwd.hu> References: MIME-Version: 1.0 Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 9 Mar 2023, 1035567130@qq.com wrote: > 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 If there is common logic, then it should be factorized to a shared function and both ffmpeg and ffplay should use that. Regards, Marton > > 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); > + } > } > } > > -- > 2.39.2 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".