From patchwork Sat Jun 22 15:31:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50083 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1129087vqz; Sat, 22 Jun 2024 08:32:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOjFrsU7LYFiDs+uHSUkxYCR3+51RAlFtN/QyOOPi1A3jKxWJdmUtdmG9axEsgllN2Boa/7B2lHXoAW8GJDX/bSHGBQHKHHUOP2g== X-Google-Smtp-Source: AGHT+IHAD8BcgEBL45pcsbPxhhWvzOiyD3OVBTrXbLhYn292PghaidW0tMyNlx8SMV0gvEEH5cXo X-Received: by 2002:a17:906:1849:b0:a6f:bd33:d1d5 with SMTP id a640c23a62f3a-a700e731281mr106124866b.34.1719070367516; Sat, 22 Jun 2024 08:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070367; cv=none; d=google.com; s=arc-20160816; b=aiIBO/YvvZZ5m5ZbB6BxxcVgEFHCnzEj8amHoaY+xgedKT59Vb2B5TVtTjU3k5ky51 R0uv5GmOfgCh0/ESsji6ziF6pSPmTsnIs2Si58AyjIbH1d88YLNQpB34kgADF1j5XNwi zVJidyBhXv/QUrKNNHDNUc60ExpjGTVj9XG7UPvela0IRCFQmZ9XfriJw4w2lfgM26BH 6n4E8SxCK0MuWrwmI2XScJtTMkfoqsD+bO/1U789RGddvvbkeC9Q1LC1t9yVVOG83lnZ /CBQN3fOasHXEdJ7xTXTQad1X9p2Vd/XnfDMhZFueT1CPCT1OWe0sFNqQQhia7SbTfVF RJKg== 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=6oDrMzueIzFF+DvFAtbxF8JEHi34hq4Op+5d+ndlzyI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ewXjzsm21NniMgo4LNhayG2Wac91LzAg7xF9cps5xSLUmbLj45wJ5RnJhf0Manx+Er qSRUIur7g3AjFTYzdmWLwqmJfRZhkIvThMMcVBXctBCk+CDXsby6peYs1bpUX9IpU6M6 Y+LLFGxLlVR/QUeaIGxt833tLHBaBNDVrY6I5JBLN4YYNcXq31sZmV/x26HZr4Pinu2x PvLWR/gDlaaFNIX2YIkqpbDTur2ZYuCk7djODPXm1VTYOa7ziIEXQ0Us2JceqXop3bA7 FZqSjv5iBYtu+KT9f8B0Z3oU3ekwbIbUGfuMsjY+w32r8Z2U5t0LMOLbpHqaVSLNOzjw tMfA==; 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=PQ9no8qV; 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-a6fd391ca78si169865066b.459.2024.06.22.08.32.46; Sat, 22 Jun 2024 08:32:47 -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=PQ9no8qV; 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 3DB3068D66F; Sat, 22 Jun 2024 18:32:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D457A68D5BA for ; Sat, 22 Jun 2024 18:32:02 +0300 (EEST) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-70436ac8882so2422913b3a.2 for ; Sat, 22 Jun 2024 08:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070320; x=1719675120; 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=tRpyk02BfRjJYHgsLSng3k0EbESQSRRb/726TP6Xy7Y=; b=PQ9no8qVRjQ9a2L85vIienwOZS4EaM7+WGjk0sRBKoBK45oIRdeEoLwZciJDc8BG/E RsJNq0lrUDNlUgC0ewZH24F0+Vs30CfqspsfE/50Dvu5Uxlec/sJTZqAdFCRV/jKQeO2 GZUZnJTi/OeX2Rta4VhR3o5kVU01be2YJ5Fkc62/Mns7d1YKBU/3CYAGhH/B5snazAqW uGUSc2N1blDmOY88Zjn+ts9qiNLWWzr9AKikRuUMAL6ws52cJBoEDTrP0f8huAq/NUn2 hcSvE2FCcKOkNXaW0AKltHj+RiQdlJeLBWG8UYOEKkWVGwUpps/+duNgWb0k3ys7O2Vc eO5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070320; x=1719675120; 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=tRpyk02BfRjJYHgsLSng3k0EbESQSRRb/726TP6Xy7Y=; b=TI0gLqD8+QnZYJpfXSI6mR3fOwNcSb11fGuZ/Z9xzHMHWg1CKiMjA7h9hxuth+oKkw dzZTlJMHkT9qaOUC4hpfsoVRUL7XzdgEWy7OBQrO+2CzgqnS49S7nkLKSNg3TlbaPHnT TecT+HbwCuxB4rlSt3GtVsgqqKB9A/onwG3g9FVIDLbanzcPSgdvIaP21mNT8ghsIzWA MZBwfsgo3RSBtf5u7ITpjut+hpnmlIWuJGaN57RAtMitl7/8nz814J0QNEDPrcmF/rpX RlzKmslilfHEZ2hcztzM9WDMKeEsSJrBdB5dkk2q/lrPpD1E2k+6NtDVlmlFBFLLEwWz uXZg== X-Gm-Message-State: AOJu0YyPKTE+LpiQwW41Pyljh2rTpuqhkTl49inaIO95apSLci9cNtx4 8EHbH9GREXsYWQH38XThQC/ssYRMCYQZKIDVXHCgmKT1Jlt6z3N7Hqy/Bg== X-Received: by 2002:a05:6a20:81d2:b0:1b8:a188:53da with SMTP id adf61e73a8af0-1bcf7ee9057mr118025637.29.1719070292995; Sat, 22 Jun 2024 08:31:32 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:17 -0300 Message-ID: <20240622153122.6220-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8 v2] avformat/mov: default to Monoscopic view 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: pp4Rw4vqdsUT 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 f08fec3fb6..9b2ce1f167 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 AVStereo3DType type = AV_STEREO3D_2D; + enum AVStereo3DView view = AV_STEREO3D_VIEW_MONO; 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 (view) + type = AV_STEREO3D_VIEW; + 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;