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;