From patchwork Mon Jun 17 13:41:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 49978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1956664vqg; Mon, 17 Jun 2024 06:49:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWvuYxOcnlbaKxa0o0BpC+d/+UZMlnbuEeBbPbXOXM4XaNJ1df1xWv66gxyzkqvsMkO2onPV/+D6lK8tcWV7U7N1z2ayYcRP+9sPg== X-Google-Smtp-Source: AGHT+IG1Di2Bu7LdlS0KD4TOYKN0Z2A/sc7yGEDSjSZqKaltK6xwxOHRUsBgm74AbJqq19bdE/e/ X-Received: by 2002:a2e:7d03:0:b0:2eb:e56c:c90a with SMTP id 38308e7fff4ca-2ec0e5c8c3dmr74563001fa.43.1718632157279; Mon, 17 Jun 2024 06:49:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718632157; cv=none; d=google.com; s=arc-20160816; b=dBa4r8u4p/y5Eis17A2Ig2qkLyeDhpsm0ZSUXo4ujMvVE2RIwL454UBwcK8yTt9qBR Yd4L0kjwfwGY5CAvhKZgb+zIGr9pXmIxFUsxz7tFTDYa9fIlVjR8JWAgHnwvlDmsuVTy quMze9DANMUQq9Gy0Zm1nTTGdqS9V8zj+wMbv4A5Lf+uykPy7UFCikq1AGAn2oAl0l2A uxNirNIhPs4yZ5aNe3BFg8R7cilaSJdroCqTMq4FbY1qx+BSzGOpQoRnv8/nDA5Rd6HQ YNjLOS8OWvc7kqexVZdVReWIr3VFHGf7VqxnkHXHB2ENhyNXg9P/YgjakCtXKdF4nM0k qOYA== 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=+PUWM9JCo/rzNPmLbrpvonERa7U2uJDol/ICHlcbagg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qgjDRXwrIigQojCAfRKGPfYtD+48ZMowONR9gIjo84bNCcY41Ffh4xDLa0uHomk11J eZ8WtG0Q07pc/fpNMOX+Tc7VBaxQDy3Tm2d/fwvlrpKOSSplTLrAlW5jufsfuUGS9oOb wuAHtUwHiJaDgAzFMqKnYhwM6OqEjLnpBlY4/PiKL03qq/aUQj0lSUQBXhAyKpEHhHlI LBFtIriMd0JNbm1nEfGRLlj4KJ5ZuaSK5AK4NKfYL3SkbsixVp9qt41B/LdPP1Nh4Goa F9VpuSpROIey2wBe4JAYy8uQfYPYOklVOIeU5UVt5X8eOXNAcbKJx+rvnENOY8288IBF EbUA==; 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=B+Pxmntu; 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 38308e7fff4ca-2ec05c4b632si26964671fa.271.2024.06.17.06.49.16; Mon, 17 Jun 2024 06:49:17 -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=B+Pxmntu; 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 6643568D773; Mon, 17 Jun 2024 16:42:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2221E68D76E for ; Mon, 17 Jun 2024 16:41:55 +0300 (EEST) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-35f22d3abf1so3966731f8f.1 for ; Mon, 17 Jun 2024 06:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718631713; x=1719236513; 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=StlB+Iz6JMTNG2bkf8DuW/n8Kd/er+F4rVPZJo2z7ts=; b=B+PxmntuBI0Cb3LSfPklYhV/7nMpb+sigjjbcx2gjz0WVYM1acZrAN8CZFk2ngB5lS p7MBahf5Lk8LzIljzc97SA/2nyUzsOsWqOr5qvb3H+CPYTD5kfIAgou1C0U1QYPrk1En Z/Wcuss6yZZMiE+wGDxnpZrgr2Wz7UrebdpiCFTRL1CmfAyQtYLbmgXYqfEG+Io9r1TK 3Ue5peaK+fz8ZN2D4UiU3dV2qMF6iifezQFg3LDTqvj7hbggv+WH/CR6pqp3RPwlS/bW hoT7eV1LXqnIyhbJOXeFfd9JHYsGxSYV3nyzgVzkrrp1fPstv1k9d+Owmhy93jHTnu4f KiJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718631713; x=1719236513; 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=StlB+Iz6JMTNG2bkf8DuW/n8Kd/er+F4rVPZJo2z7ts=; b=XNramiWjHO26RIEXLEkXSGoobuMkBGHcAtJQYCWO+80+M6BuHncL9Y0cBssDnsmtmY qluJ2HdgI87CNu7cu2jwc+FNYNtfKs4CWLf4U5nOpJ18gzrAf9be+h8IQLRlgp/AyV1O glqlR+1VCAmb6fUUmZTcv3QiJEBctEVnQ+p1WgvY9lSXBdtK6ZL7Cw7bUW10L/7WbOIo sL1h+4GOSq4SJarWIDUk+X4ILsIwBjMSkufwrkAiK2eDtKS8PKgy6JOD8h0F+LCdLljA M26jBddW06cGDovkxlKEIzjdfbc5CtspUeJA8WWEIT1CjIojRfd2bIDjmvBBRMG/rYTW loNw== X-Gm-Message-State: AOJu0Ywn8imP7FmoIKZaSMmLz9Oj6bvhzRomdXur9goLl3Vg3pa8EENM KOZG3yddkdXksCT6/koS517vXftio3pAnqIqFgBBa51py5HfHVFiZk05Zw== X-Received: by 2002:adf:f30c:0:b0:360:88ca:b18f with SMTP id ffacd0b85a97d-36088cab253mr5285599f8f.0.1718631713143; Mon, 17 Jun 2024 06:41:53 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 06:41:52 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2024 14:41:38 +0100 Message-ID: <20240617134141.224614-3-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 2/5] avutil/stereo3d: Fill out stereo info provided by Vision Pro files 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: zeHlzzKI/0/h Based on what is in the files themselves, and what the API provides to users. URLs: * https://developer.apple.com/documentation/videotoolbox/kvtcompressionpropertykey_heroeye * https://developer.apple.com/documentation/videotoolbox/kvtcompressionpropertykey_stereocamerabaseline * https://developer.apple.com/documentation/videotoolbox/kvtcompressionpropertykey_horizontaldisparityadjustment * https://developer.apple.com/documentation/coremedia/kcmformatdescriptionextension_horizontalfieldofview Signed-off-by: Derek Buitenhuis --- libavutil/stereo3d.c | 52 +++++++++++++++++++++++++++++ libavutil/stereo3d.h | 78 ++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 3 files changed, 131 insertions(+), 1 deletion(-) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 9c29ab01b5..a40a9439bb 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -55,6 +55,18 @@ static const char * const stereo3d_type_names[] = { [AV_STEREO3D_COLUMNS] = "interleaved columns", }; +static const char * const stereo3d_view_names[] = { + [AV_STEREO3D_VIEW_PACKED] = "packed", + [AV_STEREO3D_VIEW_LEFT] = "left", + [AV_STEREO3D_VIEW_RIGHT] = "right", +}; + +static const char * const stereo3d_primary_eye_names[] = { + [AV_PRIMARY_EYE_NONE] = "none", + [AV_PRIMARY_EYE_LEFT] = "left", + [AV_PRIMARY_EYE_RIGHT] = "right", +}; + const char *av_stereo3d_type_name(unsigned int type) { if (type >= FF_ARRAY_ELEMS(stereo3d_type_names)) @@ -74,3 +86,43 @@ int av_stereo3d_from_name(const char *name) return -1; } + +const char *av_stereo3d_view_name(unsigned int view) +{ + if (view >= FF_ARRAY_ELEMS(stereo3d_view_names)) + return "unknown"; + + return stereo3d_view_names[view]; +} + +int av_stereo3d_view_from_name(const char *name) +{ + int i; + + for (i = 0; i < FF_ARRAY_ELEMS(stereo3d_view_names); i++) { + if (av_strstart(name, stereo3d_view_names[i], NULL)) + return i; + } + + return -1; +} + +const char *av_stereo3d_primary_eye_name(unsigned int eye) +{ + if (eye >= FF_ARRAY_ELEMS(stereo3d_primary_eye_names)) + return "unknown"; + + return stereo3d_primary_eye_names[eye]; +} + +int av_stereo3d_primary_eye_from_name(const char *name) +{ + int i; + + for (i = 0; i < FF_ARRAY_ELEMS(stereo3d_primary_eye_names); i++) { + if (av_strstart(name, stereo3d_primary_eye_names[i], NULL)) + return i; + } + + return -1; +} diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 3aab959b79..d35e46e670 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -158,6 +158,26 @@ enum AVStereo3DView { AV_STEREO3D_VIEW_RIGHT, }; +/** + * List of possible primary eyes. + */ +enum AVStereo3DPrimaryEye { + /** + * Neither eye. + */ + AV_PRIMARY_EYE_NONE, + + /** + * Left eye. + */ + AV_PRIMARY_EYE_LEFT, + + /** + * Right eye + */ + AV_PRIMARY_EYE_RIGHT, +}; + /** * Inverted views, Right/Bottom represents the left view. */ @@ -185,6 +205,28 @@ typedef struct AVStereo3D { * Determines which views are packed. */ enum AVStereo3DView view; + + /** + * Which eye is the primary eye when rendering in 2D. + */ + enum AVStereo3DPrimaryEye primary_eye; + + /** + * The distance between the centres of the lenses of the camera system, + * in micrometers. Zero if unset. + */ + uint32_t baseline; + + /** + * Relative shift of the left and right images, which changes the zero parallax plane. + * Range -10000 to 10000, mapped to -1.0 to 1.0. Zero if unset. + */ + int32_t horizontal_disparity_adjustment; + + /** + * Horizontal field of view in thousanths of a degree. Zero if unset. + */ + uint32_t horizontal_field_of_view; } AVStereo3D; /** @@ -222,6 +264,42 @@ const char *av_stereo3d_type_name(unsigned int type); */ int av_stereo3d_from_name(const char *name); +/** + * Provide a human-readable name of a given stereo3d view. + * + * @param type The input stereo3d view value. + * + * @return The name of the stereo3d view value, or "unknown". + */ +const char *av_stereo3d_view_name(unsigned int view); + +/** + * Get the AVStereo3DView form a human-readable name. + * + * @param name The input string. + * + * @return The AVStereo3DView value, or -1 if not found. + */ +int av_stereo3d_view_from_name(const char *name); + +/** + * Provide a human-readable name of a given stereo3d primary eye. + * + * @param type The input stereo3d primary eye value. + * + * @return The name of the stereo3d primary eye value, or "unknown". + */ +const char *av_stereo3d_primary_eye_name(unsigned int eye); + +/** + * Get the AVStereo3DPrimaryEye form a human-readable name. + * + * @param name The input string. + * + * @return The AVStereo3DPrimaryEye value, or -1 if not found. + */ +int av_stereo3d_primary_eye_from_name(const char *name); + /** * @} */ diff --git a/libavutil/version.h b/libavutil/version.h index 7df546ee22..8044fd3935 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 23 +#define LIBAVUTIL_VERSION_MINOR 24 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \