From patchwork Wed May 15 05:36:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 13120 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 1B0294489DE for ; Wed, 15 May 2019 08:37:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E3AE16882FF; Wed, 15 May 2019 08:37:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C1A7680D4C for ; Wed, 15 May 2019 08:36:55 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id z28so762633pfk.0 for ; Tue, 14 May 2019 22:36:55 -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=a4Is1JTE+sJPwffrLMyEWQtuEn6STwmhI35q4xNgNSk=; b=TLzD8DvXH7y52wAOOODtwTWzJAj+ekEHhirjAI7M8xTNON3zVO8d3CN+Mk/xxOezP+ 6J4JPKvuHVDi7DRq/hvgeuFooRqWUB3b6v2qBuYK/njgHW64XGmmI7lIjnoG4X7NYkfS nWw7Qs7cKmpQ1qLIwKKYLoNTTnlylajU8NnDKPd3Fwljv9nuXSSDrd3Is3M5sYJ5TbsF SfYYRhOAvlz4qXKf9a8Phe5itUi5KtE4+9ltMRQUnXZSS7DssugKH3LzRDBw3zZK3A08 SBmgAoB689UQB/Tof1vLYj5q1ik/vlTUQWC9irEc/QqewExUOi7K1ZdWebrP4lKTnJOj rCdA== 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=a4Is1JTE+sJPwffrLMyEWQtuEn6STwmhI35q4xNgNSk=; b=fs3s/F8pGbgqLp8WiAj9mgz0mCraSJQNkMZbHsqhTOgM2FXvEfNk+wyUGgj3gWxUrj b8onxtzFoynMXRnLfDyqCOqLAz5L5ULsQ28oIEzeCepCiKKd5EUD1t7Tha0MlFliKrBp 6KnzyxHVungPCeRGwg+lmrRpVWUN3VcPaffOSHv4U4vY7tBSxFSHoAnqGlB2GvnbbyyA VOILALnYTkfKcGBeFkyfLgXNQIELqEBqegSS7MLOKf80o7KYODw5GAp7Y/rp5yH9d/87 8y76Xt19VW6G5ExRavKPzxNvOLIrOUbWLh0wfKzNLwUCwkTWE8l0gOZGAuQJ2K3hqHuI 0Sug== X-Gm-Message-State: APjAAAX2uo3/DX084XS8+dOzFRroL/0X8tz3JODczmi8n39C2jN1IrNu jjd1oKmZc3SKlzqqRgh3AAqzFQ2+1ZM= X-Google-Smtp-Source: APXvYqyoWC7osRtKnnq4GsP9gueoPuIdMpoCm+P0mMlgcChPs3JH7FnkacyQusVRoyi9BV9/drvUcw== X-Received: by 2002:a63:295:: with SMTP id 143mr42194551pgc.279.1557898613033; Tue, 14 May 2019 22:36:53 -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 j12sm1009282pff.148.2019.05.14.22.36.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 May 2019 22:36:52 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2019 22:36:44 -0700 Message-Id: <20190515053645.21432-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/2] lavu/display: add av_display_rotation_hflip_get 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_hflip_get to get information whether the matrix indicates horizontal flip. --- doc/APIchanges | 3 +++ libavutil/display.c | 14 ++++++++++++++ libavutil/display.h | 14 ++++++++++++++ libavutil/tests/display.c | 8 ++++++++ libavutil/version.h | 2 +- tests/ref/fate/display | 4 ++++ 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index e75c4044ce..73c6809563 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2019-05-13 - XXXXXXXXXX - lavu 56.28.100 - display.h + Add av_display_rotation_hflip_get + 2019-04-20 - 3153a6502a - lavc 58.52.100 - avcodec.h Add AV_CODEC_FLAG_DROPCHANGED to allow avcodec_receive_frame to drop frames whose parameters differ from first decoded frame in stream. diff --git a/libavutil/display.c b/libavutil/display.c index a0076e067b..f5a6a4a08d 100644 --- a/libavutil/display.c +++ b/libavutil/display.c @@ -71,3 +71,17 @@ 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_hflip_get(const int32_t matrix[9], int *hflip) +{ + int32_t m[9]; + *hflip = 0; + memcpy(m, matrix, sizeof(m)); + + if (m[0] > 0 && m[4] < 0 || m[0] < 0 && m[4] > 0 || + m[1] > 0 && m[3] > 0 || m[1] < 0 && m[3] < 0) { + *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..c37d10c741 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_hflip_get(const int32_t matrix[9], int* hflip); + /** * @} * @} diff --git a/libavutil/tests/display.c b/libavutil/tests/display.c index 893ebb5543..65a0971e7b 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,12 @@ int main(void) print_matrix(matrix); printf("degrees: %f\n", av_display_rotation_get(matrix)); + // flip vertical + av_display_matrix_flip(matrix, 0, 1); + print_matrix(matrix); + degree = av_display_rotation_hflip_get(matrix, &hflip); + printf("degrees: %f, hflip: %i\n", degree, hflip); + return 0; } diff --git a/libavutil/version.h b/libavutil/version.h index 12b4f9fc3a..91ab71604b 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 27 +#define LIBAVUTIL_VERSION_MINOR 28 #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..14b4c7db7c 100644 --- a/tests/ref/fate/display +++ b/tests/ref/fate/display @@ -14,3 +14,7 @@ degrees: 135.000000 -46340 -46340 0 0 0 1073741824 degrees: -135.000000 +-46340 -46340 0 +-46340 46340 0 +0 0 1073741824 +degrees: 45.000000, hflip: 1