From patchwork Mon Mar 12 10:24:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hazem Ashmawy X-Patchwork-Id: 7952 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1428020jad; Mon, 12 Mar 2018 03:24:48 -0700 (PDT) X-Google-Smtp-Source: AG47ELtW54Jz/NFdoTBn+PKHTMNT97agF1PxBmYyHmhU5Fp6tMVT+Dg4AwGH+KF9Ig8JRmn+wjKO X-Received: by 10.223.161.195 with SMTP id v3mr5797465wrv.184.1520850288197; Mon, 12 Mar 2018 03:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520850288; cv=none; d=google.com; s=arc-20160816; b=RvAl7V0WN3AqhV7sBZ6Vofl+9bleQZKYnKPejLaVBs1toLn0QYh5hoNWgRum4zdFuE MkuWHARMsbnuHpB8iqaRVqsCLLfEaHgcC3CV2pCwq4A1JMCLtGZCSsrPoN9uMLflL4IT a68JL0Jn1636ZQUv7STkcWwn6QgnVRcsSJYQuzzbt/UL6X153JvVlgEjDvg/YfphZPqG 3yB0H8QD1ySFl8Z1UUrhPF2gbEDXhYIcrHMdoV+kaB0/Trjp7bbCsM16UglqNaE16cU1 38M2kUymzNPZ898HIw0kM280siYRArkNdvuRld1JCSS6RIYhfajfrdBqvCSRyYzmIl+z 7d+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XdH0J80iLgqyKlZ78YS1pDyrQ8bPEFxCxlIYUXPH1Dk=; b=TkmjT0RmzKddNcZt7KwAfzhqNoUrc7xHEb8gKWxDdT5bHA9I+KTHCIAh3OqzrvCy49 IM/49XXf2nsadO4Vs2z3s0/wF3qVS0/E5EMzwT4704/Sf+yq6bB1mIyIkzmqsxPsZOHq GgOrcX7sAwvXUcaQX2bFk+xUNO+OUfTP9zo7xcOGKJtQ+ziPL38lUJOFrDX4ghWwylj0 MkLabA2d8ITH7BcbxeymARSWIpX4jSMSbe/APLF+OPWIysVsc5X6IDTvV4ayHV2nn8MI PIQ/qDePn/oSiG2HrWkzXd201kvvuNkFMsRgRq3gF6rvbsiMrqcx/Fow5dAADnfb4pt7 o1lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RWL+ue6P; 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 h18si4816706wre.328.2018.03.12.03.24.47; Mon, 12 Mar 2018 03:24:48 -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=RWL+ue6P; 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 4225A68A4A4; Mon, 12 Mar 2018 12:24:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00FB768A33E for ; Mon, 12 Mar 2018 12:24:28 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id z81so15296647wmb.4 for ; Mon, 12 Mar 2018 03:24:39 -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=JAFgchSNAZF8BBlleayIfvOaZ+uWOsjVEIYGku2mhUM=; b=RWL+ue6P5kvZpghvJyd8CTiZM8v/ekEU2+2wTPnh5aA7DN/yY8zW7RX1tiLqv4F7X6 tIs1FgW01PlP6732s+AhofNICf/isZFAEa7EWnpHovvjUojMQASkz/yqEHa4gCA0Ezxw Jdi9s3RePqp48Mj27y4y4PkNnV03LLKectk/nM9hhZEAFDGDSDztBzNZiPdVS+6MI9tu HaNKe0JyldVecR6guh+jzUL2Mu2QWObnpLOlUiGBFwnGghGF8g+sk7fzRYnzp4cS7c9M ekqKILbKxNQlds8IbnV0oLbDBj0QqTGyJSQ5k7Mi7y0uxMyn74XYl+jGpd3M0O/OnHao F4og== 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=JAFgchSNAZF8BBlleayIfvOaZ+uWOsjVEIYGku2mhUM=; b=YM+/NhG00HWgiJ5ejDK7XVq1Xd0dmOVG+6bUOjpfLm9vncHR4R8h8VCISBNcwuJVnk Ow2DVYh4JY3rpzqemV6NFfIFYrnlfY1F5eLDJxB3BuESvE+mtfIWEjWbzHOIZVL/giFD jArYuQGqE0WQKdkv3m77jn3PnzQ2dI/3/vI+4L99eks1nXyPMzg+Siq1rvzK6yCIaI+0 2ub5AHZ78PrxOScTJFQ4csjNnyYcRScfZH2hhmlPzNTPgVinA/KlwHFlJgZIVxX8LQrW BfEfGz6d4muIBj7NnhYX7zjaEPfQdlGT9X38TUrqRnQTHEVFExp+K50qa31oxCYXHv+8 Cygg== X-Gm-Message-State: AElRT7Fi55ZZi2iYTinBx9U58V7Eq+wiuCBXYoYWjrg3aUNtS6oXYtbt D00TnYebDN41WI62MTUtVI1p1Q== X-Received: by 10.28.88.211 with SMTP id m202mr5674285wmb.160.1520850278738; Mon, 12 Mar 2018 03:24:38 -0700 (PDT) Received: from localhost.localdomain ([156.215.158.145]) by smtp.googlemail.com with ESMTPSA id y111sm10003424wrc.0.2018.03.12.03.24.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 03:24:38 -0700 (PDT) From: Hazem Ashmawy To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 12:24:28 +0200 Message-Id: <1520850268-32246-1-git-send-email-hazem.s.ashmawy@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v2] Change cube faces order to match Youtube's 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" Specifications can be found here: https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md Signed-off-by: Hazem Ashmawy --- libavfilter/vf_panorama.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_panorama.c b/libavfilter/vf_panorama.c index de08ef4..2fb30a1 100644 --- a/libavfilter/vf_panorama.c +++ b/libavfilter/vf_panorama.c @@ -34,12 +34,12 @@ enum Projections { }; enum Faces { - LEFT, - FRONT, RIGHT, + LEFT, TOP, - BACK, DOWN, + FRONT, + BACK, }; struct XYRemap { @@ -152,27 +152,27 @@ static void to_cube3x2_xyz(int i, int j, int face, double ew, double eh, if (face == BACK) { *x = -1 ; - *y = 3. - a; + *y = 5. - a; *z = 3. - b; } else if (face == LEFT) { - *x = a - 1; + *x = a - 3; *y = -1 ; *z = 1. - b; } else if (face == FRONT) { *x = 1 ; *y = a - 3; - *z = 1. - b; + *z = 3. - b; } else if (face == RIGHT) { - *x = 5. - a; + *x = 1. - a; *y = 1 ; *z = 1. - b; } else if (face == TOP) { - *x = b - 3; - *y = a - 1; + *x = b - 1; + *y = a - 5; *z = 1 ; } else if (face == DOWN) { *x = -b + 3; - *y = a - 5; + *y = a - 1; *z = -1 ; } } @@ -185,27 +185,27 @@ static void to_cube6x1_xyz(int i, int j, int face, double ew, double eh, if (face == BACK) { *x = -1 ; - *y = 9. - a; + *y = 11. - a; *z = 1. - b; } else if (face == LEFT) { - *x = a - 1; + *x = a - 3; *y = -1 ; *z = 1. - b; } else if (face == FRONT) { *x = 1 ; - *y = a - 3; + *y = a - 9; *z = 1. - b; } else if (face == RIGHT) { - *x = 5. - a; + *x = 1. - a; *y = 1 ; *z = 1. - b; } else if (face == TOP) { *x = b - 1; - *y = a - 7; + *y = a - 5; *z = 1 ; } else if (face == DOWN) { *x = -b + 1; - *y = a - 11; + *y = a - 7; *z = -1 ; } }