From patchwork Wed Jun 5 01:12:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 13414 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 EF2BF447DA8 for ; Wed, 5 Jun 2019 04:41:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D519E689DC4; Wed, 5 Jun 2019 04:41:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6787689DC4 for ; Wed, 5 Jun 2019 04:41:08 +0300 (EEST) Received: by mail-pg1-f182.google.com with SMTP id h17so11460880pgv.0 for ; Tue, 04 Jun 2019 18:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=n+vsLwVRPAHalmk+FyACPHxtzZVt6VNIa272z2Xkknc=; b=t3naizUXVjtVorROwaGWGM65paxE2oF6513deERtOitCYUJDcaUjb1HDZcTFq+FQ3m 1bNNAGa8mtzn7/Q7+/vIA8CGC6jVK+SBQCNwxx/dj5MuH7b7EoFUqW3SKLLiUNpmlz9b sLtx40Dsz902RAzF8gfceRouMLAkQi53dhRph8e9umfcy/bt6eY3QatRqTlVNvoRBL+h 4AazgDyZnwmDcWHn684/5iRCJAERCX/v61DeSKS5tmr649cN75PgEoPUdGVUIn7xon0W UTcYcAvysVOtLj4r4xAytFhgclJKA1E2IU1g25hHRM1TNWnKir8wgUQSaAjvmGK8s0Ue Umkg== 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:in-reply-to :references; bh=n+vsLwVRPAHalmk+FyACPHxtzZVt6VNIa272z2Xkknc=; b=C9TzB7YVI3/7Ju94pMD2pcauyTX9GEqrYZU70aqX/she2qgJ74YqS9fFzTLIZ0TOBp zn2x2roTNgTOaagkqksN+xTxNQJ7pRH0OgTWJFwzCfYNI/SScPW2VyNxi2DNspIRSs7I SnvbJCUZKavZbO6zAk2AJPKApDJtM7PLU0hRcyF3vMwTqXIwtz9Nh4T9cRCazVTtaY6p 8aXXkcORQSQ5SVMtxcr4v+Iuc4Q3oDVKLpzxBasjN/vzWSC4Ghe6K92ks/Hff9DR5oQH jmhXm7LxYbyzj+Bqn/n7eACs5C6gvjW+KYI/FwXv6BYStIj7FFnd1sKV0VibDnGyImrD JB1g== X-Gm-Message-State: APjAAAVj6nE/EuD7XvoM2SypuVE5zbRtsjqRquoQSGr5EgqfkA9Zhoya SqrC484r3jNTwI9Oa3yBmZ6HSuJw X-Google-Smtp-Source: APXvYqzIOBhvHYB7iSpDeLxVtKsl4Dfvqtx2O8+Pe4meKc0ecizrl6gdKe3gx4WFX1JC81xLnBS9Tw== X-Received: by 2002:a63:5158:: with SMTP id r24mr717186pgl.79.1559697159797; Tue, 04 Jun 2019 18:12:39 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:8:57f7:d553:bf38:5d45]) by smtp.googlemail.com with ESMTPSA id n127sm16232071pga.57.2019.06.04.18.12.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 18:12:39 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2019 18:12:28 -0700 Message-Id: <20190605011228.6065-2-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190605011228.6065-1-junli1026@gmail.com> References: <20190605011228.6065-1-junli1026@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 2/2] fftools/ffmpeg: add exif orientation support per frame's metadata 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" Fix #6945 Rotate or/and flip frame according to frame's metadata orientation --- fftools/ffmpeg.c | 16 +++++++++++++++- fftools/ffmpeg.h | 3 ++- fftools/ffmpeg_filter.c | 28 +++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f04103cf..2f4229a9d0 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2126,6 +2126,19 @@ static int ifilter_has_all_input_formats(FilterGraph *fg) return 1; } +static int orientation_need_update(InputFilter *ifilter, AVFrame *frame) +{ + int orientaion = get_frame_orientation(frame); + int filterst = ifilter->orientation <= 1 ? 0 : // not set + ifilter->orientation <= 4 ? 1 : // auto flip + 2; // auto transpose + int framest = orientaion <= 1 ? 0 : // not set + orientaion <= 4 ? 1 : // auto flip + 2; // auto transpose + + return filterst != framest; +} + static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) { FilterGraph *fg = ifilter->graph; @@ -2142,7 +2155,8 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) break; case AVMEDIA_TYPE_VIDEO: need_reinit |= ifilter->width != frame->width || - ifilter->height != frame->height; + ifilter->height != frame->height || + orientation_need_update(ifilter, frame); break; } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7b6f802082..64278b6ab1 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -244,7 +244,7 @@ typedef struct InputFilter { // parameters configured for this input int format; - int width, height; + int width, height, orientation; AVRational sample_aspect_ratio; int sample_rate; @@ -649,6 +649,7 @@ int init_complex_filtergraph(FilterGraph *fg); void sub2video_update(InputStream *ist, AVSubtitle *sub); int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame); +int get_frame_orientation(const AVFrame* frame); int ffmpeg_parse_options(int argc, char **argv); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 72838de1e2..1fcadb1871 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -743,6 +743,18 @@ static int sub2video_prepare(InputStream *ist, InputFilter *ifilter) return 0; } +int get_frame_orientation(const AVFrame *frame) +{ + AVDictionaryEntry *entry = NULL; + int orientation = 0; + + // read exif orientation data + entry = av_dict_get(frame->metadata, "Orientation", NULL, 0); + if (entry && entry->value) + orientation = atoi(entry->value); + return orientation; +} + static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { @@ -809,13 +821,18 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, if (ist->autorotate) { double theta = get_rotation(ist->st); - if (fabs(theta - 90) < 1.0) { + if (fabs(theta) < 1.0) { // no rotation info in stream meta + if (ifilter->orientation < 0 || ifilter->orientation > 8) { + av_log(NULL, AV_LOG_ERROR, "Invalid frame orientation: %i\n", ifilter->orientation); + } else if (ifilter->orientation > 1 && ifilter->orientation <= 4) { // skip 0 (not set) and 1 (orientaion 'Normal') + ret = insert_filter(&last_filter, &pad_idx, "transpose", "orientation=auto_flip"); + } else if (ifilter->orientation > 4) { + ret = insert_filter(&last_filter, &pad_idx, "transpose", "orientation=auto_transpose"); + } + } 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); + ret = insert_filter(&last_filter, &pad_idx, "transpose", "orientation=rotate180"); } else if (fabs(theta - 270) < 1.0) { ret = insert_filter(&last_filter, &pad_idx, "transpose", "cclock"); } else if (fabs(theta) > 1.0) { @@ -1191,6 +1208,7 @@ int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame) ifilter->width = frame->width; ifilter->height = frame->height; ifilter->sample_aspect_ratio = frame->sample_aspect_ratio; + ifilter->orientation = get_frame_orientation(frame); ifilter->sample_rate = frame->sample_rate; ifilter->channels = frame->channels;