From patchwork Thu Sep 6 16:33:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?0JjQu9GM0Y8g0KnQtdGA0LHQsNC6?= X-Patchwork-Id: 10258 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp676043jap; Thu, 6 Sep 2018 09:41:05 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdas2TbxC8DC9D32sN4DyPzOBneVir1d8Fkb0m6DxTy1qG+xVUo/kYJX+UsuDSjkkdtmSA4a X-Received: by 2002:a1c:4e16:: with SMTP id g22-v6mr2912299wmh.111.1536252065640; Thu, 06 Sep 2018 09:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536252065; cv=none; d=google.com; s=arc-20160816; b=PMwbKh0C+fyAY4jnrGDiifv2JmFDZcL9sMz6LUCl/sgEbNm//lVT0FRG+RSGkjGp8N KtnhjC6+61ETSsAVz5QoRmyq77Z0NWNTMnOyPdoyQ/w60iPR+RqKPu+YAoupsuS6df6t haM5FDshB26yoMVJ1bTEIbxwGDtPT+lUFnT9Iq/sw01RHcPAsKuuD0iR4R5z4vyyL9wG OtByhdPdb5Djr/3UucTUxJ67f86X8yK6IeQFfUFEZrLNVtU+A9xxBZ85JXwn1PqLRcsd Fl99y0Y4pnK15ok8QqvkskBHbO6kT4Fhe01S/0ohgwp6L1pNIXYXsPDXSdKkFU3Tgmvd uukQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:message-id:in-reply-to:to:references:date :mime-version:from:dkim-signature:delivered-to; bh=sWM1BBZJgQ/PH4zJZBH6GvMV+jGeXvy50ByYsIaiFqE=; b=bdwmTIM0WhciuC0HWWV4/Ob0WT+69IJQsnKxYP1Y89hCf2N+sWhUgdPy3l9fLfAIg+ thynh2KxuOA0JyN648b0r4G+XJF57w77wzxVDk/yYrjvZVe/NNOliasueN9pe4EU4GfH mu+I5xGN/xUJeHT/gr809wAimvvM+hjNmSDNsE/A1vIyQUfL6oyigPrwpMNF0uqU4kwx SpGyiT4URs0IY876nKOFVYTCMEVGzfWVbD+xzo1RaqbeGkyQH6SYNHcAcRMZoOfU3upC g7sqWeXpidHycm3qCYa4b81UWcvkXnfVhs42OessprPiEn5grCcQsCSYeuPsA36CSuZU NXYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LEB42gdu; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c4-v6si5479308wrw.86.2018.09.06.09.41.04; Thu, 06 Sep 2018 09:41:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LEB42gdu; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD7E0689FBD; Thu, 6 Sep 2018 19:40:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E81E689FB3 for ; Thu, 6 Sep 2018 19:40:49 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id p6-v6so9903960ljc.5 for ; Thu, 06 Sep 2018 09:40:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:content-transfer-encoding:mime-version:subject:date:references :to:in-reply-to:message-id; bh=kvOxcozyuw8YOkUMEEesRmpGagwJ3/RtYwAK1N3go4o=; b=LEB42gdu5WinRnc+GYAu5YL8zA6PFUbZruBks3xPE+zMnHzBCU1uPAtLgYTOp2w5rW WdWWeh4mSU7hX2E7mBjj6mhAE8Fqe02KjeZ0yyELWhRXMLxpXVtrmcFmle8qTSNyDH0d CNipWe4vD3Ga/YVh/NV2nAgVOWg9KFZny+SbVIrggo+oRJ6O1uqT0WoO2RUW5QLa78xF dtq7X7A7U3A3BdUPdd/X8EVo2E2x3GEhGHfn6DejSpRf8QmBp3Pe0jdHQD2/plIp0mJX hEcNcA9lqyPag0t1cQz03DOWO7yODaQOL++aMK2jGBssdyNE1X+6JVFp0GWCtD/FKLu4 7XEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:date:references:to:in-reply-to:message-id; bh=kvOxcozyuw8YOkUMEEesRmpGagwJ3/RtYwAK1N3go4o=; b=JaC3dr8qFMazctRm1DT47FKqEPL0QO+lAsxouA3N+Jx6rZDLB7HFaPvR6VzZ3bK6Lp 6T57VO3lWCxWcg1xSx+mnrfypJIFaBZG86F/cFbAm7RmnW7JQOt2aDclKn5nv9CY+PLy hHV6BAgI/ocy66g/ElmdMIMsEfTE+E50DfJs70VF7yZsGRH9RvgJkgPrHr61IyhKH/ZO 2Ke/rCOql5L01/yKK9vNu/IHaiJBFflRIswtmBn6ryrs9FUd4mne8JX0/fx6S98Z9HI9 6WrWiuacwpkeaeWlIWVFqwSGqX9sUZJt2AY+bt4SoB5c5kGxMptoO8GmY+pJ3vaCzZRO DUJA== X-Gm-Message-State: APzg51AylxxNN9p4ac9ZXFZCuh0sji7etrhQe+0sruQ2hH+dtDvfe9PR RadQ2pVZDEogw//b1LpNWXjhqDA+ X-Received: by 2002:a2e:6e04:: with SMTP id j4-v6mr2476530ljc.61.1536251603500; Thu, 06 Sep 2018 09:33:23 -0700 (PDT) Received: from ?IPv6:2a01:a280:6:3:41a4:f97b:7ba4:90fd? ([2a01:a280:6:3:41a4:f97b:7ba4:90fd]) by smtp.gmail.com with ESMTPSA id x202-v6sm873881lfa.22.2018.09.06.09.33.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Sep 2018 09:33:22 -0700 (PDT) From: =?utf-8?B?0JjQu9GM0Y8g0KnQtdGA0LHQsNC6?= Mime-Version: 1.0 (Mac OS X Mail 11.3 \(3445.6.18\)) Date: Thu, 6 Sep 2018 19:33:21 +0300 References: To: ffmpeg-devel@ffmpeg.org In-Reply-To: Message-Id: <08030B8E-756C-4865-BD1A-38ED8049EB96@gmail.com> X-Mailer: Apple Mail (2.3445.6.18) Subject: Re: [FFmpeg-devel] PATCH: Rotation override for encoding case in 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 193d415c5b6f29be8f75839d5be4a5ca03bbac10 Mon Sep 17 00:00:00 2001 From: Ilya Shcherbak Date: Thu, 6 Sep 2018 18:30:20 +0300 Subject: [PATCH] Added rotation override for encoding case --- fftools/ffmpeg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 934dc71a74..ac1972eb94 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3573,6 +3573,11 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len) memcpy(dst, sd->data, sd->size); if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) av_display_rotation_set((uint32_t *)dst, 0); + + if (ost->rotate_overridden) { + if (sd->type == AV_PKT_DATA_DISPLAYMATRIX) + av_display_rotation_set((uint32_t *)dst, -ost->rotate_override_value); + } } }