From patchwork Mon Jun 17 13:41:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 49973 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1952829vqg; Mon, 17 Jun 2024 06:42:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbtVRKyo5IHkfe0LoCYDjqB+VdTMrAc6dZjE0+2kTKcoZ4IlKa7HvYkTvP5OupJ8iVS4fRF4gGrK/J0IpcXrzDMNSkkC2I89VL0Q== X-Google-Smtp-Source: AGHT+IEwSm2P42guWg27bvj/l1bgltHO9McZ5d4No9HsAjSikdortXu6zLc4/2RwabFbWT0Sgv9x X-Received: by 2002:a17:906:a00c:b0:a6f:d5b:20c3 with SMTP id a640c23a62f3a-a6f60de6224mr637064266b.74.1718631733241; Mon, 17 Jun 2024 06:42:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718631733; cv=none; d=google.com; s=arc-20160816; b=y+39yrwcKjo2VKdVrv2IMtoJY4WbscWieKGivd7weNuMlBBzf2mBbu4AhTrBuwccUF f6IO6LKHWsyoXFv+BSfvnjjroXdHsfNFhzKk/yqumOxiu+Zl8wRMjRpix3waTX1+kAoY 2pW3goNhsldm87+A1wxsljEhGjcP29yNPEYC7OoNR60ig36WyEMaE5D6vyW6uJQidi3u +eL8XqwGJUtYkWLYSdo5kfH5lEUuT5+XrqBZLJ6cq8HwIeqkJT0mHmAsmgDq9SmxA4GX 1vkQJFZbCSZXqIxxiFNym18wyXARhf1LYoKT7DXBiYPrfDt97BzzzJDHZzy55jDwCM/p XfMg== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=hPRYEPrS4a13NRbEHkn4GdhRyyYgu+lX/0dgyqThCVs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UvSQ1cRYRcanBAku7qwZzZwg1db3UX82ECcG/yB98CGIv/z9rFm8lkOWVZH97aeGAe FRahtntpja3LGs5bEDyqJEDnMi98duKjWB/sWWmwtLX66oBVx4wSA50rgIi8i5WTlgjK jOGwZvhSvJvBYjJWONL9kh8z0zsz51SdFKFYwE9VMi3lJxiHfA6hROujilFZqzxExDrb l6Tep3NsuZAtQHOOM63g1BTYDCmFiwXVpErF2k0sYBpiwgtqsbrPFEqogbChVQ+XzTyW NhnP/rW+DezjSq7zBq2EvhYsKNfm2gL0k2Eyv+zSXpxujrrECB7L/u8osL0HhOpOjwBJ gR8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=d2J9SwI3; 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 a640c23a62f3a-a6f56dd6d05si446885866b.279.2024.06.17.06.42.12; Mon, 17 Jun 2024 06:42:13 -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=20230601 header.b=d2J9SwI3; 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 3000C68D334; Mon, 17 Jun 2024 16:42:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB07868D735 for ; Mon, 17 Jun 2024 16:41:52 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-354b722fe81so3940431f8f.3 for ; Mon, 17 Jun 2024 06:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718631712; x=1719236512; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vl70ixDhP5Atv6Vc1oK+x81USvOLkG5e46JvJaNBNCQ=; b=d2J9SwI3jiHkST6qtOUCVClNJjPfwlr8iohfGFc1+9HwgBB9keNQXat2eA5PLWeOej p498tavemb4VN4xHPVd0wWYfFyRf9Qmr0xTfyN7iAwf6NmR85A736q/grmLeS1Hkmi4E +ndc1PylzMe2ZxGFUzIEb16qZL7RYzkUcgl6stEHe83IC0rtMkV9YjBPojHqeDwTthZW psro1+u0bdeg9BVxi6alQxiU9fdr6sunSBxXLQZWX9hpd0mFbgyc2KjXR1q9er3ahl9T 7KIwoGZJGS1Lq0zX4pX0RKK57t3vOBT+L8NfktKCnKGP7M55awa2AddBVHaslWwcx+VN 0Kbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718631712; x=1719236512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vl70ixDhP5Atv6Vc1oK+x81USvOLkG5e46JvJaNBNCQ=; b=LtV1HdwLuy32BIkvE0ImlaGHujlThvPvdsWeqqnPeCIXcpTmbntiIvhJv5Ks9+6bZz 1gu8EsoA02bBUh9N7bsE+u0uOVKBUONQVIJSijiqZL5A06C3s4Uol1aWlwuMsEb7WcRa WfgJFWZSe7uNfhoPGdeRUKTMUtN+h5s63ih5uVL+fB3Z8MImNf51Y2ezRqBJDMlJVfBN qqkM9tzcrxO0QcKfCl8z3YtGXPlKL2Is5L4o3G4Yi/OocLaKXWmolRdRTyl+BXrV8VeG HBF8IbQwN1UZ5oz6pohzwtg5cEGtkHd2Vrwmz9OOKHDK7kruR/pa28ehstpK5/gUXQBY rmaQ== X-Gm-Message-State: AOJu0YzJkiKvYL6LXzPbOfAebY2v25Epqnil8XaQkLvTe3GDUCF2Crk6 b37imD2zN3XJQEeDLVHVq8E7AGz3Kgkt2rrh0Ub484r18466Qo5twD4Ksw== X-Received: by 2002:adf:f906:0:b0:35f:30ae:a6e4 with SMTP id ffacd0b85a97d-3607a782371mr6813823f8f.46.1718631711725; Mon, 17 Jun 2024 06:41:51 -0700 (PDT) Received: from localhost.localdomain (0540dce9.skybroadband.com. [5.64.220.233]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3607509c790sm11915391f8f.38.2024.06.17.06.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 06:41:51 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2024 14:41:37 +0100 Message-ID: <20240617134141.224614-2-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240617134141.224614-1-derek.buitenhuis@gmail.com> References: <20240617134141.224614-1-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/5] avutil/spherical: Add more spherical types X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: hVMsB2YDj6vb These originate from the Apple Vision Pro, and are documented here: https://developer.apple.com/documentation/coremedia/cmprojectiontype Signed-off-by: Derek Buitenhuis --- libavutil/spherical.c | 5 +++++ libavutil/spherical.h | 16 ++++++++++++++++ libavutil/version.h | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libavutil/spherical.c b/libavutil/spherical.c index 800d3459a5..64ade1d0ec 100644 --- a/libavutil/spherical.c +++ b/libavutil/spherical.c @@ -29,6 +29,8 @@ AVSphericalMapping *av_spherical_alloc(size_t *size) if (!spherical) return NULL; + spherical->projection = AV_SPHERICAL_RECTILINEAR; + if (size) *size = sizeof(*spherical); @@ -57,6 +59,9 @@ static const char *const spherical_projection_names[] = { [AV_SPHERICAL_EQUIRECTANGULAR] = "equirectangular", [AV_SPHERICAL_CUBEMAP] = "cubemap", [AV_SPHERICAL_EQUIRECTANGULAR_TILE] = "tiled equirectangular", + [AV_SPHERICAL_HALF_EQUIRECTANGULAR] = "half equirectangular", + [AV_SPHERICAL_RECTILINEAR] = "rectilinear", + [AV_SPHERICAL_FISHEYE] = "fisheye", }; const char *av_spherical_projection_name(enum AVSphericalProjection projection) diff --git a/libavutil/spherical.h b/libavutil/spherical.h index 828ac836da..2e90f7752d 100644 --- a/libavutil/spherical.h +++ b/libavutil/spherical.h @@ -66,6 +66,22 @@ enum AVSphericalProjection { * the position of the current video in a larger surface. */ AV_SPHERICAL_EQUIRECTANGULAR_TILE, + + /** + * Video frame displays as a 180 degree equirectangular projection. + */ + AV_SPHERICAL_HALF_EQUIRECTANGULAR, + + /** + * Video frame displays on a flat, rectangular 2D surface. + */ + AV_SPHERICAL_RECTILINEAR, + + /** + * Fisheye projection (Apple). + * See: https://developer.apple.com/documentation/coremedia/cmprojectiontype/fisheye + */ + AV_SPHERICAL_FISHEYE, }; /** diff --git a/libavutil/version.h b/libavutil/version.h index 2756f2aa03..7df546ee22 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 22 +#define LIBAVUTIL_VERSION_MINOR 23 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \