From patchwork Fri May 17 06:52:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 13181 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B441B448EC7 for ; Fri, 17 May 2019 09:52:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D48268A407; Fri, 17 May 2019 09:52:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1723B6805B9 for ; Fri, 17 May 2019 09:52:25 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id 145so2824518pgg.9 for ; Thu, 16 May 2019 23:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=B3C01uX59gGrcX9xJM+qrT3WJt/wwTdg4mFhaFdcks4=; b=JZpfsZCz667da7ym7LAL7dzNPXNk8sJza66rP6iURa1wqFYFxH+77BNjH6tKsKOf8a XBOGGv6Y82o0G8pQ+to3DW25mREQ8Oi9RdVHjz3NrcR3BwpNjRV77jzfQ6h7fHf5ldGA 5CQKhlFjwOyD/FL00q3Dsb2+5hEs8iCPxNi7ZYlT3WtxUhXBCrtFKswjOAKApO5cnxnH Jj6G+vpT7SyM6MO15BMeS2AHwbj2nhw3hkKx+ribAKZEHciLcqyOgqxsYYogb8uFOCiX 8wzu4Ydt584HZ5YpxC0wTpSz77vfUnIjVA3+sDaodMq7aN1EoPAIHBsXM4X7c21bqznR 0CRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=B3C01uX59gGrcX9xJM+qrT3WJt/wwTdg4mFhaFdcks4=; b=c+l8S26Y2eHWRDOmEoDdEJfi7Smsm1xJG158zGHys5/NKKZ3CjADwSCg/BFPA+XJPs C3FAT6uhIubTjejzMc5HRGmgsuD9ZnofJDvZ+eOuyNJFC93hVPuBXOl2FLaAXe2EGYlx TrCht5RlxoKu+fdlCx5/EjlIVeuftHuC4qvuahKLefOEdv1kr8Yb/A/OCnWP92Ei7LfS XUD+pQs1nx92Rwmf1fdVduqzIWOPCnqnqHOGj7TN6YTnk/6Lim3RzlsOfC7t4RoMXO4D fV+k060ecd0JF5AmXVYXMC1IMJYFcdHgHjDzONgDpCneIoBW8lcgjLhbJNvopu7+Ac9o uRGA== X-Gm-Message-State: APjAAAXo6dLAHkCYTsBKzqP7pgl8GSyXfD+7iNhEsEw0xGDmN8AQw6a8 wl9PVhC5bP3RzfumMKSFne0AjlzbyTs= X-Google-Smtp-Source: APXvYqx9p5vln1VWPWC9RYtDymzyx3u8ZJ0DZpzQF3rtdTTQfBmD2Fe8nhMLStI5i8oyNAugeqhZsg== X-Received: by 2002:a63:e406:: with SMTP id a6mr55917223pgi.132.1558075942670; Thu, 16 May 2019 23:52:22 -0700 (PDT) Received: from super.lan (c-73-193-9-32.hsd1.wa.comcast.net. [73.193.9.32]) by smtp.gmail.com with ESMTPSA id s9sm11964379pfa.31.2019.05.16.23.52.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 23:52:21 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 May 2019 23:52:14 -0700 Message-Id: <20190517065214.30142-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v4] lavu/display: add av_display_rotation_get2 and bump version X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Add av_display_rotation_get2 to get information whether the matrix indicates horizontal flip. --- doc/APIchanges | 3 +++ libavutil/display.c | 13 +++++++++++++ libavutil/display.h | 14 ++++++++++++++ libavutil/tests/display.c | 26 ++++++++++++++++++++++++++ libavutil/version.h | 2 +- tests/ref/fate/display | 16 ++++++++++++++++ 6 files changed, 73 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index cf426e2e3b..e34dc287f3 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2019-05-16 - XXXXXXXXXX - lavu 56.29.100 - display.h + Add av_display_rotation_get2 + 2019-05-15 - b79b29ddb1 - lavu 56.28.100 - tx.h Add av_tx_init(), av_tx_uninit() and related definitions. diff --git a/libavutil/display.c b/libavutil/display.c index a0076e067b..c911107e1a 100644 --- a/libavutil/display.c +++ b/libavutil/display.c @@ -71,3 +71,16 @@ void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip) for (i = 0; i < 9; i++) matrix[i] *= flip[i % 3]; } + +double av_display_rotation_get2(const int32_t matrix[9], int *hflip) +{ + int32_t m[9]; + *hflip = 0; + memcpy(m, matrix, sizeof(m)); + + if ((int64_t)m[0] * m[4] < (int64_t)m[1] * m[3]) { + *hflip = 1; + av_display_matrix_flip(m, 1, 0); + } + return av_display_rotation_get(m); +} diff --git a/libavutil/display.h b/libavutil/display.h index 515adad795..ecf1601c6d 100644 --- a/libavutil/display.h +++ b/libavutil/display.h @@ -106,6 +106,20 @@ void av_display_rotation_set(int32_t matrix[9], double angle); */ void av_display_matrix_flip(int32_t matrix[9], int hflip, int vflip); +/** + * Extract the rotation component and hflip status of the transformation matrix. + * + * @param matrix the transformation matrix + * @param hflip will be set to 1 if the matrix indicates horizontal flip + * @return the angle (in degrees) by which the transformation rotates the frame + * counterclockwise. The angle will be in range [-180.0, 180.0], + * or NaN if the matrix is singular. + * + * @note floating point numbers are inherently inexact, so callers are + * recommended to round the return value to nearest integer before use. + */ +double av_display_rotation_get2(const int32_t matrix[9], int* hflip); + /** * @} * @} diff --git a/libavutil/tests/display.c b/libavutil/tests/display.c index 893ebb5543..d68b22871e 100644 --- a/libavutil/tests/display.c +++ b/libavutil/tests/display.c @@ -35,6 +35,8 @@ static void print_matrix(int32_t matrix[9]) int main(void) { int32_t matrix[9]; + int hflip = 0; + double degree; // Set the matrix to 90 degrees av_display_rotation_set(matrix, 90); @@ -56,6 +58,30 @@ int main(void) print_matrix(matrix); printf("degrees: %f\n", av_display_rotation_get(matrix)); + // Set the matrix to 90 degrees + av_display_rotation_set(matrix, 90); + print_matrix(matrix); + degree = av_display_rotation_get2(matrix, &hflip); + printf("degrees: %f, hflip: %i\n", degree, hflip); + + // Set the matrix to -45 degrees + av_display_rotation_set(matrix, -45); + print_matrix(matrix); + degree = av_display_rotation_get2(matrix, &hflip); + printf("degrees: %f, hflip: %i\n", degree, hflip); + + // flip horizontal + av_display_matrix_flip(matrix, 1, 0); + print_matrix(matrix); + degree = av_display_rotation_get2(matrix, &hflip); + printf("degrees: %f, hflip: %i\n", degree, hflip); + + // flip vertical + av_display_matrix_flip(matrix, 0, 1); + print_matrix(matrix); + degree = av_display_rotation_get2(matrix, &hflip); + printf("degrees: %f, hflip: %i\n", degree, hflip); + return 0; } diff --git a/libavutil/version.h b/libavutil/version.h index 91ab71604b..dccbb38585 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 28 +#define LIBAVUTIL_VERSION_MINOR 29 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/tests/ref/fate/display b/tests/ref/fate/display index 251e7e0cdf..c91b19ef07 100644 --- a/tests/ref/fate/display +++ b/tests/ref/fate/display @@ -14,3 +14,19 @@ degrees: 135.000000 -46340 -46340 0 0 0 1073741824 degrees: -135.000000 +0 65536 0 +-65536 0 0 +0 0 1073741824 +degrees: -90.000000, hflip: 0 +46340 -46340 0 +46340 46340 0 +0 0 1073741824 +degrees: 45.000000, hflip: 0 +-46340 -46340 0 +-46340 46340 0 +0 0 1073741824 +degrees: 45.000000, hflip: 1 +-46340 46340 0 +-46340 -46340 0 +0 0 1073741824 +degrees: -135.000000, hflip: 0