From patchwork Fri Jun 7 03:28:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 13446 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 5A5FE4489B8 for ; Fri, 7 Jun 2019 06:28:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F03F68A924; Fri, 7 Jun 2019 06:28:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A27A689A72 for ; Fri, 7 Jun 2019 06:28:26 +0300 (EEST) Received: by mail-pl1-f173.google.com with SMTP id a93so257426pla.7 for ; Thu, 06 Jun 2019 20:28:25 -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=fmkMO4u9Hl1NomDrIG6/v98Gk6pVWsReL3NoIu3N34s=; b=Noon+Mbr5aJamxkuZn2sSJ3dPJ8xeRWiC64sjY6sXwDxAJcCtr1TD0mHGf23K1NXDh FKw6twpltllgC5yE5uUaz17xpyRnu7U9xLYAiJccVgWfsXev18NjQ8mdtMWBA0IJN7Kx cdLUt/sCbdrSwFEtJMZICnH+NXmhebMm+2DgvqYgpkAUWo6y0S19pk/OQwaziP8JucRg qOHZ8rD885SDJB8CE/IGKD/8U/yVKgEq8LtHZOc1oi28ZiQzzZtpUJ58bdmvuTnwSADx p91yZudThVf0Q+b3VV+uSjFxz2EM3mFbcP+L8YR5aEmVL5sViPah8StTVMk7zC1l1tCa YS3A== 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=fmkMO4u9Hl1NomDrIG6/v98Gk6pVWsReL3NoIu3N34s=; b=liTwMm21FKRMS7g+/3K37rtpuHqRNuYpYBTrdxyJ0rcbByNTHfuqc87L/exhfRCkw6 OLKrXk3lKUBjwGPW9O46v3M+9D3DgbWAlvKU8dhCUrYow6LXMYnqQe9RwmAeTsoecKmu 1IF7cNpwW0RwcyIeczR6VEIP+p97kM1Lfy00Bvk+ybV0ab7tY0+FetSn9BXKkQLJMxAj icQJL4P3UZsuM//6YOU7wTZSMunzUOD2RZ3PziZRESx1qIrl0iOVDdcxgNj85aEDHou/ OQV9u6zAph4vQ2L+X/i3DW+cif5dCqiQjJ65xXsradwBzi/WZ3rTlpWZrqvqdJ5KGlMm i03A== X-Gm-Message-State: APjAAAWEbmu0n/9C1+3uDbOJ9PqdqRuw501d8c9AtUPAsIuhlyj8bee9 iWwPauP+bGkgTZzk4DL2p9/kIUiM X-Google-Smtp-Source: APXvYqzox9KBpjQji7rsis8IZLv/qVbU9PfZu3YIhIqT5SCs25bmTDSyTGYYCKanYREyvd8UoUBkcQ== X-Received: by 2002:a17:902:8d91:: with SMTP id v17mr34750296plo.91.1559878103759; Thu, 06 Jun 2019 20:28:23 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:0:34c2:264f:fee2:a327]) by smtp.googlemail.com with ESMTPSA id 2sm545293pff.174.2019.06.06.20.28.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jun 2019 20:28:23 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jun 2019 20:28:15 -0700 Message-Id: <20190607032815.32465-2-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190607032815.32465-1-junli1026@gmail.com> References: <20190607032815.32465-1-junli1026@gmail.com> Subject: [FFmpeg-devel] [PATCH v8 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 | 5 +++-- fftools/ffmpeg.h | 8 ++++++++ fftools/ffmpeg_filter.c | 36 +++++++++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f04103cf..bc0cece59d 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2141,8 +2141,9 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) ifilter->channel_layout != frame->channel_layout; break; case AVMEDIA_TYPE_VIDEO: - need_reinit |= ifilter->width != frame->width || - ifilter->height != frame->height; + need_reinit |= ifilter->width != frame->width || + ifilter->height != frame->height || + ifilter->orientation != get_frame_orientation(frame); break; } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7b6f802082..7324813ce3 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -232,6 +232,12 @@ typedef struct OptionsContext { int nb_enc_time_bases; } OptionsContext; +enum OrientationType { + ORIENTATION_NONE, + ORIENTATION_AUTO_FLIP, + ORIENTATION_AUTO_TRANSPOSE +}; + typedef struct InputFilter { AVFilterContext *filter; struct InputStream *ist; @@ -245,6 +251,7 @@ typedef struct InputFilter { int format; int width, height; + enum OrientationType orientation; AVRational sample_aspect_ratio; int sample_rate; @@ -649,6 +656,7 @@ int init_complex_filtergraph(FilterGraph *fg); void sub2video_update(InputStream *ist, AVSubtitle *sub); int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame); +enum OrientationType 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..790751f47f 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -743,6 +743,28 @@ static int sub2video_prepare(InputStream *ist, InputFilter *ifilter) return 0; } +enum OrientationType 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); + + if (orientation > 8 || orientation < 0) { + av_log(NULL, AV_LOG_WARNING, "Invalid frame orientation: %i, skip it.\n", orientation); + return ORIENTATION_NONE; + } else if (orientation <= 1) { + return ORIENTATION_NONE; + } else if (orientation <= 4) { + return ORIENTATION_AUTO_FLIP; + } else { + return ORIENTATION_AUTO_TRANSPOSE; + } +} + static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { @@ -809,13 +831,16 @@ 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 == ORIENTATION_AUTO_FLIP) { + ret = insert_filter(&last_filter, &pad_idx, "transpose", "orientation=auto_flip"); + } else if (ifilter->orientation == ORIENTATION_AUTO_TRANSPOSE) { + 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 +1216,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;