From patchwork Wed Jun 26 23:30:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp138080vqy; Wed, 26 Jun 2024 16:31:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUaN1xZpqqcWtLDuF0E/QownCf0Hp8/ZqJpG9EfG/07TZ/hqLJTYhZgbdU53/4VZQRTcJxLRjmpZDziahCqnv4wO1eDFlB9vAjUUQ== X-Google-Smtp-Source: AGHT+IHJ2RSRseRJLGs/KgYAosHHnv2vLARC+x9muXjLoB9S7/m3M9v1bTgNbWLl6EP/CTSFTpOL X-Received: by 2002:a2e:8891:0:b0:2ec:5645:7deb with SMTP id 38308e7fff4ca-2ec5b2c4ea8mr92524221fa.5.1719444664600; Wed, 26 Jun 2024 16:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719444664; cv=none; d=google.com; s=arc-20160816; b=zY4UoH22Nma1oe1gsfYbZr8UfHmrXP5vUgn0WIiZ22JYZCW9UHsylaQmt9lxAPLpD4 YXRrIiZrkiWO+sIB3kcn+Y97VmbAMKzvDlvTGxFXd6Zi7yNASL893NJAwdTrZS3Kui/2 EMgeK7EsUwP1VruYZoVlGwsDtD8r6YLQUlpVVAFzxNJvM3lPMWD5U3YJzrFx8kdtrhsY xrPnhKeXAUPNY+6ex50LhhKRpsZCdITyf3m4aPIPSLvj+U4Vl5txEF8GR7gdnF8Q36Bz Qn7Btv2brLiC/DMm9mS4ePebl2Q5ZjWFJrD4VtW7AwSuxhKQb9n76OkIvoGol45yFsc9 tF+w== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=9STcZUzqri15a18WeOTcvz/i/8uXtwPm7zAS4kLwfpQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jfoX8Ylmex28RhrnA0wxdKu6T/Rl49bmrjZhjqzmgQpjEvv6/96v8V4nexdwvyRJ6U Rcdli5MLCHLwy0W0Jy4a2wqjLzQnnAMlOLMdv/TG4yBawK/wtcB87Ckkp6NiY1LFq/Uw 6qH2VuDJJSVp/xsMZEqu6mFv8cIicR2MXjqmezMoUgXqcNzDigiIuFqusn0K2ZdkXJIh HD78XkRWmwh18kcnqRWm/orvXvnTldyY0fO5J83T3Qbw5z+LLqKypAL6RNxqFGBq24j1 eQtLOKnrQz2/hye87Yb179AAY+317T0sEesxmYom6jcneDtV5GamceFbqqc2TX3drh0f aChQ==; 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=UaHFT3Il; 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-2ee4a493e97si451291fa.316.2024.06.26.16.31.04; Wed, 26 Jun 2024 16:31:04 -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=UaHFT3Il; 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 B9B7B68D6DC; Thu, 27 Jun 2024 02:30:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCB2568C178 for ; Thu, 27 Jun 2024 02:30:53 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f6a837e9a3so45272815ad.1 for ; Wed, 26 Jun 2024 16:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719444652; x=1720049452; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/Jm7VubdZZc15hksEKnB7dY3XDRiJL0lewoXGx4jpXE=; b=UaHFT3Ilairi96bDJPT4YaVp2/UT3ynGWzzRPU9oWnjy2H7JmaFD5lnPLYgbdIKYUc 79IDoUHB9rpsr1bKBHsXyU7UU0TdVlLjNrjhjQWi1rmUuMzAO7TmDpUdhGhkxWQyn7uK oCEnYW372HUd+zpvTPghWhL9g5vnGJwYoREre9sEcBJEB3+0q2sjUcDK5hdIc2AhphBA sMn59wN+kIzZbZRe8CHxBSh4w1tpDm5Mnax/TQyXuGmbVfmW/qfNUROWgiOhA92KAMwc syjmuhiYwBC4x22761Xcc1LEuZgyXaTe/8p15bUjgaTKFhGsxDeJce2O3LPjd+bOAqR4 7qIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719444652; x=1720049452; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/Jm7VubdZZc15hksEKnB7dY3XDRiJL0lewoXGx4jpXE=; b=Xd2hfxir51aPOZQbPYkgk2P+duyr1RLIFboqPnjAO6K54rbiFN5PZyWOJBCnEsfVsX ULYAcVt7nJeN4TPeNTsE9eJdslGYp+n6Wpl+bCv8RDUZWk+DDiTjcgz8/lKx9HdFdqsz ydMDpY8ApffvLdHNd7MYO32+Fb28qJWJxPhw5iUClzww0OC9cCn00ferwHKw8o0dWplc iA3JxxnoA04liLDp7KlmVvmxvHWpId4+1KfDiZzZRmqcJUrBxcGFi5IDmt1a2R9TPkzp HwfR/HY+OrgCrPThvFf6NeN2Ty2FiE0QlcF3n3j0ex0JOyXwUMORqJ6RniTqvISfrRut ehKw== X-Gm-Message-State: AOJu0YyxCkegJwEwN6avtky37ZTHviW1OaKTsBPD1nF5aRC7pYPlCfm5 7Mz264l08t9LHTZq6SsHkx/qbivpKcc18vo3j3MSt8VGv0PQawVsfYhQww== X-Received: by 2002:a17:903:18d:b0:1fa:1f31:e78a with SMTP id d9443c01a7336-1fa23f07182mr133010295ad.6.1719444651441; Wed, 26 Jun 2024 16:30:51 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1faac9975d0sm454525ad.187.2024.06.26.16.30.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 16:30:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 20:30:57 -0300 Message-ID: <20240626233059.10846-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3 v5] avutil/stereo3d: add a Stereo3D type to signal that the packing is unspecified 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: 4oHJ+EhDbr0U Given that a video stream/frame may have only one view or both views coded with the packing information being unavailable, this commit adds a new type value AV_STEREO3D_UNSPEC for this purpose. The most common case for this is container level signaling of Stereo3D video where the specifics are defined at the bitstream level. Signed-off-by: James Almer --- libavutil/stereo3d.c | 1 + libavutil/stereo3d.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 7ea3dceb33..647f9a952a 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -74,6 +74,7 @@ static const char * const stereo3d_type_names[] = { [AV_STEREO3D_SIDEBYSIDE_QUINCUNX] = "side by side (quincunx subsampling)", [AV_STEREO3D_LINES] = "interleaved lines", [AV_STEREO3D_COLUMNS] = "interleaved columns", + [AV_STEREO3D_UNSPEC] = "unspecified", }; static const char * const stereo3d_view_names[] = { diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 386455a5a4..e3da3257d7 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -136,6 +136,11 @@ enum AVStereo3DType { * @endcode */ AV_STEREO3D_COLUMNS, + + /** + * Video is stereoscopic but the packing is unspecified. + */ + AV_STEREO3D_UNSPEC, }; /** From patchwork Wed Jun 26 23:30:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp138161vqy; Wed, 26 Jun 2024 16:31:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlq67J5p0DUPrHi8WRQy+fT3pkQ0YPU7XUSwo1z464QKd6DdzsCRMa5czA41h1xlBTpmftb5r8DpWllSqw0hFZ+y0Ik0ArmGX5sQ== X-Google-Smtp-Source: AGHT+IHSienF1GmLw5Hh0vnbsrLeaw6BlBV4djHI29P1HzCSN2uGPNwL9m5MGsHb/6iABWAgAVDa X-Received: by 2002:a05:6512:138e:b0:52c:d76f:4604 with SMTP id 2adb3069b0e04-52ce1852745mr11725124e87.46.1719444675348; Wed, 26 Jun 2024 16:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719444675; cv=none; d=google.com; s=arc-20160816; b=UksjeM2xps+JHiBFfBBKvtzEFYewfw6veEQhQkvuA68bxg3AyhcvBLfHtV16kZnkUN qDA2HAyL3NsXaBSfqaqVPfGrfYGrX7HCA9NBHPtBfW2ytrTpNsCNFvdDLBbWL0tV2O2U XUwe4DdFfpO25F8PHyMiKITFPeiqdXheZl65v7Oe4uEBE23MI15sZC5T1BjXAzo+UHoF +Iy1FpfIQoTEkzoz+QEMyl1Iiymx3JHIk721cZxcF4YS42veWtAQSPmezei0OpETzZzt 80oZ5AXW3RrvZgMuB/GZXuFyxG6wh53LjurpFCyW/LLMjwtjGYRIZAUtARVLFRZplu9Q 5qfA== 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=GfTmGU6w9PL904d7puYqWsqaU6boPOcsSq6y1KaF6cQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=eDCO59VjpaP24mdENp1MJNSifo4IJiT1FpF2oSLFB6Q5AdHDMEn16/nSEMvju+CQCx hwVnuYskOJ9Aqw5Htzh8BVxAKnDj/bml9EwJhnHN/dvqXutKpMmzOQEjKEovjX1s70Hr iUu++/uQcSRaZ8Um5ENpEJT7bSbQVdg0y6jRMBZNAOFKFRfMlT8hK4lDepe7F0glm2AP YUJUlgD2P0ZW3vOkNr56KRgMTrFme+ysrDFNUxac7JIoo1QL3ewdTcaMIt0cQ9hYux1U 6vQHsjQbtw77SgcU9kM6Ri/yiQ4frdYGMWkdwvo3E2m+6WSWNvD8i6IH7qkwEoi1IYsg N/oQ==; 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=dbSwHQVI; 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 2adb3069b0e04-52e71303d5asi15897e87.444.2024.06.26.16.31.14; Wed, 26 Jun 2024 16:31:15 -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=dbSwHQVI; 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 3961268D6EE; Thu, 27 Jun 2024 02:31:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2373468D6E1 for ; Thu, 27 Jun 2024 02:30:55 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7067272245aso3460231b3a.1 for ; Wed, 26 Jun 2024 16:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719444653; x=1720049453; 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=LOZoD9fg1GH1kjLNElz5a1fbmRQIjZbO2A4yhDH8r5g=; b=dbSwHQVINhkffK0chmxKO3enjT2YW3tdQ7A6LlMu4D95mVXqhiQoHY2esH52IVSrIP Ohb3tWI2BGnILtuUXWK88M0RlcV+yW7omi6n+IvOpKjDp1G6MkNcChABIzB0Li8W+KFI 4AE+rXkTT14wgEPrbtqqDHM+zAotJNGb6+hXbe+wJpq6ACzBVdNAVhO7EiCO9U6nyxJU obefG+7Is6FWBVdTk0znjl/NRqTSo3VIYihAIpcLXL7N650JetQAKcrxRhyzowCXx4Kh uutIDowyiuQwcuI296b444SOUIP4yxbzsM5D9uk4gan5/MFumBms7s7u2Koq0199kMXf OIIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719444653; x=1720049453; 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=LOZoD9fg1GH1kjLNElz5a1fbmRQIjZbO2A4yhDH8r5g=; b=LZF3yidJ9JsQ6DCS6nwBgJ8RfY+TeVFxVbgkVF0N9xjJtKLSG7wl4sSKHUzivlVRoy AIbUSflygI/b17K5ls6HdkCiGBfvGpBzsMR8Y9DvaN3n+qZu9PF9C0AHfogZUeW2PQtB dqP1OY1cldo3BWJ0EDwgAj1R1sHAtnGFFLB+6xM36lli0tq0KODas+/d2LOLs8ToBZ17 sgdxGreMWLSn7G+WO52IieWIpxG1dQaFJMcnmZc0jNZsrg3q+QjRG+dYjaJqVckMI4/e OBSuiK5TYmje7bW91La1DOSbgtX5eKFMe3AtyiKi07zWwhxciUmvX2mrq3Bk9+fB4m2q JTNw== X-Gm-Message-State: AOJu0YxGhfEA3SAASkiv9SLGI4u/Xz5E8YNXCpXkZq/3Ut+SsGmE88b1 nndCLpphsq+NOTlhvzWrVNK5OozKDTn4eqchEhsOGboHFjLM0QOsQ15IUQ== X-Received: by 2002:a05:6a20:1583:b0:1bd:2413:a95d with SMTP id adf61e73a8af0-1becda0dademr430965637.49.1719444652893; Wed, 26 Jun 2024 16:30:52 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1faac9975d0sm454525ad.187.2024.06.26.16.30.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 16:30:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 20:30:58 -0300 Message-ID: <20240626233059.10846-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240626233059.10846-1-jamrial@gmail.com> References: <20240626233059.10846-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/stereo3d: add a Stereo3D view to signal that the view is unspecified 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: GqZzX56W/nrY Signed-off-by: James Almer --- libavutil/stereo3d.c | 1 + libavutil/stereo3d.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 647f9a952a..d6de476532 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -81,6 +81,7 @@ static const char * const stereo3d_view_names[] = { [AV_STEREO3D_VIEW_PACKED] = "packed", [AV_STEREO3D_VIEW_LEFT] = "left", [AV_STEREO3D_VIEW_RIGHT] = "right", + [AV_STEREO3D_VIEW_UNSPEC] = "unspecified", }; static const char * const stereo3d_primary_eye_names[] = { diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index e3da3257d7..c0a4ab3f2d 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -161,6 +161,11 @@ enum AVStereo3DView { * Frame contains only the right view. */ AV_STEREO3D_VIEW_RIGHT, + + /** + * Content is unspecified. + */ + AV_STEREO3D_VIEW_UNSPEC, }; /** From patchwork Wed Jun 26 23:30:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp139927vqy; Wed, 26 Jun 2024 16:37:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpYBB6Bd0jnHXl0BuONckj/omdNdEi3mZ/CDma4+lVyk++2ULOFE2Pk05uOhspL3/ZSSdJHMcNS9QVIQKBn0yDLloQu54THxfVRQ== X-Google-Smtp-Source: AGHT+IHCTGCY2uWLyrXHuyaP5lOp6bE9KhQhNx0EgMr1C/Tqu8xQXX8c4/FXLF48HDy8JIi71evg X-Received: by 2002:a2e:a17a:0:b0:2ec:4093:ec7 with SMTP id 38308e7fff4ca-2ec5b2e7238mr89358741fa.30.1719445072473; Wed, 26 Jun 2024 16:37:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719445072; cv=none; d=google.com; s=arc-20160816; b=eyDEPJFgD6k1oBrEF7k04lgOWBcjrklbXBfijENTSPZtJbHDF94tNB855KhUeZPnYJ y7V1ogs0mdsNwTigfmSVVFKCZcBhFwmn004bdfpgEfUIB9ZF0VINy0HO942tCFVa/dCB w9d3875EL8LXv2ibuzTtb68rgumKEEhNk0PUK5AMqh9rQx3s4H+vBMmtLmKpAfaO3KLP sZI9Q/ZOaXoLkI4S3sxAbMfI1OW8l7ChNbjOWuin6MkartB8w9qKZJWJj1kWtkV85mHn q9GrhEbq0a8spLYDoA0KwrhYldy5DFvp8bgY69OoNBC1mroF/zNuTO4MQ2OjuMwBxKy6 Opug== 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=hydYsdSqtMs1yu9T9WAPKUb+FbC/KPtHxlf5fU1cJEk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UVZqmp9o7NPq925ruxrmSA9eSO1l0UXZJURzV3gUB6czpLVHL0kSH4JKQE2qX642pH NrV3aYbCAEZLBj+kqMLt8KL01JYB/yUTsvjdG2TWjI0DmY/VPPC7KoMU8KGmxRYM9rL0 qa1irs2831t4vLFve1J1YVl1Aa7WxDyCPe4ygCW5Wu6ZJ1j+FakKzvptFylXnP9c08Ut hU5KVqd/zMHERCvpCz7ts3kGsQl9c3YUfBtHTQvzOdJvKAzSYvzaAV5mYkbwfXxljvRX q6QKutYViyugm08UYUaV5Uxq2JBgerdg1dQOx6UyajBTK0bSVNnn9uwDEv16ZYmgP3lQ AfIw==; 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=jvQIYgP9; 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-2ee4a338d05si496151fa.118.2024.06.26.16.37.51; Wed, 26 Jun 2024 16:37:52 -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=jvQIYgP9; 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 4166668D6F9; Thu, 27 Jun 2024 02:31:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D622468C178 for ; Thu, 27 Jun 2024 02:30:56 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1f480624d10so60636265ad.1 for ; Wed, 26 Jun 2024 16:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719444655; x=1720049455; 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=nsykBilYoRScqZn1pLeOEVrhXEkbK2O+U0cuJ4+o9tk=; b=jvQIYgP9nNSneJh57ETtW9kDvzXxUTeUaww4xjT0IkcfC4VvmRKfTFP9UYVnbktv0B Us5jJRxOVwfNENUw/gbewt4lAuxPVicq2MCKcdXBK4y29v0S0cLZJzRv5ZohJVSwQpe2 gulk9RuvZNAOVmHP2LFwNt5kvDVGSCHlDMMO0PW7KfxLgTFXsf7CT4u+E4S3QpI8zWsR xwolb+ZocliZPre8jaz8LhU2MlCbpbkV05gHMQs14ntRHVlL0vZ6527DSI/SEXryEaAp o6EnOJWQA5z7YYZTozz5j24Yhe34uA0TMiLAqZZXLGPiNHeDZJvYbhBwVfBil5qN1gWJ rbPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719444655; x=1720049455; 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=nsykBilYoRScqZn1pLeOEVrhXEkbK2O+U0cuJ4+o9tk=; b=HdROYsksOxd/nYrRo0IZ/hAkedTvAL9C54EbRLvJmy6vEhcilHzOQ+iRXyeXZKsMg1 yzIn8RdE+8vtwuO14bDWzyPh7FVxEoZO8TxEDJRMw4lBAciMbQxEZ0vWBhz/KpLnZrLN h/S+lYDUwAQs3HE7Y3sw+5x6/CBXoaOEV1sHT88sp5CouvxzT+3lVbzPJ0Nlwg8vPRyY RRjXrVSkWq1yVYYlDg5j2GExBpsiOQcZciXrlHTO1nkXN2IVsVVXOr3+ktj+6PekQFbo dSpqRWhyZudKlO1Osuq2DhU5HLlWUN6wuGg9q4oW/o15wS2TrnfnnXKCxiVzehVIJas9 NfyQ== X-Gm-Message-State: AOJu0YyYwkh41xRJxaqhqTgrJee6oruI5SYgSw9pI+6uk5Yj4oa3QeCD 9fkPLK35CLw62KmgO4CJ1zFuNYygmXTl/rJLKZnsRXYo4/lTTQWdAZG5zg== X-Received: by 2002:a17:902:c944:b0:1f7:22bf:57f4 with SMTP id d9443c01a7336-1fa1d683559mr153656635ad.55.1719444654336; Wed, 26 Jun 2024 16:30:54 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1faac9975d0sm454525ad.187.2024.06.26.16.30.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 16:30:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jun 2024 20:30:59 -0300 Message-ID: <20240626233059.10846-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240626233059.10846-1-jamrial@gmail.com> References: <20240626233059.10846-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mov: set Stereo3D type when parsing eyes box 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: QOfEs4TDacvO If view is defined in the child stri box, then the type must be set to unspecified, as these boxes don't carry packing information. Signed-off-by: James Almer --- libavformat/mov.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index b4245789c4..83a4fe932a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6546,7 +6546,8 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) int size, flags = 0; int64_t remaining; uint32_t tag, baseline = 0; - enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED; + enum AVStereo3DView view = AV_STEREO3D_VIEW_UNSPEC; + enum AVStereo3DType type = AV_STEREO3D_2D; enum AVStereo3DPrimaryEye primary_eye = AV_PRIMARY_EYE_NONE; AVRational horizontal_disparity_adjustment = { 0, 1 }; @@ -6596,6 +6597,9 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) view = AV_STEREO3D_VIEW_LEFT; else if (has_right) view = AV_STEREO3D_VIEW_RIGHT; + if (has_left || has_right) + type = AV_STEREO3D_UNSPEC; + break; } case MKTAG('h','e','r','o'): { @@ -6697,6 +6701,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) } sc->stereo3d->flags = flags; + sc->stereo3d->type = type; sc->stereo3d->view = view; sc->stereo3d->primary_eye = primary_eye; sc->stereo3d->baseline = baseline;