From patchwork Tue May 7 05:36:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 13024 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 C4F65448606 for ; Tue, 7 May 2019 08:36:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A9B5C68AB59; Tue, 7 May 2019 08:36:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0183E68AAAB for ; Tue, 7 May 2019 08:36:51 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id e24so8013074pfi.12 for ; Mon, 06 May 2019 22:36:51 -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=vi8C6KUPY5yIXq1cqBqkHnjPfGoBeaaqfzLiKmYYeRc=; b=FYvdHEfZYNYMu5rYFDnncCS127X1Ay471tpPJITs4bA0SgdnNCiA5SGDKu5w4nD8nS DRAA5OFVzA/4AeBQDA5ReGyH0N4hwij1TSB6sBbMS7K05hGPCQo9lVNiyCWHzVhN/fzS yup18DioNnNTROXO3K08z7pIYGaZY6GDjEWZs0dEe/lKAdiAh2M1NzxvAbwxSAKW3oKl 4TqN6l2RgGEqWxQ7q/rpJLIvP8uE0cbl9PZoLb6RIPuCFWSGvlrXFq+RmSEEZBRzHvJV LYDr6XOznjo4TSDeQO+D6l0Va5UoGF6KkKy7lmtma1zszeXE8+9UkE5+QNfBOwuK9Q3H pblA== 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=vi8C6KUPY5yIXq1cqBqkHnjPfGoBeaaqfzLiKmYYeRc=; b=CaRSDKldFDA91qEsDNYBZ9ET9EQ9xNw20PAgrLS+nC9C86/dnOGdmYZQAGMkfVts8S CE1fjQbeOujisLZei6BLp+gj7aenBDlrrvUQeKSnPbQfADo4ZzU6t8mG8JNzqi/E8eos CKtd9hs4EL2j880A11tTo0c16XxwdGxXZOUpMHXDXlmPqmGFSRn0otVSP0uMMGC55IEA B6LTjzgMBAB1umnxIxJefZgeE8/bDfeq+dzmrfjK/+WcMM1lBqOcPSUzlt5W9axqruXo 5NwJnxRmL3W0wZqvE9mbBUU0aIYtr5HiOMT/KdSx6jrliV9EoR3khXlg/SPG44+Hvld1 Qx8g== X-Gm-Message-State: APjAAAU9qGpil1MwWx8s7sbk4NDKgsn2FR3zN6N7ORE3YTYjXE40Do6A /Fy6NxIIL+O2zBJwNf1ITLWsgcXH X-Google-Smtp-Source: APXvYqzD+Zlrc2j0mdJoAm/ZIINeuYDKceT5bEg/BNcvLJNzzyZXOnmUsCVYzs17vFjI2U2QvOSL3Q== X-Received: by 2002:a65:48ca:: with SMTP id o10mr37714336pgs.136.1557207409397; Mon, 06 May 2019 22:36:49 -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 u7sm15919572pfu.157.2019.05.06.22.36.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 May 2019 22:36:48 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2019 22:36:41 -0700 Message-Id: <20190507053642.8489-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v3 1/2] fftools/ffmpeg_filter, ffplay: Add flip support to rotation 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" Current implemantion for autoratation does not support flip. That is, if the matrix contains flip info, the API get_rotation only reflects partial information. This change is for adding support for hflip (vflip can be achieved by rotation+hflip). --- fftools/cmdutils.c | 4 ++-- fftools/cmdutils.h | 2 +- fftools/ffmpeg_filter.c | 31 ++++++++++++++++++++++++++----- fftools/ffplay.c | 22 ++++++++++++++++++---- libavutil/display.c | 12 ++++++++++++ libavutil/display.h | 14 ++++++++++++++ libavutil/tests/display.c | 8 ++++++++ tests/ref/fate/display | 4 ++++ 8 files changed, 85 insertions(+), 12 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 9cfbc45c2b..1235a3dd7b 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2172,13 +2172,13 @@ void *grow_array(void *array, int elem_size, int *size, int new_size) return array; } -double get_rotation(AVStream *st) +double get_rotation_hflip(AVStream *st, int* hflip) { uint8_t* displaymatrix = av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, NULL); double theta = 0; if (displaymatrix) - theta = -av_display_rotation_get((int32_t*) displaymatrix); + theta = -av_display_rotation_hflip_get((int32_t*) displaymatrix, hflip); theta -= 360*floor(theta/360 + 0.9/360); diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 6e2e0a2acb..0349d1bea7 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -643,6 +643,6 @@ void *grow_array(void *array, int elem_size, int *size, int new_size); char name[128];\ av_get_channel_layout_string(name, sizeof(name), 0, ch_layout); -double get_rotation(AVStream *st); +double get_rotation_hflip(AVStream *st, int* hflip); #endif /* FFTOOLS_CMDUTILS_H */ diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 72838de1e2..b000958015 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -807,22 +807,43 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, last_filter = ifilter->filter; if (ist->autorotate) { - double theta = get_rotation(ist->st); + int hflip = 0; + double theta = get_rotation_hflip(ist->st, &hflip); - if (fabs(theta - 90) < 1.0) { + if (fabs(theta) < 1.0) { + if (hflip) + ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); + } else if (fabs(theta - 90) < 1.0) { 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 (hflip) + ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); + } else if (fabs(theta - 180) < 1.0) { + if (hflip) { // rotate 180 and hflip equals vflip + ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); + } else { + ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); + if (ret < 0) + return ret; + ret = insert_filter(&last_filter, &pad_idx, "vflip", NULL); + } } else if (fabs(theta - 270) < 1.0) { ret = insert_filter(&last_filter, &pad_idx, "transpose", "cclock"); + if (ret < 0) + return ret; + if (hflip) + ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); } 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); + if (ret < 0) + return ret; + if (hflip) + ret = insert_filter(&last_filter, &pad_idx, "hflip", NULL); } + if (ret < 0) return ret; } diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 8f050e16e6..2c77612193 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1914,19 +1914,33 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c } while (0) if (autorotate) { - double theta = get_rotation(is->video_st); + int hflip; + double theta = get_rotation_hflip(is->video_st, &hflip); - if (fabs(theta - 90) < 1.0) { + if (fabs(theta) < 1.0) { + if (hflip) + INSERT_FILT("hflip", NULL); + } else if (fabs(theta - 90) < 1.0) { INSERT_FILT("transpose", "clock"); + if (hflip) + INSERT_FILT("hflip", NULL); } else if (fabs(theta - 180) < 1.0) { - INSERT_FILT("hflip", NULL); - INSERT_FILT("vflip", NULL); + if (hflip) { // rotate 180 and hflip equals vflip + INSERT_FILT("vflip", NULL); + } else { + INSERT_FILT("hflip", NULL); + INSERT_FILT("vflip", NULL); + } } else if (fabs(theta - 270) < 1.0) { INSERT_FILT("transpose", "cclock"); + if (hflip) + INSERT_FILT("hflip", NULL); } 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); + if (hflip) + INSERT_FILT("hflip", NULL); } } diff --git a/libavutil/display.c b/libavutil/display.c index a0076e067b..37c4b9be5d 100644 --- a/libavutil/display.c +++ b/libavutil/display.c @@ -71,3 +71,15 @@ 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(int32_t) * 9); + if (m[0] != m[4] || m[1] != -m[3]) { + *hflip = 1; + av_display_matrix_flip(m, 1, 0); + } + return av_display_rotation_get(m); +} \ No newline at end of file diff --git a/libavutil/display.h b/libavutil/display.h index 515adad795..23d71a0bc5 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 wille be set to 1 if the matrix need horizontal flipped + * @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/tests/ref/fate/display b/tests/ref/fate/display index 251e7e0cdf..841a7235b8 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 \ No newline at end of file