From patchwork Sat Jun 22 23:15:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270207vqz; Sat, 22 Jun 2024 16:16:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXt3Y1ZDhYNONPo4W3hSXy6GXWlmYpwLBSuguQbJJ3xV7WjiX4D5Ibrz4KcB1cTS9VQ0qZWr+q8aUUU4Z/Ld0E393rp/ZOl4R3vAQ== X-Google-Smtp-Source: AGHT+IG9S9Fwge+t4ro9LkMM7WSFzX1d1q5XVuQiycd24m5wnZ8J4wiFO7xdg5p9XH1HQ2DAIVP8 X-Received: by 2002:a17:906:470c:b0:a6e:2a67:7899 with SMTP id a640c23a62f3a-a7242cb7009mr79486166b.35.1719098177037; Sat, 22 Jun 2024 16:16:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098177; cv=none; d=google.com; s=arc-20160816; b=XhxdA9aSQR7B9qYf3vttzpRV5Tiifq9DuTViq1k2alnFD6r2RpPYVARYQeJ7vLROTP 1DS4UXBuRS4iqiQY5ml0LqGiLQuuVVJ6qYHQb0u93OWZkoI40K8blVVD7XMdX8j8p18I j6k90tVI5uCT2GwDXq7ZIBTNVWow13IFuYbORieuegTInhlP/hB/SG2vbgUy4Bt4Py5h FbYin/cTVbQJix6jWTGxan2lWmxtPBiAlPtfH4d/ZROfAHXQ6ZEqDE778y1Cj8y5FmFd aG2Dno5VPP9eVWhhfQxfbkJ6i5cPz13xqskcEVbPMn5UjjLHxTi8CjsAabohuDTcsHCe ieHQ== 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=EZUD2pFlyKnb8lvw5tgqU25TiNywImmRctkD5GUnKZs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=kydWKSnEHUSCBch9PP9uGK47MtROcCP3/tpBQac17Uit3OUuv3uraGbqZ7mk+MKbid xeSpmSlITyX56Zc1eNlZlqNEX/6JHVer1azfbLcfBZQLKeZlDBpJq/d2K1xhdXSwTraD bGFlQ0sd59lX00gOZrl529CILmBSZGpr5tpEryGSS19GirslGqBcZKVs4k50T/0KUlkK U4ADIHSb6NHe/pN0Ovb9FcvdgwFzqD5JOV42Wh7HBGfpWUpPFxde2ox3SO2/me9P0+Re hNXYG19juAVPyWMqmHf6jigQdVH6hYWoJCYsNEcmBwdsAbTBppF2bsYq6EUD14j4kKJr Jjvg==; 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=bW0W60S0; 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-a7245d05184si31436966b.654.2024.06.22.16.16.16; Sat, 22 Jun 2024 16:16: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=bW0W60S0; 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 0DF6568D5C9; Sun, 23 Jun 2024 02:15:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58B2B68D4B6 for ; Sun, 23 Jun 2024 02:15:50 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7066c9741fbso553897b3a.2 for ; Sat, 22 Jun 2024 16:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098147; x=1719702947; 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=x12ZtBnjoJIWydnvLOraB3FsmuFt9lAuogeF/bclBio=; b=bW0W60S0KJWO7706HTp73IcMZWxX/7VzwZJ+qlFsAlzxLkNT429Fm2qijpWTIivDAV s8seyV3B7N/NZ7ri+Sul88SmnDJNIIdehH+9tDzaulFG1sguttdUwZ83zPQuLkwte524 BULrRI5E5bNH82FvlcLYsUnPLX6ndBlPJhMw40x1rRLlz+XBkR50mDncjx1H6wbxPGQ1 xlEG8pavyrciPyOTn2IkPqY/pgmmZ6N6K9N4VAKQp1yhHfjxHm8MWfhe30IqBJUR4qMH I+zAqJdPHxx5aWqg44jRqFjl+IpoB1vpWniVFkj4v9OZ0CSmKshpDi7R6PJ2Ug2rTcwT RlyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098147; x=1719702947; 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=x12ZtBnjoJIWydnvLOraB3FsmuFt9lAuogeF/bclBio=; b=LChLbh+v8RFV5j6xq+d02m1PfET8RVyiRtuOOUYvbm7wdSwkmP8L/wAmVBkPgmfePS vRsgtc/gJ7NPWYFvswnpxGZF8rEEVgQ63PPlvWd+9/CjJHLU7ggyoepGLbjW/6TU3FdW E7OSGB2ZmInMQ5bA7x97sm7K2E9srgEV5ps17t6gYEUFBKyGz6gEMu8SnB5Zm2yvVNHC 70Zc4KvMfEoDnSPc1i1sv+N17904+/HB7apmtyU+2BXoITAclo0uBoZN9ReZe0gCyyfX FmqEs0oqN4fjdtQU3YuY7oDN47HG2d1Wy+qst2midaBJMPvCiTzDuGl770Suh3YQq1P+ 6KQw== X-Gm-Message-State: AOJu0YxRi1wHXmvtxKSOriGMmk7sD7j3FbOBwNqLQfngXrXQA4uJ2tq2 txbxSM5uBQh07KWkngqR791yCenrSK5sgMN9gWKrlArd/swzd/c2o2tWYQ== X-Received: by 2002:a05:6a20:1aa8:b0:1b8:5ac6:4bd8 with SMTP id adf61e73a8af0-1bcf7eb46a9mr877697637.28.1719098147344; Sat, 22 Jun 2024 16:15:47 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-706512e000asm3717691b3a.179.2024.06.22.16.15.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:13 -0300 Message-ID: <20240622231520.7410-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622231520.7410-1-jamrial@gmail.com> References: <20240622231520.7410-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10 v3] avformat/mov: default to Monoscopic view when parsing eyes and st3d boxes 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: QG3hPwNP6J59 Signed-off-by: James Almer --- libavformat/mov.c | 16 ++++++++++++++-- tests/ref/fate/mov-spherical-mono | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index f08fec3fb6..b0930b2936 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6298,6 +6298,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) AVStream *st; MOVStreamContext *sc; enum AVStereo3DType type; + enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED; int mode; if (c->fc->nb_streams < 1) @@ -6320,6 +6321,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) switch (mode) { case 0: type = AV_STEREO3D_2D; + view = AV_STEREO3D_VIEW_MONO; break; case 1: type = AV_STEREO3D_TOPBOTTOM; @@ -6337,6 +6339,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR(ENOMEM); sc->stereo3d->type = type; + sc->stereo3d->view = view; return 0; } @@ -6546,7 +6549,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 +6600,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_UNSPEC; + break; } case MKTAG('h','e','r','o'): { @@ -6697,6 +6704,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; @@ -6818,19 +6826,23 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ if (av_stristr(buffer, "") && !sc->stereo3d) { enum AVStereo3DType mode; + enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED; if (av_stristr(buffer, "left-right")) mode = AV_STEREO3D_SIDEBYSIDE; else if (av_stristr(buffer, "top-bottom")) mode = AV_STEREO3D_TOPBOTTOM; - else + else { mode = AV_STEREO3D_2D; + view = AV_STEREO3D_VIEW_MONO; + } sc->stereo3d = av_stereo3d_alloc(); if (!sc->stereo3d) goto out; sc->stereo3d->type = mode; + sc->stereo3d->view = view; } /* orientation */ diff --git a/tests/ref/fate/mov-spherical-mono b/tests/ref/fate/mov-spherical-mono index b108596350..aa17e9c624 100644 --- a/tests/ref/fate/mov-spherical-mono +++ b/tests/ref/fate/mov-spherical-mono @@ -3,7 +3,7 @@ side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1