From patchwork Sat Jun 22 23:15:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50089 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270097vqz; Sat, 22 Jun 2024 16:15:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXTJQOE6MtLRVEGJGGHmcFowaCg2+wq/XkKi8MtnLqfRPk3sPsj3opwIZ2ghsQo/uOkaIiuQGpBkNjGTyf3UCVp28XzlF9IiFozTA== X-Google-Smtp-Source: AGHT+IGbI3lLsROZOpcA5GNCmJoCLcm2sGc2TSVx/TEQyv/byedvzoqpz+NzkCuNJHpOcUBlZJyK X-Received: by 2002:ac2:5490:0:b0:52c:e05f:9052 with SMTP id 2adb3069b0e04-52ce1852534mr620799e87.47.1719098157919; Sat, 22 Jun 2024 16:15:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098157; cv=none; d=google.com; s=arc-20160816; b=AYGS1L8U+/2DPh6Xk4qAxR+tS40CVWrPMZBB7JkBFpeDrJkLRIWYFLqUKwfZPIUDlD cJDXPmUhAJLrf8PRw3hYn46loQSAkPrpF4gVK/F9Bx7mEaf+/vSbeu2UgOI+turli5+W mu4wtheLrqMKP2+mCAGFo6rid9WVbDZ+s6KETNXn+ApJwg9MG9gX7/U4m61Yi4ggGDf6 A/AURTtuG6GJ3s07zGHt+Kb1WzSJ2Wc5FD+3CF8dANWqhTQkfkTcAmbS62tVmN0MdTYs 9g7+3NddMdSLaZ05qkDWJVn1L+/TVmOldWWnfUx0tCtn3cpkUTZRnbcDEf2YlHAjjGv0 X/FA== 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=F0NTnwPlQVyWKbxSRXka1n+6TEy3nWiANoz316hjM18=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OeYXpoAWT6BSdObVUduDAyKqg8SrlX+Zscs1PI2cn/ayafu3HspI6T65t5fF5hxP0I 1NpuALe6iOzUtkScFh8w1Na03szD0k+b+9xWQyKQT1Nv3T9oc2gwm/Fdwi9X+T0GOytE cvdblvxUMIohECLTZNNTpMtzxiFwBuqq/LwRs9O5v1nYLzo9CdEuZU/9HrDhd/uY4RKc +z7QZMblOOCWL0PxSyXHgONt/zF0q1jw9h5seKPI1lExB4IehRkZypF2ukJ7bNQoJ2YI ez4Q3qGrCFM+0Bcx3D2Iy2d7vZC2bdv4TFX6x4LhA6innDSTwZxQZB1pdcK/ck3nGlbp ZQ1A==; 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=TYD1MRum; 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-a6fcf57989dsi221066366b.800.2024.06.22.16.15.57; Sat, 22 Jun 2024 16:15:57 -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=TYD1MRum; 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 CD1C568D3EF; Sun, 23 Jun 2024 02:15:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C60668CDFE for ; Sun, 23 Jun 2024 02:15:46 +0300 (EEST) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-25ca04d24dfso1550480fac.0 for ; Sat, 22 Jun 2024 16:15:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098144; x=1719702944; 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=LPwXkGZPGncoC/29cZSAdyign9hcATfldf9EXe6acZU=; b=TYD1MRumgGfRPn9YfAapENEyHWegVRuKpm4l1rogtqnWK48q70Be6TCJT6R95wQNAu 6vIp4uAX5FrvwyCXqM1UNVA5aLIM/rt82UviZ2qMW23wCFcynDKlGDJsbkY9XcpOB4hk AYaWJEtVuCzesJlBuRg5Fg3ISCwZC+1D9z5yNSaLBfdO3EZNn0+eH/yqRs1SJwznvfzL GLC92v7dLvKejPXPShMmTqkrS7ZK8l9BJun3NIvl7zV3hV9VXagQST1KlkKwTZIywsQ7 hN/Lm6dXSPR6eJU6RYtfzCXNJmaiuuhTW9OhpXsNZ6YRmTqDMpYvrCioTIfy2+rXLa59 ZD0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098144; x=1719702944; 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=LPwXkGZPGncoC/29cZSAdyign9hcATfldf9EXe6acZU=; b=Jiwkh15qGCxz+2vcH1SjeYlIP+XtBgfSEXYMGQ3KPceAwSjfcvEk/aM4Ju2elnWBuZ UKt8UnogjOJVSp4LcrSSyCET61GjIvg46GePDC5sMEsCJ6pqB7IQRCipqAsVY+3xJhAW gl5SBkSJI1E94SVdmaCMCqlmGYY3dSxZ+GRqCrZPK982LkKnbPQIlfp+Ma5p2wYWGUf3 EeZrw1/vSsrw4hp7ZjPNeXaEF1a72qa4WucGEaAZbzim4nPxeOTmrrekLgVndLr6OaN+ uJcSb197Zx8MY4N5/wSvF5AFcyXoFOwJxgzBtUt75B/dT4bn0efLR4h3gmu0dUE++XoT HvDw== X-Gm-Message-State: AOJu0YywuHeWlTClornOre99LtAubrt5Ji1P8oj87arXl+WD9KzN6NZI FbTUhE4+u2QhO1HcdLPo6ycFidvv5fZJy5SUIU0uoyDOJyy6q7jC+jqZeA== X-Received: by 2002:a05:6870:d149:b0:254:8487:a3 with SMTP id 586e51a60fabf-25d0191c07dmr1638180fac.44.1719098143640; Sat, 22 Jun 2024 16:15:43 -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.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:11 -0300 Message-ID: <20240622231520.7410-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10 v4] avutil/stereo3d: add a Monoscopic view enum value 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: yTaggNguvSbb We need a way to signal the frame has a single view that doesn't map to any particular eye, and it should be the default one. 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 19e81e4124..37cf093099 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -71,6 +71,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_MONO] = "monoscopic", }; static const char * const stereo3d_primary_eye_names[] = { diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 00a5c3900e..9a004d88a1 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -156,6 +156,11 @@ enum AVStereo3DView { * Frame contains only the right view. */ AV_STEREO3D_VIEW_RIGHT, + + /** + * Frame is monoscopic. + */ + AV_STEREO3D_VIEW_MONO, }; /** From patchwork Sat Jun 22 23:15:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50090 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270167vqz; Sat, 22 Jun 2024 16:16:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU+yZbgaMxBE8EvzleI+8JUjwzHclrnrJC91OBnC/2SNTFhEMQIYZ4C0FfP6EKjvj5IPanSg7Mg52iSvS/lY9r1wh0utxO17cRHRg== X-Google-Smtp-Source: AGHT+IGKcr/eg4eHSwkJ3X64cloaXA3pGMCgVbPqlfPrXg8c3t0KlSO+e0N1b8jBoKkTUVy4XMKu X-Received: by 2002:a19:6455:0:b0:52c:db0e:6c4a with SMTP id 2adb3069b0e04-52ce182bea2mr534985e87.2.1719098168386; Sat, 22 Jun 2024 16:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098168; cv=none; d=google.com; s=arc-20160816; b=WZAy3GLhEkk8mQ0ycXZ6tCZr61qbSYIjdfyyWSBp46lhQwStODuwKV1a6VfF2+i381 unvDtbDssKbYZFmV1mwml5WWksEqG3PxrP7ArggUPBT7vMgqy2+cDu7rt5vzqEXDCB8C 4JSe/yqUVm2Ptnn4rKLrZMDG6UEpOJVwbULFsNSZPxFhDcDtQZz3RbrwEpi7ZTHqPZ1U PWEthZhYfyo2esYVEdcHKQxRUdj8cKqAOG3SwqMwWKdV1W3n7iSTA8H/K8ixye9JyeHR rJ+DPElp1YA2YdkruRoJmiSIrF5JpHCcHftUWlcxx/iRL/SVJyUNKfw+T6UvBtiA9NZM d0Sw== 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=Kx2NaXKHwC4gdiY90xXZouKKAwhqy0e+SqAcrzA5Kyg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xlSXLgIa8JRJcp1WAqvd7HQMKuNj7bY8RPXsUtjH8MQaxPbzGtrK12IgWyaJAmCNWj j9K7dT6L8Sh/dTq++cxPsCw4qFo5eyFxDpU6pzmE66xeQtadb5Ih51azl8t7SyO25eRf H1GzBqYymaQnsXmyDTXGO04pPKZ/HZk2Qq/0QQN+LCj00MowibB4q56eO2mg828LFs1z 4jBjwpbVSeaOfrIOC62RkMnsyisgPx5z6HGGZ+yVZrQg3FU9umVUFm241V5ggpb1usJj ToI4U/0GqGh+ZvWKcB03IMqqEh22N79hdESTI+CWPDT9FjcZFzEFdVj0TlXhy2k+rQtV Ui7w==; 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=e7Iw1u64; 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-52cd63bcb85si1264438e87.174.2024.06.22.16.16.08; Sat, 22 Jun 2024 16:16:08 -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=e7Iw1u64; 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 B4D4E68D5B5; Sun, 23 Jun 2024 02:15:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9352668D499 for ; Sun, 23 Jun 2024 02:15:48 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-6f8d0a00a35so3022077a34.2 for ; Sat, 22 Jun 2024 16:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098145; x=1719702945; 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=nWbDbgqHBFgdumrxYJ8QeNoY3fuMIPrrpe/T1mCYjqw=; b=e7Iw1u64M0lHSRmbCObpjFBXjWVowIh1jV/zZpMFoz64PHQK5AwLC5lqhYrjTrf80B cqi5vZUp/qhdXAthY0o9CTwIZWMV41v06ulmgY+eI2JgYefpuheyRnDlR3Rd3Vdr4B8S 0aDI+brX36hIPHle4x8Facu0i1bzckw8tqfpbO+AkXgTRv1OGa5d1yBNxcDkr3R60X4Z 0gMeyDRnBKZjuBiY5ILl3iMGTBUpqu/7AcWPzcmgNDnLWgnj2xhknBD72ZUJm6P7rrhX Ky90+6KA6hbzC6GqUQgZ51C+AMX2ALJUCONuiR8I7w8eTgxYat9IkMWIyTGZ45mAqCN1 BZGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098145; x=1719702945; 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=nWbDbgqHBFgdumrxYJ8QeNoY3fuMIPrrpe/T1mCYjqw=; b=SKngXouHSyTdtFqOhwyHqwaMf2ei7jIO0PpPEy3h3wEtUN2MPUIxlRqFGMgaz30Jsx QSbM+BG6voNwwCrSQfMmuTV6jQB1Z/nqHLK8pCFi96RRhUbcRGT46Ivy6rW0iKThcWzo S67Xm4sAn9ztRuSIzOvEwnGPpZTLcL3xhmGgzosCfzlv5vlu3aLZ4eukdHhhU+c09gsX tRjT9flsKMvinRq3c3iVaIj210q/OOgPMydMtkgi8tEvm0ImWWb4tsFTAyvMEJJhXbI3 eyHBvoMQUK/AKYxPXf2EQSkNtIQF8h4IKNTUJqzWnR8g1amieNM1rsUpDWPvENAq6ugO SPTA== X-Gm-Message-State: AOJu0YzDmJUAIKKp1IZF/B3L1rsAClx2VUWtbRI0CSPi/GO35iugqbDr n7zt7gnaJ4e6lGkfXAYEsuZRAoXzjHuEDU/fhkeleu3Hr54a+TIHanQKmw== X-Received: by 2002:a05:6871:54a:b0:25c:cb34:9193 with SMTP id 586e51a60fabf-25cfce4493emr1950989fac.33.1719098145450; Sat, 22 Jun 2024 16:15:45 -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.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:12 -0300 Message-ID: <20240622231520.7410-2-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 02/10] 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: yVnBJl5fPm+s Given that a video stream/frame may have only one 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 | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 37cf093099..1f944e9cac 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -65,6 +65,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 9a004d88a1..deddecfb36 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -136,6 +136,12 @@ enum AVStereo3DType { * @endcode */ AV_STEREO3D_COLUMNS, + + /** + * Video may be monoscopic, or stereoscopic where the + * packing is unspecified. + */ + AV_STEREO3D_UNSPEC, }; /** 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 From patchwork Sat Jun 22 23:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1271878vqz; Sat, 22 Jun 2024 16:22:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlhy1VJaTGXXvGODgcbSP2xlrU1OZpSHtaz2mvajdMF/Kq2JjCPd6Nq2L281+bm5TDxD0Fp3hz7EgV8izCL814MH8aaNVYuX346Q== X-Google-Smtp-Source: AGHT+IEYK+o0scqmCyMFHe7pGNZWmGVKQqq064A/KyAZ1j1oxIcJ/fTGkqUJY/ADR/mG/i8lZnom X-Received: by 2002:a2e:8250:0:b0:2ec:eee:f19e with SMTP id 38308e7fff4ca-2ec5b3888a8mr4537601fa.37.1719098567689; Sat, 22 Jun 2024 16:22:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098567; cv=none; d=google.com; s=arc-20160816; b=Xs+Q8mEw+BtG9lX3xMa2Eb9M36yApZa5U7yjeMpcAbT7JPsp+vUSxV2e1nvb4OT541 AYEnIw4HDXKmjgSvO61C/t7oLslailLC6tAi9VIfhJ7p0co1wtKufKF7xVtpPO1AotRT ukoNPrGFJMcjRGXjMTyP1IuLOQruRMqjQ3L30T2naHseQBbmRhXrXPkaJgQUhnLViFlH HYbpFXikBwNSMYN9d+0BxTEyQ+NI/uIqeFS4qnm/a/Er+2h/qwrsXChChD/MfKVQ6388 FDLE5S5SjQx/FklPKxXzKBdY79u/qbB59g06C4w0lnF05w3cmQIoZYDp55AUADkAmN+s hJXA== 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=f0B8RTtbOLBfUyZhuoFDx+AJ10FUJKtQtGC48hSyMbs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=D3KFkUQ6dhVWRPLf+K/qvUvCJWF5lYH1RXUmtlc3l9K6zXk16XT2Gn9w/FEI7znrNb ekqGJwmbho5Oca/HYCzoHOFk0v2ZQc0GCbE04wbDogay7XDwQmV1ccgyuuk0G82vDOVs ecngZiVwxf9QXeThstzcUlT2KhWUjeCuBvBem6B4NNcVGyPAJkl/5YnmMT/9Wrn3pKMI od7awzmiu2iq8n2tflEhnFjSNP5cgW0t2Qm9DqYnEfX/oW2jRbQaER4NXXBgpoww3Qh9 zQCGhsY38eDOtDnTHPBtg14sDHkqDwy8swFzu9JG0+zsrigXyvfKTn7IhbLOrhZZeIy3 uqqg==; 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=XA4QZqFE; 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 4fb4d7f45d1cf-57d3064b405si2097367a12.188.2024.06.22.16.22.47; Sat, 22 Jun 2024 16:22: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=XA4QZqFE; 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 661E268D5D1; Sun, 23 Jun 2024 02:15:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D725268D5B7 for ; Sun, 23 Jun 2024 02:15:51 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7067a2e9607so21351b3a.3 for ; Sat, 22 Jun 2024 16:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098149; x=1719702949; 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=1NINnMKXvdQtVvO1x0ju+HbQ77vZBpbUqBE/HlupQPU=; b=XA4QZqFElsCQxZROzcin1eZmTPDOlAE2z193zjW1xpPnwiS4mffv4D49Dy9SsmYhWN Zk1qB3o3tHuJnqjgaStP4CPD0nVe+Oob1vu1KS/OCcup2jGuZWt1qyt3r+G8HaJIQHKB Mc32rgca0ITjWIMHszHB4c1niqFW9VWV4kcEa7tu1qw1APsMBEyAkLXZ5kAEceF/6I7h qip2iJNDRFn4w9MABvPpSYcG7BwDHKO996Ly9ohIC6owpzTrGeBSY/xYvjkhizRlrBFc lHwawyIatY6iYFSOjWfSE+fNB7Wtff8bNMvmGSP1zqb2pWAKahvuXo2qHoOaS78UHLLT YlzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098149; x=1719702949; 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=1NINnMKXvdQtVvO1x0ju+HbQ77vZBpbUqBE/HlupQPU=; b=Q304UGZP3jUkEpDeZrksiMQgLPn+e6F79QSnLf2hUpUkSiSyTwG5cZhPoOYwo4r/gB 4t+0sVQKzJjSKMY0MPUASc5iZ4LiqXuJwum002JM3dumy6DSgDQwwgLns9Y1d/QxVd3V sKC0E1CGPEbjaQVcuPDpPyjULiLb/mc1/3ik+7bhskdLAOoDNFZQopz8SUGmZXfZ8WBi FNMTNqdSQuueLYsx2ExSChM+4t409AKwtYOnCjOIkoQaunPqLdxujI5jUhPYTNmctigI 6aLB0QRZZjCSDcP9rXASdZgXr/84VxQ7stf0cfnLdXoDLoJpvM1bL2WfV5xa6TSe64/R YhfA== X-Gm-Message-State: AOJu0Yzn+usFxv3mH2DkOGFKNscqCbjZLM7yVKf3eW3+RT5LminUNjVF aGfeIOFLVG4qdgXWn15WQRPIcMGpDryO7soWm7Cy6pN25xl/iPrULcx2XQ== X-Received: by 2002:a05:6a00:1703:b0:705:9bd8:4f57 with SMTP id d2e1a72fcca58-70670e8fbc0mr1741559b3a.7.1719098149133; Sat, 22 Jun 2024 16:15:49 -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.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:14 -0300 Message-ID: <20240622231520.7410-4-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 04/10] avcodec/h2645_sei: set Monoscopic view for 2D projection 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: xq0+zwtrn9vA packed view (current default) is obviously not correct. Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 7c83747cd0..b30d2c1ca8 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -714,6 +714,7 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, #if CONFIG_H264_SEI case SEI_FPA_H264_TYPE_2D: stereo->type = AV_STEREO3D_2D; + stereo->view = AV_STEREO3D_VIEW_MONO; break; #endif } From patchwork Sat Jun 22 23:15:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270275vqz; Sat, 22 Jun 2024 16:16:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5/LlqjzG7wcwF5pc1VGdkQIdgdNWlKNsQCGe5XhBWKbeqwh+O3b1mhWOqa7zpOhRW/noMcmpVl7MD6Xe1VKq7J87bsGAhUE9EMQ== X-Google-Smtp-Source: AGHT+IEJIU8G2yu93VW/Ou+5SwxOvo6xcS9kxCyktyimpR7+gcVG/4abffGtt5YMI2tG5K8chGMM X-Received: by 2002:a17:907:1689:b0:a72:450e:c10 with SMTP id a640c23a62f3a-a72450e0d68mr60313666b.52.1719098193296; Sat, 22 Jun 2024 16:16:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098193; cv=none; d=google.com; s=arc-20160816; b=KqvQj/4PBPMVGVldKUWkJJ0/zTZe0j/lmtZxkZZrVkxNjzT/7FZKC+4Vla0rObSC0q WY4xKWqK96367T/uk9TC9hmwaNCcmjWaoZdflzZrAKpA0b8bXBN7qcCQdevwo1fxQBe3 jwpWvEelUqIi5xdVreqk+Bl3ryGv+LMbvTzTztqOQLtWlu7pz+4iMIiycsYLqxhP/DYL FqU1MF7RTxVj2L7igDti1nbFRzJY3YvzoYOUcG4M38cN7M9lP5rlKPU4hwVXI/DunjwR YPDhYEiF7cpCkIyjYpNDVuUGH7irDZVCd9K0PttSiz5Aa4cMcLt1EtKG+hDM9J3YrKCJ JsAw== 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=vlOBQXJgSvRR6lqQSZteaR/fKZXFyThUPe7p1KMwaKM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=wCLxi9HMj9uciKpoIC8XIgDL6zCZjo4aosTEFL0uRrf/QUJRhUJNvN76/19/Y8bZqH vEVwXhI1DqjVYzBMGU6SFkWfNApSg/h7W7uEfT0UUtWqX8aesRqh+fEs9KXelgA3XOD0 2dXCozbth2U95HoAaqvLdbj2UQ2H3whH6dOwrH54+Tz6cOPCOLE0WF/G344l6EuLX8db Hmkkqfc3FMzr8JhesxtAtXL/tdh9jw7nHrMN/ERCqbtajabbCM3UCCnohfPWEFcHkL7A cvrqup0vBiwqbkKcLIubHIQpUOlxqvn3sZi7Zzvx6czsAKH1wa6O0Bs6fUF2bwr1BHaS zA3A==; 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="C//MyPsJ"; 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-a724864242csi16455166b.861.2024.06.22.16.16.32; Sat, 22 Jun 2024 16:16:33 -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="C//MyPsJ"; 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 7B37C68D62F; Sun, 23 Jun 2024 02:16:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAF4F68D517 for ; Sun, 23 Jun 2024 02:15:52 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7041053c0fdso2011583b3a.3 for ; Sat, 22 Jun 2024 16:15:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098151; x=1719702951; 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=Yxph7PrG4bK7q2eZR+upMUlaekhG866F/Bk2jGj7c2Y=; b=C//MyPsJADlDpFAMGHF71SjPTAXC8DRLdsKJ21q2leJxzn5iycXaokBQu0jJV6ql8J szVA6NRSX4OTUdzlRkJxGSd1AszqQaMxMsPppXjSE4yUKRaUKRccln+MgasxwBzmIL/U 9188aAWdx4Hx0of/a8SCZZbPrphQx6ASF5dukxWVQA1muwkpvCf9pAkG4xmNCqGXE7qV VclfIevuKmRygxmTkUjURC/Gj2uflXXHX6YJleSkbP6xTLbPLcfQjUOyAGCRYBJTfyyy Qmy4OuGgASiWk+tzROpJ4h0AF2FEcFOb2/oFqbIW7+LqAlNHoTJ9zvmsgoM4MnvqLUOc U1zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098151; x=1719702951; 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=Yxph7PrG4bK7q2eZR+upMUlaekhG866F/Bk2jGj7c2Y=; b=r/5heo8NuparDegfCOZxKsday4uk9gbhvlevbUjDSpXloxt3OCG1y2YnNG+svtHOEg s0QdDMjqqP32eLDvHvfxWKZEbsVawzJGdQlXjQ+G2uzuKM/xAlxLBgn0X2Wl15PiV9Hv bt3cQJ6grqk2A3VXxdsYzezFlrpjfkM+28vbRm+xKJ4GR7jHzPIqhHViSsIDbu/XFiS9 OHJVxzMSAqbY3O6VACYdNIk74nWTo1sEJfUxO4Tw88FjYPxTJm268K1uqZYlL8qK+M8H 4AtLR2uJSA8YzL73PjK00W92J8mcEuarRfaoC7i5QFiOxd9gDXF+Hf/mFu+Z5d2Nd4TM 98fw== X-Gm-Message-State: AOJu0YwmG+GTedEav9DXdWrrlH8cclI9Tv2H2LFO+EJZMZTQbK84VkhK rI1by+1y+1Qf74Vq0k/fc53ga3eUorydlYxqspBGUdyKys9+tpq5ypjSEw== X-Received: by 2002:a05:6a00:26d9:b0:704:2bdd:82fe with SMTP id d2e1a72fcca58-706745b2ademr926070b3a.15.1719098150825; Sat, 22 Jun 2024 16:15:50 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:15 -0300 Message-ID: <20240622231520.7410-5-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 05/10] avcodec/mjpegdec: set Monoscopic view for 2D projection 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: YfJZ/pZmjYs8 Signed-off-by: James Almer --- libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1481a7f285..ec16186532 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2019,6 +2019,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) } if (type == 0) { s->stereo3d->type = AV_STEREO3D_2D; + s->stereo3d->view = AV_STEREO3D_VIEW_MONO; } else if (type == 1) { switch (layout) { case 0x01: @@ -2825,6 +2826,7 @@ the_end: AVStereo3D *stereo = av_stereo3d_create_side_data(frame); if (stereo) { stereo->type = s->stereo3d->type; + stereo->view = s->stereo3d->view; stereo->flags = s->stereo3d->flags; } av_freep(&s->stereo3d); From patchwork Sat Jun 22 23:15:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1271881vqz; Sat, 22 Jun 2024 16:22:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkAt+jum9hNa7G5X8mI5srZ806q9L0bEazLpa0xKgBuXgSF1BsskZEVneO02EtxbTu01pODP6pI7XBhkACuXLzdWfZFqMd3f9suw== X-Google-Smtp-Source: AGHT+IHoywD+ViRko0Y4AKVokT7svFVhRdwpW+m9Le/VHgegWYerCeYa/hioSisb3HkleDP7RZSp X-Received: by 2002:a2e:81d9:0:b0:2eb:e7dd:1f88 with SMTP id 38308e7fff4ca-2ec5b2e5fe5mr6199251fa.25.1719098567876; Sat, 22 Jun 2024 16:22:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098567; cv=none; d=google.com; s=arc-20160816; b=iq+CcB2smoVJE411ebc/xZcQ37mpWi05EXj6I9rDegVTe+sJjrxXrkIOgvwsHvB7H6 vplPhlPQgIrwwB8evFNbmoAfBWbWZ1s7AMrqOSNItkKoZvNK215MxzeZO9U3TBRMkGAi WIoLG4aN+VvQpi1n5qL9JbcwXI+GlWCC+3MzJuHUkZiHtuHisS53pTm3Ut8lG6A0PmkO tk8qVZTH66obDJcx2/4WRJhASwHVIqDJvZiAKdszj1+HZxLJR8cG6NuTEhP9BmoEAhD5 PnGrbAL8IAEDRwdbRNr61boibNDYhTbRarHh1UKD0MjMen9t55urm/5ohMZHm7Zscpzk YsrQ== 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=I/yNh77mjrVGFiFcK+cZxqOtBPAazneFFW2jJE+glo0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Cg1ue3Bsc+CeAuj8dODhc4M0t6O4GxhdVhyPPfSlF8UNQZ3ZJt65tYAhlskqoUA1dB rPDsw29339v+1xYac38DN95Eydxc8Mphmrbvc7W2qCKfgZhNapNb2J1VJwS5gMIBb+vj drgh+MHLUXCSzWQxT+cGAIG8e8Qwp7wUsfXTxcbx96p7KeDm00Uxh7XaWoPJPOKbSnI2 Ue9tqEktk2IayKJUAo6Jlb/r8yrOPaAccG0XrMTWygra5b3HuAUD3k626AmzKlo0NbnY bxmFNeIl7MWLy9TsZgdi2Umy/CU+kgBKM8LNKJNXGnCQfXIt9lZX7JddmzoteQGb7ULZ jKnA==; 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=V8bfFbX9; 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-a6fcf46199bsi217794166b.181.2024.06.22.16.22.47; Sat, 22 Jun 2024 16:22: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=V8bfFbX9; 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 D5D4868D655; Sun, 23 Jun 2024 02:16:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B04068D602 for ; Sun, 23 Jun 2024 02:15:55 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-706524adf91so1364046b3a.2 for ; Sat, 22 Jun 2024 16:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098152; x=1719702952; 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=ImS4dDmLHbXCaHy/XGqyMkoSRC6wIp5mYAd/FFt/4qs=; b=V8bfFbX9WQH880ukqtMWuoqv0Wb30LVbe2e2IyLPc5xAg1eUEJHpGwYQ7q2PO80lj7 JL6wf/Rsg/eyfPtfPEUmHoilDQqKrZ4CJuanvZ3BraA4yE/91qD42VmQMptyge8MY+7F 75UOdg4TRertl0QrGpoIIFaQoeF/fm7eCFdfx4qGgraj7TE9hfIiWo6LXio+9QSd2oRN s3D88oBtv0ip9vRDOg5P8VslPDMBwF8iwSmRkVnVfeHkXofHMrRTDEXWX6LaBqDUckvL b1QjdbDKsClIzNgstVJJg815DIYGthIvd4Ad5QwEx+s4U1qYjkyzRkp/1noe0dv/PXaq dyRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098152; x=1719702952; 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=ImS4dDmLHbXCaHy/XGqyMkoSRC6wIp5mYAd/FFt/4qs=; b=Rtjzx4jAw0rs/KhEgZF6v4GdtBXLtbI6yJQpwABBVljWvT1ooCC5ntyG1PrhIVTYGr oNmdXh9VUEQ5/+QFTeHu7BqOpIIatd8u16ph9M9rtMmMjjjMSXeklkanzIs0JABvgSWo zfktcJPmGstQ0dIn1/oTyg6rr6XhUdPkuLiKO409PBIauUXOV0Ee+lYiM8IVedhmlyqE W0cwaXT14OvqzsVgGlXgRt2xpAhUUOTxlzEI0h2OE6+OrIjgwkKpRP0wdx1L3l5tPAqp FVAcc7ycEn9W/0QGs+sUrE8GbFbVhdu3MxRyWwPdWg4czCyOEcEsAO3OjzTlacA1m+a1 Fctw== X-Gm-Message-State: AOJu0Yyo8ceSGoM/U9df/w+t1Rq0C5P1q3HAfeeFKFeFWbnYKfwHu2VD v000CBAJIUMOb4+5YAZmJdau9N205o4HapOPlPd0jO8QpPoEWg+uHfqcTg== X-Received: by 2002:a05:6a21:195:b0:1b7:689:2db0 with SMTP id adf61e73a8af0-1bcf4651587mr1347460637.56.1719098152274; Sat, 22 Jun 2024 16:15:52 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:16 -0300 Message-ID: <20240622231520.7410-6-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 06/10] avcodec/mpeg12dec: set Monoscopic view for 2D projection 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: 4gH6Qts9S7cb Signed-off-by: James Almer --- libavcodec/mpeg12dec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 7485b7c65f..fad79aa018 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2125,6 +2125,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, break; case 0x08: s1->stereo3d.type = AV_STEREO3D_2D; + s1->stereo3d.view = AV_STEREO3D_VIEW_MONO; break; case 0x23: s1->stereo3d.type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX; From patchwork Sat Jun 22 23:15: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: 50095 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270431vqz; Sat, 22 Jun 2024 16:17:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQt+3aEx6VroCdggdKgjhcWUFadOh7Pk80fI54B3/AKq9IHSBCNaOsMLUzExRwSg2EW/+G+HeEtjjmOGjaO37B/DHAAyZFp3pk7Q== X-Google-Smtp-Source: AGHT+IECQZs+VTpzswg0Tqa0IOp5rVmOdWjxh1NrmCadl483MTgwxRBz/dk44m4NRtk6RvkcxSNx X-Received: by 2002:a17:906:694f:b0:a6f:dd93:7ffb with SMTP id a640c23a62f3a-a6ffe2709f0mr159031066b.1.1719098227808; Sat, 22 Jun 2024 16:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098227; cv=none; d=google.com; s=arc-20160816; b=MRriDSXaOflemnMFy4IK3xzRFf/peGZ1pfnsB1SwGS7+gFfmiIyjRsirxnzjxmP41l XUk4TduLPnAE+H8jswrIZYW32jdPqWyKImvKvVzF5gF2WxuWLeEp3XHfDKTE+y1TRozi HkAjAM+ORWru22d2hFt1lTkoHe2kQHnWqsiiAbJHTnJX8KAroS6Y60p177nIywApESJX N9/IV2v5ufRbmLFuhsuEDohwOaibJyX88DsSFVW5lTyO08Q8Hg6LM4GJ9oNtKZts34jS I4/yR3uSISc4QLbh+zBPd7z4j1EWYti7qNGfy8dWl+spNDHsoEaW/uTyUKqDc7mt5yfW M2FQ== 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=3K+zFYYgWaraQId4sCgHwdiKm4ab4hyy1jeGYTrwnJg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Xh9Yf0ejE5Oo15f3b1VIVB2Z5cnlAJWdK+ut3fnqJT4HsTs1x9ththYFet9Ttl0tes CW7IsNIWt+Su6KkmfnjwqDwvRTRY5I7xeV/KBX51Yb8XPzch7XDLCz1P4Tgh3Pr1jtKy AvcE6vQmzqab2Qu7bldOy9PUnIADHGj+mgNrpskiuj//qmyQi1IlJnCmwEsn3aWK+ROa HdPCigVYfrlla6beh+UMckrskTaV8xWlXh9tLt/1aqVGU8GU9dqZEJqQgupb2Q9BdcLB MAm7Blhod1IYHTg4u630GO2Jx7Va0vOweQSOlJbqonC9po7INR9whTD2spG6osFOn8e+ atEA==; 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=QrTf0H+s; 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-a6fcf460bffsi225519466b.99.2024.06.22.16.17.07; Sat, 22 Jun 2024 16:17:07 -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=QrTf0H+s; 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 183C568D66F; Sun, 23 Jun 2024 02:16:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D590568D621 for ; Sun, 23 Jun 2024 02:15:56 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7065a2f4573so1122640b3a.2 for ; Sat, 22 Jun 2024 16:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098154; x=1719702954; 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=/GMLb6GKxvw5Bd650iMLPSvIKEfFtT211L1OTGN9wao=; b=QrTf0H+sKWJIledY1UGO02rJekrocl9HPT2kg54DJvP3cegSX9Tqi0lfPuZIf+4Qpu 121ifTN9mHKqXfu80tqH+q1WehyWG/wgs8NAWaisZYkV9JwsLabwqn2b29dc9VUzJxJQ oQ/azofzeDTkshzWvvz6uo9dU9is42XJrrDc0x68G2X94NCzina5WiTSK5dnRy0Ksp1E 1PNQKrVyUZrzW0VcOEvLlTPYIXfWTHNKUs6C+9s5o1hWZ4wrnyswhGAQJb5MMDpdY7kH a9EsxgOM13vD5ivyS9P7DbJvDioDopHGgJ7ay7h0kUATkOS9Te5hh424iiuehA5M78d8 4bUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098154; x=1719702954; 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=/GMLb6GKxvw5Bd650iMLPSvIKEfFtT211L1OTGN9wao=; b=iZlExvwmYuZUvgsw9Yt6ZRNgY2XD9RyTTHQZItTBfk790ReZQiFwZsC0TKMwk1hJF9 lKrAEklM7CmIwsjAJe/DqoNsZiAQAOq+Dhb7mU6qKLtSehhDH44e281eTAxwubilVBTl P5UPkrk07aV9HOmowc3TJXlH6z5zwySED38B7saXHtcrL30WUactp7BX3Ja0rV2Bawm0 uTJG0HUv2ay8kGtR8fvrI3JTbO98ciuN3BJ97o3/BcZ3r9xHv8ZntuzXqWNtfuCfZEZ6 7ee2pmcRnv829vvLT+c5l8UV1rbfpx+cXTYcE36PGKS7VbxMyLzjGTOFdE6x44Xq3Yuv lEsg== X-Gm-Message-State: AOJu0YyOEshTDF1k+mCzWNMfX/RMmPA86jOY7hm8ewI4MeyNT7Yihn+o iuid/DB9U62MJdBmkNugWoe2TnkPh208N7GWAjvORrYEYilvCdZ9JzEBYw== X-Received: by 2002:aa7:8d54:0:b0:706:705f:313a with SMTP id d2e1a72fcca58-706745947b5mr762798b3a.12.1719098154073; Sat, 22 Jun 2024 16:15:54 -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.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:17 -0300 Message-ID: <20240622231520.7410-7-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 07/10] avformat/matroska: set Monoscopic view for 2D projection 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: THMSNbjiZhhO Signed-off-by: James Almer --- libavformat/matroska.h | 36 ++++++++++++-------- libavformat/matroskadec.c | 6 ++-- libavformat/matroskaenc.c | 8 ++--- tests/ref/fate/matroska-spherical-mono | 2 +- tests/ref/fate/matroska-spherical-mono-remux | 4 +-- tests/ref/fate/matroska-vp8-alpha-remux | 2 +- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 719f2ef796..8c4d8dcb99 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -392,35 +392,41 @@ extern const AVMetadataConv ff_mkv_metadata_conv[]; * as well as WebM compatibility. * * MAP and MKV_ONLY are macros to be provided by the user. - * MAP(MatroskaVideoStereoModeType, AVStereo3DType, AV_STEREO3D_FLAG_*, - * HALF_WIDTH, HALF_HEIGHT, WebM-compatibility) + * MAP(MatroskaVideoStereoModeType, AVStereo3DType, AVStereo3DView, + * AV_STEREO3D_FLAG_*, HALF_WIDTH, HALF_HEIGHT, WebM-compatibility) * is for the stereo modes that have a Stereo3D counterpart. * MKV_ONLY(MatroskaVideoStereoModeType, HALF_WIDTH, HALF_HEIGHT, WebM) * is for those that don't have a Stereo3D counterpart. * */ #define STEREOMODE_STEREO3D_MAPPING(MAP, MKV_ONLY) \ - MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_MONO, AV_STEREO3D_2D, 0, 0, 0, 1) \ - MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT, AV_STEREO3D_SIDEBYSIDE, 0, 1, 0, 1) \ + MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_MONO, AV_STEREO3D_2D, \ + AV_STEREO3D_VIEW_MONO, 0, 0, 0, 1) \ + MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_LEFT_RIGHT, AV_STEREO3D_SIDEBYSIDE, \ + AV_STEREO3D_VIEW_PACKED, 0, 1, 0, 1) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_BOTTOM_TOP, AV_STEREO3D_TOPBOTTOM, \ - AV_STEREO3D_FLAG_INVERT, 0, 1, 1) \ - MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM, AV_STEREO3D_TOPBOTTOM, 0, 0, 1, 1) \ + AV_STEREO3D_VIEW_PACKED, AV_STEREO3D_FLAG_INVERT, 0, 1, 1) \ + MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_TOP_BOTTOM, AV_STEREO3D_TOPBOTTOM, \ + AV_STEREO3D_VIEW_PACKED, 0, 0, 1, 1) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_RL, AV_STEREO3D_CHECKERBOARD, \ - AV_STEREO3D_FLAG_INVERT, 0, 0, 0) \ - MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_LR, AV_STEREO3D_CHECKERBOARD, 0, 0, 0, 0) \ + AV_STEREO3D_VIEW_PACKED, AV_STEREO3D_FLAG_INVERT, 0, 0, 0) \ + MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_CHECKERBOARD_LR, AV_STEREO3D_CHECKERBOARD, \ + AV_STEREO3D_VIEW_PACKED, 0, 0, 0, 0) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_RL, AV_STEREO3D_LINES, \ - AV_STEREO3D_FLAG_INVERT, 0, 1, 0) \ - MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_LR, AV_STEREO3D_LINES, 0, 0, 1, 0) \ + AV_STEREO3D_VIEW_PACKED, AV_STEREO3D_FLAG_INVERT, 0, 1, 0) \ + MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_ROW_INTERLEAVED_LR, AV_STEREO3D_LINES, \ + AV_STEREO3D_VIEW_PACKED, 0, 0, 1, 0) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_RL, AV_STEREO3D_COLUMNS, \ - AV_STEREO3D_FLAG_INVERT, 1, 0, 0) \ - MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_LR, AV_STEREO3D_COLUMNS, 0, 1, 0, 0) \ + AV_STEREO3D_VIEW_PACKED, AV_STEREO3D_FLAG_INVERT, 1, 0, 0) \ + MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_COL_INTERLEAVED_LR, AV_STEREO3D_COLUMNS, \ + AV_STEREO3D_VIEW_PACKED, 0, 1, 0, 0) \ MKV_ONLY(MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_CYAN_RED, 0, 0, 0) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_RIGHT_LEFT, AV_STEREO3D_SIDEBYSIDE, \ - AV_STEREO3D_FLAG_INVERT, 1, 0, 1) \ + AV_STEREO3D_VIEW_PACKED, AV_STEREO3D_FLAG_INVERT, 1, 0, 1) \ MKV_ONLY(MATROSKA_VIDEO_STEREOMODE_TYPE_ANAGLYPH_GREEN_MAG, 0, 0, 0) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_LR, AV_STEREO3D_FRAMESEQUENCE, \ - 0, 0, 0, 0) \ + AV_STEREO3D_VIEW_PACKED, 0, 0, 0, 0) \ MAP(MATROSKA_VIDEO_STEREOMODE_TYPE_BOTH_EYES_BLOCK_RL, AV_STEREO3D_FRAMESEQUENCE, \ - AV_STEREO3D_FLAG_INVERT, 0, 0, 0) + AV_STEREO3D_VIEW_PACKED, AV_STEREO3D_FLAG_INVERT, 0, 0, 0) extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB]; diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6bc5fa621e..e6437ac68f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2245,10 +2245,11 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo { static const struct { char type; + char view; char flags; } stereo_mode_conv [] = { -#define STEREO_MODE_CONV(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ - [(STEREOMODETYPE)] = { .type = (STEREO3DTYPE), .flags = (FLAGS) }, +#define STEREO_MODE_CONV(STEREOMODETYPE, STEREO3DTYPE, STEREO3DVIEW, FLAGS, WDIV, HDIV, WEBM) \ + [(STEREOMODETYPE)] = { .type = (STEREO3DTYPE), .view = (STEREO3DVIEW), .flags = (FLAGS) }, #define NOTHING(STEREOMODETYPE, WDIV, HDIV, WEBM) STEREOMODE_STEREO3D_MAPPING(STEREO_MODE_CONV, NOTHING) }; @@ -2259,6 +2260,7 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo return AVERROR(ENOMEM); stereo->type = stereo_mode_conv[stereo_mode].type; + stereo->view = stereo_mode_conv[stereo_mode].view; stereo->flags = stereo_mode_conv[stereo_mode].flags; if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 094cf61357..dfcdda1adc 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1605,20 +1605,20 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, * indicates whether the MatroskaVideoStereoModeType with that value * uses double width/height or is WebM compatible. */ #define FLAG(STEREOMODETYPE, BOOL) | (BOOL) << (STEREOMODETYPE) -#define WDIV1(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ +#define WDIV1(STEREOMODETYPE, STEREO3DTYPE, STEREO3DVIEW, FLAGS, WDIV, HDIV, WEBM) \ FLAG(STEREOMODETYPE, WDIV) #define WDIV2(STEREOMODETYPE, WDIV, HDIV, WEBM) \ FLAG(STEREOMODETYPE, WDIV) // The zero in the following line consumes the first '|'. const unsigned width_bitfield = 0 STEREOMODE_STEREO3D_MAPPING(WDIV1, WDIV2); -#define HDIV1(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ +#define HDIV1(STEREOMODETYPE, STEREO3DTYPE, STEREO3DVIEW, FLAGS, WDIV, HDIV, WEBM) \ FLAG(STEREOMODETYPE, HDIV) #define HDIV2(STEREOMODETYPE, WDIV, HDIV, WEBM) \ FLAG(STEREOMODETYPE, HDIV) const unsigned height_bitfield = 0 STEREOMODE_STEREO3D_MAPPING(HDIV1, HDIV2); -#define WEBM1(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ +#define WEBM1(STEREOMODETYPE, STEREO3DTYPE, STEREO3DVIEW, FLAGS, WDIV, HDIV, WEBM) \ FLAG(STEREOMODETYPE, WEBM) #define WEBM2(STEREOMODETYPE, WDIV, HDIV, WEBM) \ FLAG(STEREOMODETYPE, WEBM) @@ -1646,7 +1646,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, const AVStereo3D *stereo; /* The following macro presumes all MATROSKA_VIDEO_STEREOMODE_TYPE_* * values to be in the range 0..254. */ -#define STEREOMODE(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ +#define STEREOMODE(STEREOMODETYPE, STEREO3DTYPE, STEREO3DVIEW, FLAGS, WDIV, HDIV, WEBM) \ [(STEREO3DTYPE)][!!((FLAGS) & AV_STEREO3D_FLAG_INVERT)] = (STEREOMODETYPE) + 1, #define NOTHING(STEREOMODETYPE, WDIV, HDIV, WEBM) static const unsigned char conversion_table[][2] = { diff --git a/tests/ref/fate/matroska-spherical-mono b/tests/ref/fate/matroska-spherical-mono index b108596350..aa17e9c624 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-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 diff --git a/tests/ref/fate/matroska-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux index eec41b77f3..75a9b73a37 100644 --- a/tests/ref/fate/matroska-spherical-mono-remux +++ b/tests/ref/fate/matroska-spherical-mono-remux @@ -27,7 +27,7 @@ DISPOSITION:forced=1 side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 @@ -56,7 +56,7 @@ DISPOSITION:forced=0 side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux index 06bcc4b4ba..814463eeda 100644 --- a/tests/ref/fate/matroska-vp8-alpha-remux +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -35,7 +35,7 @@ DISPOSITION:still_image=0 side_data_type=Stereo 3D type=2D inverted=0 -view=packed +view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1 From patchwork Sat Jun 22 23:15:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1274614vqz; Sat, 22 Jun 2024 16:32:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0+I0ZQ6dJBpNwH+XLUQvqe126PkrKBjBpFwOlvsfgX0jdYdWt4xjiI+jZqINQkIhXPEpeAlM6hShu5XZKAdKBYmDuwLjLPGGYkw== X-Google-Smtp-Source: AGHT+IE0vFnBXX/TC3pp3I3sYV0SfNFwYwuxmzik1kew0R21FKZVbEHS+/2PaomLt1tGMHQRSY8H X-Received: by 2002:a50:c346:0:b0:57d:1d4:9afc with SMTP id 4fb4d7f45d1cf-57d43a6cff5mr1020865a12.1.1719099166158; Sat, 22 Jun 2024 16:32:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719099166; cv=none; d=google.com; s=arc-20160816; b=qrrrGyXZhdattC01V4K9e2n2X5EPB6HwJhfsJ78wxGnOAqnLGeHeamrs509XiaQrbA /8JMuHOTxDxCp6RxNO9I/S0JLeGoqWv9ZvSywtdY8Txd8bMI27IGcdezN0kKJWk98+4a GRsdohe3Rt3x3o8NS+dCMsIKw2vGb/9g7x4IObDyTmZOUGGQyup9VAztxYt/SrZ22X5h tQ48Nmv9AGKsxTCd5VbqidBBtAUec12QTG8kMDofnFQCxgmDPODrc04bX9ttZxfbPbpu vNfrroRevwgHvw/L5Wcf712mjIcsbZWQRVVFMNgEpG+pNc/AM6Mstcunppqy6AAWFkP4 HD5g== 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=i/tk9KYoD0Htp4m+P4Q3/VQ80uNpThGz372qOi5G+dA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=n/HYzwpuw6wE8C9E1Q6pLn9ZVjcp+gU6lhP85KqFTWvHykuVEyio56QKd/jBLT6+rW ankehxbRM2VabIDX4sdLw+Nf4Yk94osrbkR9NHOsOqW5mgHMGuekTTV7hG0NRoD7mgGj gdXxNKqp4nFSCPukpdFMaoIBkayi8dfCVitYQ8u+7La45X7W+gfYoBGmJ+mLfR6cfaa9 qKbsW6rXHRlYz47Boslz9jph9ErjU7SegzEjY5wh/WTwKg5Wvkx+ql8MzdXW+Lp6S547 TjQlduNN+2P5E6MtBTRfEVPQWNIkHDyj8vrPp5/bkp2Ju0CTxzSCqgc2wPk3XyOFwvnp 1oWg==; 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=FH5ihRPD; 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 4fb4d7f45d1cf-57d30b0c543si2142402a12.671.2024.06.22.16.32.45; Sat, 22 Jun 2024 16:32:46 -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=FH5ihRPD; 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 DB93068D64B; Sun, 23 Jun 2024 02:16:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 889A868D5E8 for ; Sun, 23 Jun 2024 02:15:58 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7062bf8bb75so2725669b3a.0 for ; Sat, 22 Jun 2024 16:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098156; x=1719702956; 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=JNaWh1vnIWinqGJt34mULlrrFaOGmbQtdafr3EfEok0=; b=FH5ihRPD5WBnfugGjNNuRDhAGWcfqlqpie8BOro98Kd+tm29RMJV+Z5d1yOfPaMDdW 8N86pqCVIPIubNxiWyRyJt5e8wI/8MKQn57QQi0o4zXZmKzXEOzo3o8szk1zyeNttmFs F9UQQKGPS8RA1fczYci0v7hrRR6kt3o0mEjo/JqfOZAbEKlVahegfIgyWPLgaBQya5UK BwDkkS9NiNPfdQAE/fQg24waAWV5QjcLQYRhgLLYggPv+aBFGLYmOUadv8NNdAtwFMC6 0pltvQN0OrOBPTyWXgUfBOFxEzhKJc0x8ub6MWcjWRWa+7Yc580pKSCwR4krCuU30i9U UhgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098156; x=1719702956; 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=JNaWh1vnIWinqGJt34mULlrrFaOGmbQtdafr3EfEok0=; b=Nsxe67BRhmTupqwua96p3NDJfcx2g5GFF43ly70UzfqarDNdWfqK+pF6DjOtNT/nyc 9eXtyOYo3a7LXPOxdbczW9Qe/fNt+3xCWIcZESYHYnBYKaAQC6Pp+28OXaLsJ3jXBEZd WLRSo1ZZOyDDLwHqKvj97P2UQeMKAyjDI2popZR6p6E7I2nEIDQZDP0/trwU3iuFUrCr AlwINK8ByTJLZ0/NAwItEqylcz3pFMDSpFsJwPPgYV1CXUKo6TbUp+0KP/KKIA+WJL4l EK+9HIeDfeLBlWSiGh74vKyXxsw7pNQys6YxRIaut6ADQS9384BRgyPPsihoB7Z+eWmD zWJA== X-Gm-Message-State: AOJu0YzJhEOjLo38NwFwHKIHGRc34VY+Op3aXYQ+a/GeP9PSw2M8Vtsn 2dfl0Qt0ZnnA9AhFC/kIBjiP2em8mBThWTPyJDmV6B1ADHMo010UtUh2tg== X-Received: by 2002:a05:6a00:bf0:b0:705:9aac:ffb8 with SMTP id d2e1a72fcca58-70674582b1bmr845055b3a.9.1719098155790; Sat, 22 Jun 2024 16:15:55 -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.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:18 -0300 Message-ID: <20240622231520.7410-8-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 08/10 v3] avutil/stereo3d: add a new allocator function that returns a size 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: vdzDldCN9LjX av_stereo3d_alloc() is not useful in scenarios where you need to know the runtime size of AVStereo3D. Signed-off-by: James Almer --- libavutil/stereo3d.c | 8 ++++++++ libavutil/stereo3d.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 1f944e9cac..0eaa8154d9 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -32,6 +32,11 @@ static void get_defaults(AVStereo3D *stereo) } AVStereo3D *av_stereo3d_alloc(void) +{ + return av_stereo3d_alloc_size(NULL); +} + +AVStereo3D *av_stereo3d_alloc_size(size_t *size) { AVStereo3D *stereo = av_mallocz(sizeof(AVStereo3D)); if (!stereo) @@ -39,6 +44,9 @@ AVStereo3D *av_stereo3d_alloc(void) get_defaults(stereo); + if (size) + *size = sizeof(*stereo); + return stereo; } diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index deddecfb36..a2e480b1ff 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -248,6 +248,14 @@ typedef struct AVStereo3D { */ AVStereo3D *av_stereo3d_alloc(void); +/** + * Allocate an AVStereo3D structure and set its fields to default values. + * The resulting struct can be freed using av_freep(). + * + * @return An AVStereo3D filled with default values or NULL on failure. + */ +AVStereo3D *av_stereo3d_alloc_size(size_t *size); + /** * Allocate a complete AVFrameSideData and add it to the frame. * From patchwork Sat Jun 22 23:15:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270386vqz; Sat, 22 Jun 2024 16:16:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPFMGJbDOx+Z2kkF+7MImBDkFF4voMGICLrBXAG75pVM/7Vu4P8fscXbRoytiFmbSGpxmkifHbscWx8si8jiacTQQQvFHgPZVNSQ== X-Google-Smtp-Source: AGHT+IGi2vh6HMXlhWgAvZMkxtEY11qreFZvLpvd1qtmMPPiKj4kB8+d/IeXNO9+lbgloGeHJfqT X-Received: by 2002:a50:9342:0:b0:57d:46e3:7e2c with SMTP id 4fb4d7f45d1cf-57d46e37ef5mr1108572a12.3.1719098218576; Sat, 22 Jun 2024 16:16:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098218; cv=none; d=google.com; s=arc-20160816; b=WIylJ5filHtplK3jCnUC05sqw/+tJ1mijnTP6rDUAf5WUVfK2TgopmePMnsGln8Ngs Z5q1tia5Fm9fF0M9tJMlA3jC5T7TCxNYVhvNcvD4wHvCx1qTzk1v0bWjUejS7kJMnfLb OiNg1UchCmdX3f9pYMSkrBHvsUtCB3VQSgbeIdPGfl+v1RLbHuyXry7EZubDHwEMIk9D 3EfnyQeazHcvPMm2aS94vo/qXsfog+5Tu6nUELyjP9m6riPyM1sFiN7ofbflRGsLPGVa yescpS88dZlKMx/ReClmTm2ChS6Cbg2iZ398kN55R/6lzhKTOujN+40E/OWMV9kTPIow t35w== 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=hqOfhwrFlPb5ep4svFwLDuV9qUD2Fe7bZDZ/XDDc47s=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HG1i8cVaFXOhY/kQXcMQLWsE8QW9zYc+zYIdt/1iEkN+Rnv7S07RWiQsbi673q6Nep fU5ZT+AV74p4N4JAy4BIvkvDucPvD7c77Bx8KtsutfdW7s49ysAwI7Ze0ZPCQCD3J8i3 o+cvZDAYUTKSsqNH2tzpl9xrrBZUpFIfyW3jDogMEOTPiRXKZVy7v2nHMFddEhNLmsTG 1t8pntG/wPxswo2Xa5pD4IxYqgRSreMXJyYOWu54M0XcFW8iEb49hCX6czQy09lTny0W bpdLN6GO3ZowIgmcx6B0uuE0ssadH3fTp1a4LEQ314hZC2rDXh8/h4clJszrz3t4pQqQ KUtg==; 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=nJNeP9Wp; 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 4fb4d7f45d1cf-57d30af43b4si2126238a12.537.2024.06.22.16.16.58; Sat, 22 Jun 2024 16:16:58 -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=nJNeP9Wp; 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 C41E068D667; Sun, 23 Jun 2024 02:16:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB3AB68D627 for ; Sun, 23 Jun 2024 02:16:00 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-706524adf91so1364063b3a.2 for ; Sat, 22 Jun 2024 16:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098158; x=1719702958; 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=1c26zjXPYgvtZibhOFTai69WAKNxXDI7WAPTVfPvRMk=; b=nJNeP9WpOBJ1ntkA9tSc+vKEV8q9BZxR41M9pZ/kvLzf5PKy5ZVLnwtSuvMOuCb5oT vkWJpeZ1IY2VMPIQzIoRLlRHqUYQVCQaDB2D/oGMVCpEOdxNmK4o0gGc+lmy7rq4ztUJ g5L7yIk2PV27cRYPVi/jZzD9mblZpmrWbkuFmBAQZByoJgLGUdyM6Inah4QqETYTCmCj e3YCi6zfZd4jWd1dpqRnk9Jxw/tp9UN0J7qB3QWL8vz+yh2MPciPsAc/NIZY8Er4m99S pz400BGLFwoj5ICatYEa64rxfvCiEBNEyyoDQbpKKyqcAUKsl/MewjSaDoiys0OFj0hj QqoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098158; x=1719702958; 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=1c26zjXPYgvtZibhOFTai69WAKNxXDI7WAPTVfPvRMk=; b=OU5olkXU8E3t53jC6RNjFTDJdV0aLOqqhtvwga3AEA1TwREEGjz45mmA0gOqCYMR6a GhYNr1nyS0F7jBHk6czpyrQi2pqDuIYKn59DZO/rR3Cr7oJIo1N/QEdlQ0sUfsabut2+ SbwoniesvfnA5P0f+SC6UICU35c0Jkt78xf+2quhK8m9e2q7FWnpbtWQXFtl3HSmchIj 5QvWY21p6Qr1n4Ap7BTgkRjXWRydZhCUW04ei+ZxxAeYdB9N7bYx4JLFsgtdfMWx4Nkf iLR8aCztJVOZoIXRV5Wi80es/wkesOxy38lgFT7xN1KDzWsySCUIhAVqVQeUcJLO5rCy 4Qrw== X-Gm-Message-State: AOJu0Yx4H4SKuwaDNrI0ue120fyaf4k/gDMGnc/YNF3HpnIqu0fkT3Rz ryg8VkF/hDbNKzMNRv/pPPbILSzF8lzsYdvserQJEn2gP27IkPsnfGOHxg== X-Received: by 2002:a05:6a21:271c:b0:1b2:b232:1643 with SMTP id adf61e73a8af0-1bcf443918amr1588310637.10.1719098157610; Sat, 22 Jun 2024 16:15:57 -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.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:19 -0300 Message-ID: <20240622231520.7410-9-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 09/10 v3] avformat/mov: don't use sizeof(AVStereo3D) 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: Zz4Wh6bFYZdr It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 35b767a52c..a0498f45e5 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -247,6 +247,7 @@ typedef struct MOVStreamContext { int32_t *display_matrix; AVStereo3D *stereo3d; + size_t stereo3d_size; AVSphericalMapping *spherical; size_t spherical_size; AVMasteringDisplayMetadata *mastering; diff --git a/libavformat/mov.c b/libavformat/mov.c index b0930b2936..650b5c2a40 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6334,7 +6334,7 @@ static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); @@ -6698,7 +6698,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) } if (!sc->stereo3d) { - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); } @@ -6785,7 +6785,7 @@ static int mov_read_hfov(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (!sc->stereo3d) { - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) return AVERROR(ENOMEM); } @@ -6837,7 +6837,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ view = AV_STEREO3D_VIEW_MONO; } - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) goto out; @@ -10039,7 +10039,7 @@ static int mov_read_header(AVFormatContext *s) if (sc->stereo3d) { if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, AV_PKT_DATA_STEREO3D, - (uint8_t *)sc->stereo3d, sizeof(*sc->stereo3d), 0)) + (uint8_t *)sc->stereo3d, sc->stereo3d_size, 0)) return AVERROR(ENOMEM); sc->stereo3d = NULL; From patchwork Sat Jun 22 23:15:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1270470vqz; Sat, 22 Jun 2024 16:17:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+K86rqMFYXQdy4DZ0MOsG9gsK/sGovIepI33B/jpY/BdaWNo7F9MEC3og3okaAwvcJez1KYaAbVCUIIPkHby7j+BTXCvXjO6Tdw== X-Google-Smtp-Source: AGHT+IF6lWTV20Jkyxysbe4Dhw7Xf9wrkGPpTpXNZseNGqwpW79yMAdlZ04qWW8mGHmrowM/BvQO X-Received: by 2002:a05:6512:2805:b0:52c:dc69:28f3 with SMTP id 2adb3069b0e04-52ce185cfdfmr450102e87.52.1719098237744; Sat, 22 Jun 2024 16:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719098237; cv=none; d=google.com; s=arc-20160816; b=UBIVZbRGYhdnkPu611ahsQdrZFBZVvcoOW2yc0kJQlZB5HdFZzPbn49G5ep9vcVppR XmgkOBwntE+h6oqLh2sT3unN+M8KqOtuFdjzWrOJ/mgZX61Gb50sJw5vkZDFUHHoqZOt T6X9n6ys8QThiqNFzCEbzCVNflNNUfqqNE5boiQwSCBZ4l+PXccZautHR5MQObXXFobO iQ1OuSsmbyH8mM15t4rSzdQyTgj0WWJM7zxuXOvJGUsZ6i+gTxEV0kF4d33vQTbS1Ipg YIZAdzGMq4YS89u5k5K2thEVq7wZvUaMTJ1noQdDdtSWKIqgX5/2dGbB6DLu/Yma0TRY taIA== 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=16Zj1EMWvW+ZLwqFxdYxAlOa03B4xhv1MmfE+5gWj5k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HkdoXQKnZqEH9EyVq3z3ZNTpEgdsl4IHqHo7aJfmRQAZOkaAq5gtP4ffIsgACSf0uS LxZUpg3CTG9NWx17NzTXo92xJw0rX/KPaYHmLbrXCyavfKh22S/sQ9e0qXkLKiHHo8lb tXfFsAmNAyFwoR/i0d+L5qHcE1K9OlOaJbGFfpIsp/+yDaUnTsRaY7oE73qMzhYY9Wxh 4C2lWJNKBJe6uGudySslX5CH01kWofr8Kf877BDJJLG183gHR3Yjf7v8LSWPBOoig54X ygWuTJJj06L1j/2dnvk8006EiPkWei+OgbQPspZ/OpWkHNsOpkiJ3Z+viUVB4TsNsaZP fqqw==; 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=d55KSc6o; 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-52cd641cc00si1275095e87.205.2024.06.22.16.17.17; Sat, 22 Jun 2024 16:17: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=d55KSc6o; 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 1365168D678; Sun, 23 Jun 2024 02:16:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8E3B68D636 for ; Sun, 23 Jun 2024 02:16:01 +0300 (EEST) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-25c9786835eso1633875fac.3 for ; Sat, 22 Jun 2024 16:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719098159; x=1719702959; 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=ceegbQgnnK6fa7f4k406gkllzTLxlM0KBLLr6GNQXdc=; b=d55KSc6obwar2yQnTRRdwC2l0ZNFZsWVneIXpUV2xf8CBvIcFlyyDMO9U+vMdJgb5E LkQ217g5GysXAtrRoTGdcbtk46XXVw2yuuoZf0jy3jYIikxhWtHnXesvL2coXldeW92G YMRTjJWAjwRMn3rdFBXZUbDAXwPo5XR9HlbmJVZkj7gFiPPTjvX6LtWT2UCVNYIcpc+/ SrjA8APIDQs/oZsTOLmTxfK7GsE8SRGD2NhgEt2lo72luuYzTXt+5qtw+Xe9r/9P2kp1 ywNQEnSzf/7EIfQSyjS0nBUDSnpAjGx5a36d2X/q6INzv6FtjmzXT/RXxdgGAA20PU9d NPiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719098159; x=1719702959; 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=ceegbQgnnK6fa7f4k406gkllzTLxlM0KBLLr6GNQXdc=; b=iZBtANJRTBKtdIJCOFo9/ofehyYbF1uGHkfYGn1S+HXJoHb4RMkN8TZaDmKKjDU/Iq zs0ywJENBDcRn0C1dfqwvMfMrasGQfl2hfwET+yGRI1rustwKFhlurauoJaz5YI99U4k fO4IIiYNGYKycLSuDYnfgjofki+WNNJWHeeHZdmAYGKSKLjo/y7HdR7RDATi/ZUQ5cR8 3CfP+yokp0VMp+/yw/Nm1bFMFlhrnK4qffVPInzt22nldYqdHmFnUPmUuzbFYthmFxZi bCrdivi/y1xC7W6JNc2Sh0CWeI36u7FC63OJmbECBnhNZPjeFFqvUOWUz/tqqQ+nZdBi Imcg== X-Gm-Message-State: AOJu0YzpAEX5mvT3UG2fgT72FMNQpHanbjHkVhUcKz9IB66jGe7VN1Sh A8i6tSjEfgeHSSs4F92adnG9bVLMQ7YVGugpMiWMhTexc3Ruwx6/EEF8tQ== X-Received: by 2002:a05:6870:2187:b0:258:4de1:3c36 with SMTP id 586e51a60fabf-25d06c9c65emr1076779fac.34.1719098159270; Sat, 22 Jun 2024 16:15:59 -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.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 16:15:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 20:15:20 -0300 Message-ID: <20240622231520.7410-10-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 10/10 v3] avformat/matroskadec: don't use sizeof(AVStereo3D) 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: iQ9wvIR1Yr7g It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/matroskadec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index e6437ac68f..f090d8d798 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2254,8 +2254,9 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo STEREOMODE_STEREO3D_MAPPING(STEREO_MODE_CONV, NOTHING) }; AVStereo3D *stereo; + size_t size; - stereo = av_stereo3d_alloc(); + stereo = av_stereo3d_alloc_size(&size); if (!stereo) return AVERROR(ENOMEM); @@ -2264,7 +2265,7 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo stereo->flags = stereo_mode_conv[stereo_mode].flags; if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, - AV_PKT_DATA_STEREO3D, stereo, sizeof(*stereo), 0)) { + AV_PKT_DATA_STEREO3D, stereo, size, 0)) { av_freep(&stereo); return AVERROR(ENOMEM); }