From patchwork Thu May 9 06:05:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 13038 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 056E1449A52 for ; Thu, 9 May 2019 09:12:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2AD66809BD; Thu, 9 May 2019 09:12:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED5CD6809BD for ; Thu, 9 May 2019 09:12:34 +0300 (EEST) Received: by mail-pg1-f169.google.com with SMTP id e6so645622pgc.4 for ; Wed, 08 May 2019 23:12:34 -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=OTYaMFWtK9S6Du43mBvVWrSEPgqc3WmSfzSID7G+mIg=; b=gxyM00noXGS9GBEBap9Q8ICPCE8eZ7qEbzeL675NEwlu0k2pwrcZGHseFMNCIei5Gr wqcpC2C0mK3kOFjzBgiVjIgScgYtPJ2OSnnAXxnI0GjLAqzW3tVbibDQymZSCZdGshjS KN2vHq2U46ZG92U8OvlWIWzAjFdKb8ZgA14hqCs1yAoKx36+n8AHoSiF/i83E5BJBlgX y9NQ3Hi5gU1aoEUx3EnaR9hLQKw/gS3RTcu2mgOO1KDrOqpXkSQwyTM4PyK8ASdff6gp PwY8vspK5kq9+Sga9PUSUodTWoY/4slCYjW54c9HR6JEEAaSXQV7E4bg+NDMFexyfLqL t+MA== 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=OTYaMFWtK9S6Du43mBvVWrSEPgqc3WmSfzSID7G+mIg=; b=XcLzsJrU6l9imIM+vnYQNK4nIoJmx3YS+WnS/WOsEhr9rSjqTG8mhm4INeCXQ+nu48 /YLh9J4KMdI3EX+tD3Z3x1D0/9z/9VwJ4gg0LbncNUs81HETpCRHJVKjHK7ooxWl89Hu 2cvnAn2ZxcsZhkUt3r30W3hFxDcaHuLCoxqz+UWn3ppaOlNOw5ONXBGETaL6gmTCZmqj J9UowfT4GZCQJyMylWbcJaXuY1oAojwT4HUNxEd6NwFTOZCN4D6k6V5S8JiK1iA/rIsE kdZyXNPSaI9Q4/rieZZn9NgeeDmtOc+x4Mwd0ppcbOEgqrf9xpmbdmGLRfyHa6RYYGlQ 8UoA== X-Gm-Message-State: APjAAAWpdYXkp6EY/OJm0ldVykFttE8hdu4hjNuZ08jrEmOnWGnGHC0N IT9/9GhKxtaLiM4XCwOZWiaYORtL X-Google-Smtp-Source: APXvYqyPhcfhQyZCJu/XGtglbGyTpUja9eedtIKk3R5DpVuwumjieXpux3gIHGxqk8KKUhbYozo/qw== X-Received: by 2002:a63:6103:: with SMTP id v3mr3284059pgb.48.1557381935504; Wed, 08 May 2019 23:05:35 -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 h27sm1530359pfd.53.2019.05.08.23.05.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 23:05:34 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 May 2019 23:05:25 -0700 Message-Id: <20190509060525.22737-2-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190509060525.22737-1-junli1026@gmail.com> References: <20190509060525.22737-1-junli1026@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 2/2] fftools/ffmpeg: Add stream metadata from first 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 'Orientation' field from EXIF tags in first decoded frame is extracted as stream side data so that ffmpeg can apply auto-rotation. --- fftools/ffmpeg.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f04103cf..73f185a2d1 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2341,6 +2341,64 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output, return err < 0 ? err : ret; } +static int set_metadata_from_1stframe(InputStream* ist, AVFrame* frame) +{ + AVDictionaryEntry *entry = NULL; + int orientation = 0, size = 0; + int32_t* sd = NULL; + + sd = (int32_t*)av_stream_get_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, &size); + if (sd) // stream already contains display matrix + return 0; + + // read exif orientation data + entry = av_dict_get(frame->metadata, "Orientation", NULL, 0); + if (entry) { + orientation = atoi(entry->value); + sd = (int32_t*)av_stream_new_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, 4 * 9); + if (!sd) + return AVERROR(ENOMEM); + memset(sd, 0, 4 * 9); + switch (orientation) + { + case 1: // horizontal (normal) + av_display_rotation_set(sd, 0.0); + break; + case 2: // mirror horizontal + av_display_rotation_set(sd, 0.0); + av_display_matrix_flip(sd, 1, 0); + break; + case 3: // rotate 180 + av_display_rotation_set(sd, 180.0); + break; + case 4: // mirror vertical + av_display_rotation_set(sd, 0.0); + av_display_matrix_flip(sd, 0, 1); + break; + case 5: // mirror horizontal and rotate 270 CW + av_display_rotation_set(sd, 270.0); + av_display_matrix_flip(sd, 0, 1); + break; + case 6: // rotate 90 CW + av_display_rotation_set(sd, 90.0); + break; + case 7: // mirror horizontal and rotate 90 CW + av_display_rotation_set(sd, 90.0); + av_display_matrix_flip(sd, 0, 1); + break; + case 8: // rotate 270 CW + av_display_rotation_set(sd, 270.0); + break; + default: + av_display_rotation_set(sd, 0.0); + av_log(ist->dec_ctx, AV_LOG_WARNING, + "Exif orientation data out of range: %i. Set to default value: horizontal(normal).\n", orientation); + break; + } + } + return 0; +} + static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *duration_pts, int eof, int *decode_failed) { @@ -2423,7 +2481,10 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ decoded_frame->top_field_first = ist->top_field_first; ist->frames_decoded++; - + if (ist->frames_decoded == 1 && + ((err = set_metadata_from_1stframe(ist, decoded_frame)) < 0)) + goto fail; + if (ist->hwaccel_retrieve_data && decoded_frame->format == ist->hwaccel_pix_fmt) { err = ist->hwaccel_retrieve_data(ist->dec_ctx, decoded_frame); if (err < 0)