From patchwork Sat Jun 22 01:25:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp860964vqz; Fri, 21 Jun 2024 18:25:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUem6hwuwmMX+Ab6Z0gTjpjQaPBmkSer1bx6H1ueDUYEbyxMMvFu6t4VuRdn6vRfaWxWUSCrT9zhEFXOUFmAc1VFm7BGGda6TGYwA== X-Google-Smtp-Source: AGHT+IH2sDzxqQxBwLKfpQgtiWos+87vjBta49R3wMUdrwJZ8Xxl149tbWk7Us2skM/hVrWQnYbt X-Received: by 2002:a17:907:c003:b0:a6f:b320:f455 with SMTP id a640c23a62f3a-a6fb320f483mr602066666b.32.1719019551482; Fri, 21 Jun 2024 18:25:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719019551; cv=none; d=google.com; s=arc-20160816; b=Vi2p3hi7IT2UZ5fAJT01KWQBZNWaBRdFW6pbLkr/xzCQ1Dfr696AyQX9vIfx+IOcYb JMhmfITtWwFlPbH3UkShYlM+xe5A1Hx3M3rWeUWXeBFb4VGOOq8GLC99R8C3K4sOESw8 BsarDRsXdqYGKX34f5olPAMoHcRf7piLJ7DfLjGZsOHLOH1dvkkxBKnblcns7KJntn6R J1EOMnjeR616N0+HpUybQ2ioca04hzmkNCL24x8JSyTwEViiY0RV3jHM9pYA7BKhpfrt PZpb6hNk2TEC+ipWLovnWQIBPF3nH2qsF4E37iP4v0lfjh6LH+dXbOENvb0k0cvphT/4 Cz0w== 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=AUSJj1XDLa3tovNeRfaiRTW6Evf7TerYgqjcB+1FXsY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UuQbflR0XIV2rYdHUFJO2wf6/cs6V7I7hsz+s774KPUkWqnEzpVBW8pWqfjypwn2jp Gbc4Q7knNakPWyH7GIePz02X7ljbEf62mJwtPQlwb50ZdxsuwnzOuJHuUUbhbXkGO8S3 Y2UYaGt38mhE1RJx6dZRZsUbw18BecUIUgHUH+PPWXu1RfJ/s65swQT4CkSqug7f649S WyM3yfJ4eL0G/JMmaWGhwDJBVv8Nz6Vd/J+WNX+PMVXPVXz78vBEw+2yyBzfRr34LwgJ eI9SuQxqvQFycibhe/fP9DBmPKdNDlxwRYPgO+36BbBCrGYX8Pa2Q1tUETfGxglnD7GZ EZyw==; 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=cLT056IL; 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-a6fcf54d2f9si131530766b.334.2024.06.21.18.25.50; Fri, 21 Jun 2024 18:25:51 -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=cLT056IL; 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 448A568D6F5; Sat, 22 Jun 2024 04:25:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95A2F68D6F5 for ; Sat, 22 Jun 2024 04:25:38 +0300 (EEST) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-71910dfb8c0so206393a12.3 for ; Fri, 21 Jun 2024 18:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719019535; x=1719624335; 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=ICTb9IkfQ/PuSMSuDLJUjl6K09oqzRVVXNZaZ5D+Keo=; b=cLT056ILorh4ajKkjdYLg/8eyYyDNa6ucGsbOmkcPlNu0W/NJyfBu2zO6+j58c+/Wu 1pEI9GhbW8nWeLB6vrrr5red8UlZvbvdyfOHlayuTNlFN8dOJDdagBX4ciwQNUU7LVpc 1ABz3DI4bhA+YkSrTKvYzHgNQw2NvF8F9SCeKAHlf1uwgqb87ay32XeYwGISiGEPl+zh qF1afY+XdsyP+VhOyvWCV8PZIKq/QfZWAiuywaorN+vYUmtx7UZJJn+sLl5DMAqjB0VZ rCMEcRI0HUHtfW9hhuQh7CFwOhiJYmYXQl5r1kmlc0yN9UmM/kl1eoy3KqxRjJQ3eqn5 Q7vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719019535; x=1719624335; 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=ICTb9IkfQ/PuSMSuDLJUjl6K09oqzRVVXNZaZ5D+Keo=; b=j0BatqnvShJzsLwhNZj6tA/6ODhqQwTxE2KEU0GPMWnXkyb3IMNKtZOTJ6MYLig+w6 LpUurkuDOWFAv3/3L/zZpvkF1xmgOPDk2ANzZjmtgFWzPa2QHFnVT4YFuzjgOmeMwh62 xCWSIVT3S65Ujg/WkVWD5pbCCPK7QNWSgUot+5NVMgub6M3rSA6zuObaUEg89VMm0k5T rH4NmPyqDTiPMNJaLzTAfWAbW0nGf0w0rlHTqyb5Trgh1YAwK5EgFYZeiFCru7yAKnxr bzUYzmrDeJnQP7s1wkFZ5IAL7xLcE+hq5DjDjWk0v1190goag2sBObuIgFGAZlWgyEzn WM5w== X-Gm-Message-State: AOJu0YzL+/h83sFw7ix/HJJJXb28myUawlfcBV15onYG9cbkJfrkULfo ivNClRB4Vk2Smy6iurCxpPOfF+76pjZwzNG7/ASG6JAzYp7xeq0dmQincw== X-Received: by 2002:a17:90b:309:b0:2c8:a8f:45fa with SMTP id 98e67ed59e1d1-2c80a8f4623mr5145031a91.2.1719019534940; Fri, 21 Jun 2024 18:25:34 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819dbcc86sm2244026a91.42.2024.06.21.18.25.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 18:25:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 22:25:30 -0300 Message-ID: <20240622012531.5523-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/stereo3d add 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: sdLCHqGqlaqG 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 --- The Stereo spec from Apple, which was used to design this API, states "both has_left_eye_view and has_right_eye_view can be set to 0 to indicate that the frame is monoscopic". Since this API is barely two days old, we can change the enum maped to value 0 as an exception. libavutil/stereo3d.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 00a5c3900e..77340f72b2 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -143,9 +143,9 @@ enum AVStereo3DType { */ enum AVStereo3DView { /** - * Frame contains two packed views. + * Frame is monoscopic. */ - AV_STEREO3D_VIEW_PACKED, + AV_STEREO3D_VIEW_MONO, /** * Frame contains only the left view. @@ -156,6 +156,11 @@ enum AVStereo3DView { * Frame contains only the right view. */ AV_STEREO3D_VIEW_RIGHT, + + /** + * Frame contains two packed views. + */ + AV_STEREO3D_VIEW_PACKED, }; /** From patchwork Sat Jun 22 01:25:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp860999vqz; Fri, 21 Jun 2024 18:26:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2nhz0Ec8uGY5Vt0HJd5cIQy6wq0w6j5cIcWXclMZyMii+KXSRQwXCOeKcANU37zLwn0bx2L2Z7e+zfYx0vf5skmZGjNPxSuILpg== X-Google-Smtp-Source: AGHT+IFYIcVQ2ilx2xBOeAxhYaIrZJ/1AqxyydqXEsW11uY6ja07REDLgnn7wIyj9xcpbSGSjseB X-Received: by 2002:a05:6512:3484:b0:52c:df28:de54 with SMTP id 2adb3069b0e04-52cdf28def2mr36026e87.4.1719019561849; Fri, 21 Jun 2024 18:26:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719019561; cv=none; d=google.com; s=arc-20160816; b=zE94CLJvmv07NxJffqjALkKsVHOw4NyVDcyaiPNizBpCg7QIoKORezxajMsYbMEL9s ghhmFn4/6XBw9mscWo4WJzF57L7CjwlnXlcECI3kZCnuHvvR3bhTy106KOkL6NPY6sWr 9jWbNqwyTvLOJz0f21c4/aoRxqFUn9SEoQaobfDjveM8kTfEN7/vkpDcyiY5+H1HR09b Y22wYLVPpAZBXdz+i2b8rbVmcykkUjJIfcs3RPRbdGWtTv7HIchXTTqvAXGTKOMYgrBI F27PcGhK45X0VQBp3meFUHXaYLJ9LreIAfknJLV8apsHoBtXDr6ChPu93PuxxgVaUL0m iqXg== 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=bX1fReiFWfo4LP4WiBwQUuE7w3fP7Ku+2uwkioHYTrE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mTniFuVvzyhWi2mhZAONnvneQ/KIg9/qgxJGybg98RFyt8eDjXp4BaQBKnChYxVup6 FwNzoEWAUu7EkzzlrONxwDNoCwyMhcheEP6glo8JGCIu4LNACojvSQEpoalf7s7xnyc9 6CDeFHB8SSmwLXahIXJlRoo41Ld3oUyKdoM4Jnv6778Vf4Ww/grJCMc29EqJgbSsQFsH C1br36OCdz9SDhqxr97qriQDymidFCc513cFwfiHr4JoLhQAM+VqDaDz1MMqfh2xbP4I Wtdf3HMNNT1Fn2udopSE7cYLrEbYgXFMqvzx7QndeULHsSTT6Nt4IWTro18VghiLh8yD pKGQ==; 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=Yav055hg; 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-52cd642e427si753355e87.397.2024.06.21.18.26.01; Fri, 21 Jun 2024 18:26:01 -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=Yav055hg; 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 711AA68D77F; Sat, 22 Jun 2024 04:25:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A3D668D6F5 for ; Sat, 22 Jun 2024 04:25:39 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7187e6b3584so404392a12.0 for ; Fri, 21 Jun 2024 18:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719019537; x=1719624337; 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=b+6VdzOYmvIE25/sGE6h5bxZgNv/fr+FBXIjhNP3pwc=; b=Yav055hgWYdJ/qer9smfuoJk2si7OssAuqFCY+CAomoCPLUknjY3pupn3on1TH9gXu 367YCnuMzas2K557KY+v5Ahz8lARpoSv00nOkpS8M/6H9npv6XE95ORLPOesnc0DkU7h O/QNf5pixawPet3PGTOjgLh1mqNA63V9i954Z/KTs8YECqrYEY8ONcYph/u/OiOHr7ht +jhJBY3kTxZ5yRDCUIe00T7rnzsnaomtcMXK2vZVVukeLmHFpUy0X+52zrOrsE2IDgls bA+SSCv7vlUiyO8JAO+QDt7voEeouOt6KHV3LtmoS3hyIEy+dRZS8sG1WG7tn8BEjazN SCMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719019537; x=1719624337; 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=b+6VdzOYmvIE25/sGE6h5bxZgNv/fr+FBXIjhNP3pwc=; b=dcN1L7X+PW8JtbPxNvOXBA2NGh1HJq6LIYCaa4oSMmG6/3kwHlWzQT+/bFLQ4CKtxr ZbkVQiZkAnUtfzpaWz7yi/3Hh1aiTbQDUtbb5jMEaTrzTQ79eCz8zXHOfdpzCSonGAbq Hjz/N1B3biOzdUtI8/FN4dXKD6NT9mUkPOPzoyk1K91JHIdEJRELfu5F465XD05j5dg2 z2Cx0eZVwv15vk2E5s/rBLmvhLzuZ+gNrjiAhVxTH2dfdFh4J1wejypHs4q6qPzhr0U+ t2HGtXB/cPCO/qzrn7C/MsbG2t1VfWaU3kCutwDptGZjuSFaqGUZ77vrYFJ6lWoqtxdi M2Fg== X-Gm-Message-State: AOJu0YxcjfQF8vUbTfvwC69hlFBkFS5xIDyO3TXNEd99DNGIFG5MyaCL ssf937sSYnv3vLgNapOwan2tF1ga0Twh7l5GzfzhlcyzYcAMX4JQLw/Vtw== X-Received: by 2002:a05:6a20:b71b:b0:1b5:2c97:a88b with SMTP id adf61e73a8af0-1bcbb421491mr10231813637.9.1719019536935; Fri, 21 Jun 2024 18:25:36 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c819dbcc86sm2244026a91.42.2024.06.21.18.25.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 18:25:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 22:25:31 -0300 Message-ID: <20240622012531.5523-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622012531.5523-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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: BFCaGnLIRoIy Signed-off-by: James Almer --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 50e171c960..4fa39cf4fd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6546,7 +6546,7 @@ static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom) int size, flags = 0; int64_t remaining; uint32_t tag, baseline = 0; - enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED; + enum AVStereo3DView view = AV_STEREO3D_VIEW_MONO; enum AVStereo3DPrimaryEye primary_eye = AV_PRIMARY_EYE_NONE; AVRational horizontal_disparity_adjustment = { 0, 1 }; From patchwork Sat Jun 22 02:41: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: 50046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp880491vqz; Fri, 21 Jun 2024 19:41:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW7dYsvztihY1ZUopAMIlNpvL5j5UU/Kj+oM66I78UpvsCHBZ9rfmDo0AHpjNppo1QKNyftjyLqyrK7mm4x42ga1Az+FddT04FVYA== X-Google-Smtp-Source: AGHT+IG+0tzonYkDnys1CUKY4AhuoZSGWX+jcavnHEBbTzzVZuMSzf66CgxKiv8J8PK9DCD2kTwc X-Received: by 2002:ac2:4ec8:0:b0:52c:7f39:b3b9 with SMTP id 2adb3069b0e04-52cdeab68bdmr104465e87.6.1719024096100; Fri, 21 Jun 2024 19:41:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719024096; cv=none; d=google.com; s=arc-20160816; b=ZjcB9VWvt0gLxWZ7AMMoapdhQCYA1gHut3wQm2a5MpKaJWnmCKm5L6YT8k3TcrGxWj gELCgSP79im+TOxAuu8e1DtJexmK8yYPpWP1+msNfxj5RxZoPINlnZnzP3lw1jS/GlbV 9pqjgtMVpp0xU/R1+/RFX5+eDs/0NIuFgPPkofV6Ck3kydN/SgColymuwHY+avPDcdKe 7xnAtKRc6JNNPdoiQOPz8GGIkj2UiTCaSucWCZ9Dq6N/szj7km6aaMhPjI/PMKb0+aQZ WioxZ3DfX4Xmos3Y7wb5sbnw7KxdsAsqaN8IHanPDmkKcaeYVv0Gfqg2ZlTpNMdrYXFn 590Q== 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=AX4dcz6moONrsqha1fNf9KNHCX+L8ZGyBjKNHgygYj4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=RoLaanA4PbfWcC7ndsFfQPKOooyvZfjLXGOhDRh/gQ6cn3ZX5uyDzDKsyi3iF4MoKc L+bVckOADRgsU1WID38w+ahPXMgkb9UHFUNmcJyb00mZ/AL7NRSJAS9bWamTrXycwz8g MDCf13MV53Kcu3zrrfnYEug714W7839ZhQp1yAfRi+zr6D3JXdJiNcCxKrHInASwoFzE Mh8COa6wd/GQSRL9OhjGOUlYX2E4vgyQjLhr+77+mOVy9TkQGlCc2r7qFsWC3wJe9zak tUmWh2xbr/Okz9bbj5Q0/6FHkjbEdjVOFDzBDze0dc+LXibp4uc3L+EJIR+eDXYrcCcF +Lvg==; 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=Fk5mTBar; 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-52cd6459e70si748816e87.621.2024.06.21.19.41.35; Fri, 21 Jun 2024 19:41:36 -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=Fk5mTBar; 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 8A8D368D667; Sat, 22 Jun 2024 05:41:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CA4568D667 for ; Sat, 22 Jun 2024 05:41:24 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1f4a0050b9aso21524875ad.2 for ; Fri, 21 Jun 2024 19:41:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719024081; x=1719628881; 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=V0SJv85We04NYVNfOvzvGaNuzHxlQI0Hgs9vKOXGeiQ=; b=Fk5mTBarR+2YFrZRztQ1OPsnjcz3uK6RNsNbi8U0ncvhPSUttMdeIJofGjM6SueGuP DrBMiUbvAxxbOAXzRVVIc9DSmOj4bWY/5sWl3Aw8RXjFts3GxA667knTpEcgFMAPrrB4 ieLKG298DQg3dNQSPAI9wXkY6CclG1JnY+luhBNkpHcoyqy5vqNTbHAOTKVEamd03PnM fJLOrQ0++7zPzhHi+dMxTIHWZzPFs+Knlt18UFd5T427HX1Le5V4XSJMPwMF8/DtmaX/ s02T6hJbliaQ9/PR2bAZnmasp+4FQm0nqO69e1LhHZn+GmzP/VJs4GYY8p3pdQff68iy uXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719024081; x=1719628881; 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=V0SJv85We04NYVNfOvzvGaNuzHxlQI0Hgs9vKOXGeiQ=; b=HLXl8q9QarQHdgPFu4KUic21CCHv/4Qi34XZx9GmyokD24DfXH73n3nmqNMmtlhH8w 42RbF3jIlBobk7BkrmOFwDSOAHa7QjFgbEi+w/Jmx8nZ3CffB6+dpdMKcR2xvjqCtDZl yF0HF7C80MjWeBRfptdjZAclNvWnMt6/WwbJEKk8VjQpL59wxY+RveK+B8KEfxaqRXyE YvUba9v5DHhMOZyrjeBf6OqCSP41xRHB2ibvVO+e//r/S/FI+15Vm9kkn+FJ6iXD2NEx jc6vOehuOjMyOtanwl5L2VTwNs7UkHBIjQK5iGdgkawRmD9veZNwnswPdgb8enyB3YpK Bv+w== X-Gm-Message-State: AOJu0YwGBoCvxNqraVOew1n3Qcjo2G3Tr9Uj0p92G34AVKKOjFak/usN Tf6tnTgj9Nsv4jRwO8Vr/ovSj3BtilJhZyaz/m3FKbvIrNyIbAmkuBxvEQ== X-Received: by 2002:a17:903:1112:b0:1f7:4021:50a4 with SMTP id d9443c01a7336-1f9aa45a79dmr114803345ad.43.1719024081026; Fri, 21 Jun 2024 19:41:21 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9ebbc3185sm20920285ad.289.2024.06.21.19.41.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 19:41:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 23:41:11 -0300 Message-ID: <20240622024111.6598-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622012531.5523-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avutil/stereo3d: add a Stereo3D type to signal that the packing is defined by the view field 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: 9PW9PdkX27HH Given that a video stream/frame may have only one view coded, or both packed in an undefined way, and as the values of AVStereo3DView and AVStereo3DType may clash (namely if type is AV_STEREO3D_2D, then AV_STEREO3D_VIEW_PACKED would be invalid, and if it's anything other than it, then only AV_STEREO3D_VIEW_PACKED would be valid), this commit adds a new type value AV_STEREO3D_VIEW that signals the user that AVStereo3D.view contains information about the nature of the stream, with the added constrain that AVStereo3D.view should be ignored if AVStereo3D.type is anything other than AV_STEREO3D_VIEW. Signed-off-by: James Almer --- This is the only way i could think of to work around the fact AVStereo3DType and AVStereo3DView just can't work well together if we want to keep AVStereo backwards compatible. libavutil/stereo3d.c | 1 + libavutil/stereo3d.h | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index 0c0cad127c..e8e5030db9 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_VIEW] = "view defined", }; static const char * const stereo3d_view_names[] = { diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 77340f72b2..e3af519e03 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -136,6 +136,14 @@ enum AVStereo3DType { * @endcode */ AV_STEREO3D_COLUMNS, + + /** + * Video may be monoscopic, or stereoscopic where either the + * packing is unknown or only one view is present. + * + * @see AVStereo3DView + */ + AV_STEREO3D_VIEW, }; /** @@ -207,7 +215,8 @@ typedef struct AVStereo3D { int flags; /** - * Determines which views are packed. + * Determines which views are packed. This field should be ignored when + * @ref type is set to anything other than AV_STEREO3D_VIEW. */ enum AVStereo3DView view; From patchwork Sat Jun 22 02:59:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50050 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp887054vqz; Fri, 21 Jun 2024 20:07:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUUgiQ035OwSf3sRwvmYHMGwN4RsaLN//ar4FwPqd1K+QVtSfNEQQPMQb7I1u8FE/Pnvb/eHvo5Cx32p5edJzsssVggBG0ZN/yzew== X-Google-Smtp-Source: AGHT+IGN0W6hlrpO3Mzn9OczK37JKcw3N3UlioOKoli53nN2ffVXMcK6Y5X5cfYcND+qgpSiLHdM X-Received: by 2002:a2e:8789:0:b0:2ec:347a:b020 with SMTP id 38308e7fff4ca-2ec56c86e29mr417241fa.12.1719025668671; Fri, 21 Jun 2024 20:07:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719025668; cv=none; d=google.com; s=arc-20160816; b=PDEkFjsRWVTSsFznx2RzjW/KWU8jVkAAkp6ek9p536TJo6D6fmptpBFG73xIzqzlk5 uJux1lGmQlC9nYvvtmuSIMWFeL6UB4gur2CjQluAHA6TAa5End/Z8szDKlpjAKjw6VQk RVUWWpm9WSiaVrcCzqbMeSIwR2dp8cWiXFn71qNxXJjJszCPk3I1bIf74uo8T5PobPBD xWUGID+OaDIKa8OOXKmmgouE1koEQocVgr0AHUIINq+UGpAC8FM+mjeCamitVVUE3Gpq wakU+Uqx5c9qUiC1dhCcLlpo1mDUm60jaezP0j7V3RdrsWNj0b1PXgUH/koISfobnAPd mBdQ== 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=XL8ZDM5lB3aLBKPZui33b06JflZjMccW6bJEv3yA+mM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=OnTG7syCZPtTyfPKptx+0A2/iTeX3S5UR6f7+SIGsZj1ZHq6/Cp3TlxXN5g1yGkyDU YzEukjy4dAHZbFaC/jcnZ96mjuPr6vumacbVobqyN1yTf6hxrRywHmYufy7oZQfngbLd T83IGezewiyZzI5G477iiShopbXKHuGVId8I/zEBRWnHqTtP7HSxyPaU+jAEYYmkhKIB A+jFVatVv3yM2sapXmLGnQtXbHsuINRKWl6QWXnRn+l9qjbiYZj7aLCIBWNMXQ3oSeST BpZDu9Im61nx/AeRcK6lsLFb3/S+Az+IdgsSyov8ti8G7kxe90qqg2+n5zKg/zQvmauV /rxA==; 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=jtomL8l3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ec53acf0dbsi2702531fa.210.2024.06.21.20.07.48; Fri, 21 Jun 2024 20:07:48 -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=jtomL8l3; 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 D1D1268D128; Sat, 22 Jun 2024 06:00:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F09AE68D6A7 for ; Sat, 22 Jun 2024 06:00:02 +0300 (EEST) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3d22378c59eso1477806b6e.1 for ; Fri, 21 Jun 2024 20:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719025200; x=1719630000; 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=Bp7K2SC09TsoLvHBIg6rOS/6bibk30cL37jV1NNYi7I=; b=jtomL8l3+tapcjYiTmjEZBmDn7OpLeabpoNNmHqTQjy4SV6YkJOn+vpqS/sIalDkWp SzCH56yNUmyQ8zhKBGZYs1fsngPYIBBuBYu6abRtWxkBQiN42MLds7BONZMB3Aazubm1 Hkr+CZ50nGITbskwQhANYz5oZkIL7bWP15xebN9C04ioA6vzOGvNHINVkXhqVgPj+P3V PZROVP34L7G09jV2GlzkMJQbx6AyscBVSLDUpg6heJa2PCea8ndoLF4h/O+/y2KRTC5y gAG1XzVOJOXaxm8ol1o0/JW/KxXa/K8hTBM9VUPSTMEUgA0lBcTE6UXf2FDFnVK3M7Qf ZooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719025200; x=1719630000; 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=Bp7K2SC09TsoLvHBIg6rOS/6bibk30cL37jV1NNYi7I=; b=F4Lvls4s0Ea9U6rfgscWENF53Yj7njnhlGklIjoOBFDeoAdw6DKB82n8XOO9Lmbceq Mlto40Me1rGyYj883l4rDgM5NMDvkX3QrXu43Agcm3wcnTiZTSI44DT5A7onBE9Y7gkp dw1Z9Ixuj4ivU93AwtXNfS86Fj+eWAlcaxcNNuFvAV/Kc9ev8r+KOPdtmvT37H6oOFEj XZcXyElr4/NaVLwE0VBya0ZcRAeV/B/Cn2lxRPR9gSkA6pMf3vNcaX8stNo89wvuWnFl WxXDo00AG7Crlk0wEja5P7lRsiNK2ZsVuLl0MJVl3bvbmxLDJk2/QbvXWw1AvK6cIw2H +Zgg== X-Gm-Message-State: AOJu0Ywq9Wlb76IuTqe7RzEawU6N+vOT+/ySRr8CMUljHqYAhF1zMlrw sfN1xsVJB7SkWjaiFc3oou1YufAM43p9T5qMe3vnp0+l12USwEpYqDA7Sw== X-Received: by 2002:a05:6808:181d:b0:3d2:2230:ecf7 with SMTP id 5614622812f47-3d51b9ad5c8mr11480162b6e.26.1719025200228; Fri, 21 Jun 2024 20:00:00 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7065124dd03sm2132236b3a.113.2024.06.21.19.59.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 19:59:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 23:59:50 -0300 Message-ID: <20240622025953.7951-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622012531.5523-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] avformat/dump: print Stereo3D view only when type is view defined 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: bSq55Qi4PI8S Signed-off-by: James Almer --- libavformat/dump.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 61a2c6a29f..33d72b7e18 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -259,9 +259,10 @@ static void dump_stereo3d(void *ctx, const AVPacketSideData *sd, int log_level) stereo = (const AVStereo3D *)sd->data; - av_log(ctx, log_level, "%s, view: %s, primary eye: %s", - av_stereo3d_type_name(stereo->type), av_stereo3d_view_name(stereo->view), - av_stereo3d_primary_eye_name(stereo->primary_eye)); + av_log(ctx, log_level, "%s", av_stereo3d_type_name(stereo->type)); + if (stereo->type == AV_STEREO3D_VIEW) + av_log(ctx, log_level, ", view: %s", av_stereo3d_view_name(stereo->view)); + av_log(ctx, log_level, ", primary eye: %s", av_stereo3d_primary_eye_name(stereo->primary_eye)); if (stereo->baseline) av_log(ctx, log_level, ", baseline: %"PRIu32"", stereo->baseline); if (stereo->horizontal_disparity_adjustment.num && stereo->horizontal_disparity_adjustment.den) From patchwork Sat Jun 22 02:59:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp884648vqz; Fri, 21 Jun 2024 20:00:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEagaTdxx7fiWGZoJ222ES7y1TyZZ6V0HnS2mvsMg/OlFiVywoeTk9IItCpwcWkichJxYTZnuOrQgEbA7T+k9Jx//gGf0SHUZDzA== X-Google-Smtp-Source: AGHT+IEjH2cnDbkJqJQI64xQdz/jYWt/PObYgu8I78NqiktVTP6rDDyuxjiUmuQkTtzhjmMBPTpS X-Received: by 2002:a17:906:c78b:b0:a6f:64cc:ca2e with SMTP id a640c23a62f3a-a6fab647440mr646407066b.44.1719025223286; Fri, 21 Jun 2024 20:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719025223; cv=none; d=google.com; s=arc-20160816; b=TGFkU9gwtrpdNVRZXqXrMrFO/7fm8W8GqfElkY4nyKge+TDbhIUzeJaXsMplFNfBtG YqrbX9dXYwrCQ51voBUvSFhgwa1QfjqosYsCx/EW7oAWg1XAbM+YWZIg//QmqfL58bUN niuRAn5iwnuTG9esDRtFsIj5iY82YUEsjOBYUb/zHGcmWpBIJVnt4WpDIkDVcTNCfZb5 9DofD6Xbrehrt6x16JTUpqY0q2l1gMgnEAFcfoMmHLYwv5JTdb9flmo2h1DubhEMYQR1 89ZJKdL1zNby/Zd0AJ51MSERI5A/x+6hmu81COaDtzfad3738CKYzI9MwvZwgiOmYp6m gQUQ== 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=MEroRE6xZ6HgAcW5Dum0boBvUuhMUsmeC+RkSd3VZiw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=aBH+I5HY/SNulb/Txs2TqV0csoYD2XHjMFOONocO/K8BUPPC6bJ26OHySR2/wzPXFd xyhQh2POGVyDaGVgFkUFlJh35Uy8Ql2bZLxy6z67BF24BILM/NpJ0ILZ/hjeyPEG51+B Qy7Ry1hrLFExrDlP438aQfGx59Rjt9jw5Ox0aghPyYe27kyz6Ae7MmmyY9+3s5qLOKQe 15w3VKMvTccG8eVXefn3ty0yZ8opc4ucwZZn/edbzjmlYTe0IlXFly8x2LIhM3oT6pbF mTOnM34I8PxtyuPgDwPOoNIOP45GfUtM334ZbT8NDRAzSKXscZxmZt/Dv4+fIi5KWz8P FmDA==; 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=mALKMd4P; 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-a6fcf579337si139221866b.741.2024.06.21.20.00.22; Fri, 21 Jun 2024 20:00:23 -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=mALKMd4P; 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 B192168D731; Sat, 22 Jun 2024 06:00:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C2E968D728 for ; Sat, 22 Jun 2024 06:00:05 +0300 (EEST) Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-6f96f8489feso1402578a34.0 for ; Fri, 21 Jun 2024 20:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719025202; x=1719630002; 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=uBVkSWgJQ7hxhQvvZKdnMrMJSox5bjDYEobbQkYuIAE=; b=mALKMd4PwNx1Fmsxul8FF17ZOIFhLEvj85OXdNoP7j5Sa+joYrgrijTsCmJaOw7E8W Wbbn9yO/f++NgfwbdGKAMdWL0zBBboWzWVT00mv3MjonufEW0YQzQKKUcBUZvdk0XeZn f8pGFXmCg4H3182/9gLXIkp1jvKzi4FG2+3/u6bnxT1iN3JlBbihFVDtWT7g6D7gKIev 1maXSIncqqGy4t75/4thhctd0RhiE5Ld7NrLJlzaKLag4NeZbdYasJSxlJC3fMp9MnSm 5wB5xABmeIVu1L2oXyGv43Ff+0NlZmX7idGUD3vRon6RwMsQtbYBMLWngk9xcYpaKN0a oABg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719025202; x=1719630002; 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=uBVkSWgJQ7hxhQvvZKdnMrMJSox5bjDYEobbQkYuIAE=; b=CRtab0lw97Qancwep1qioTCxgwbewQPBckk5FS5mvOgKALT9BUBDvYouw36LsnbfN8 yiugt4Qh43KDbqY0eYnMzTSacslN4h7n5szyfVAtww4SZMPTq39aAleZls5wFrgoync6 AjcnmaJcHq04KgnYc1goQ5g+Zz/oCWEDnz58z/8FSfCIMbk6ASYXIFWat7nldP4tUGAG GLu/XByAKe51tPWSR4rxBwvUR6V4sNprXq01P3fqnk6f5BF0wcmYFfLeJYGIP13LscmB Cuw66cbMGkJMI2t8KlYsCuPzmGk7V+0dqF/jnIJSV9uFJFay6n56ptF8kEDBmE38qg5g Lvqg== X-Gm-Message-State: AOJu0YwhdvGo0o2aUzjgY6LIN8FRCm5d50V6f2PbkRX6heldpYTyzwzl XCAB3hMHTLpok/AxwRKssz+mHm3smpg3jvh9IQ4Mf6bEGn9bDcXPc9wDNQ== X-Received: by 2002:a05:6870:8a29:b0:255:2cc6:db59 with SMTP id 586e51a60fabf-25c949a4384mr8819678fac.22.1719025202042; Fri, 21 Jun 2024 20:00:02 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7065124dd03sm2132236b3a.113.2024.06.21.20.00.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 20:00:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 23:59:51 -0300 Message-ID: <20240622025953.7951-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622025953.7951-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> <20240622025953.7951-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] 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: UBcnowPelxRH 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 e8e5030db9..c182b18e52 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 e3af519e03..31167c14fa 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -251,6 +251,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 02:59:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp884688vqz; Fri, 21 Jun 2024 20:00:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUeVIhN2HSkU5WA15YmQqVpJzbElr3Q3PcqPL9w5yeqG4Ar2kuIWsY/4ye4gzGGatTw/1/z8Y90igQcQE0nQlrsSJX2erYsQXmNng== X-Google-Smtp-Source: AGHT+IH0RiBThJfPJnAn7C5v1EYS6RlHf4rlQKPI+mTGd3wOOk/iOWSFzWLaUH6C+e54Ck1XPsrG X-Received: by 2002:a17:907:1b12:b0:a62:1347:ad40 with SMTP id a640c23a62f3a-a6fab60b7d1mr656738266b.16.1719025232193; Fri, 21 Jun 2024 20:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719025232; cv=none; d=google.com; s=arc-20160816; b=j5dfHIbIYcqzV9W2vPfAoDfH8Vbq3TfVmLmAzNuGRospprDpXnMtiigqG6IkVdero6 nYlSIXdL/G0GbKypkURiKOLcHKyVdArmwjWXnNxCrmidAYvqm41U3Q17nvr/emAmSmY/ W2q9AIvlMn8UZLhGK3FgiSdvIcn4n2pivkj7Zvap5KVjtwBYj9vxXdc47Z4Rldtn72PV lRiiwe/H8RyEpbyQZ635ZnH1ljI+4HIZ2ii7xQj/XaRtkfFQmHpbBZ7IbaXED6Xvuwax QPNYaA3PIbEDrPAJJoOL/gcdel5kxSqu5lariz2AND11jpnAyrrZjGWk4htAhsnWyI1V p0ow== 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=yLN/DTNTg/CmtP1lmyqgLEhufK/WLR6PRhWL7VX53+8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=e3a6BHdyEh56NKjL0WoOLQmB7JT+ygY7+1pK910gjMmnmShJ2nlTfW3VZ5/8AYie3x XcTRIP69Q9wqhAphpKXiva7ttr0cMwUIyff0mXUWhhQ2LY8cEHabzGTC7OmflrdTCZuW Spr8U+ZVSn6B+N9+U01lhYVNa3soAPotIthYvIMBLZ5jngi/pZ+r4kI/tHwK/MFYkW3q 84Qp7u2qKRuEsjTpxChT5WDhLwnESb/xTvjYI/iloQ2cYBYX89scLkCLc0w79gDvPbUS iN/V0WtzyNyxz3rJJv0RYxqT5VrCUUXIgSR/NCNa7QqYYmXPzJ0wmebPUUbIEaiAhWfz RRaA==; 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=SXu5s6ln; 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-a6fe8e45802si12302366b.530.2024.06.21.20.00.31; Fri, 21 Jun 2024 20:00:32 -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=SXu5s6ln; 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 BE79F68D740; Sat, 22 Jun 2024 06:00:13 +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 E564168D6A7 for ; Sat, 22 Jun 2024 06:00:06 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-70436ac8882so2163310b3a.2 for ; Fri, 21 Jun 2024 20:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719025204; x=1719630004; 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=l67hT/5zUzPy87UImTiPB9M3Y/l0EQgISl0PO4Qn2jc=; b=SXu5s6lnNDXckebvyWJL3SGfDTGcoTomLlWPDeaMqsZv8H5/Nj84dfLeC64qCJk+5l 1g2+ZonMr1K5DNj0d5sOtTmPuMgrjsVCTbHGRr6CkAQ+jEeBqslmvxh5fva5yOM0m17z YjzcONRTWkkBHlw1DIcemxC+rc0N7mfib+Ocq7qiKFg/1RlpJG8t/igtn8x8w+Qk/MH9 3/lj2lPhbWTdo8jsoQ2RygUC8rMN075cjc4/galPiVKgsHi/qFTgeod4jtIvDylDXUI2 HE++z/VWvCbuhcIIciBnGKWRDsP2jM3i4qr7jr7vwzGFL2Ua5VKJWKyyiRJeKssZy9zD MP/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719025204; x=1719630004; 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=l67hT/5zUzPy87UImTiPB9M3Y/l0EQgISl0PO4Qn2jc=; b=Bm5czFGhTqDJt3SJMJbftKhf9K8+/qBTlYM1LiJDZbE/7aEKA/ryo8DVoG2TNtgIpv F7KkUiXCT+E770ptlZO058MhyhrArX8bQWus3yDQTaxtuncd73ffD8cMBj2j0ax4Ajja kicbJ2hPE7eIrtLSVGNnE1jn3xkM+0C0fA18idrkEmdju050I+C3+snjx5H2f2i+s3JZ m2uj0xncP8yW2Hv5MGTQvcipsGvCyR2mwNIFLdVloTLEgMBkFGTsuPmjHAQinh+tluTA z1cQQKU+3dW+KVqRKN8wzmNRobMxIWOWB/WhKTMqtfX3fnU6n4DEC4IdLMApcCIZ7U/f ow5A== X-Gm-Message-State: AOJu0Yw7kFgJM7Al6Mp0Rlf0qJUY470Ux7t+cxX1SyrKbCEfJO4Unb3N VdFAhQBchDBbAlO4hLEuYKmbpxEmWSENdw3RhTGdeEfoW+xPrUse9yu4jw== X-Received: by 2002:aa7:8206:0:b0:704:3678:3f03 with SMTP id d2e1a72fcca58-70629c15227mr9521509b3a.5.1719025203932; Fri, 21 Jun 2024 20:00:03 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7065124dd03sm2132236b3a.113.2024.06.21.20.00.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 20:00:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 23:59:52 -0300 Message-ID: <20240622025953.7951-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622025953.7951-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> <20240622025953.7951-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] 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: o7bHpHyxVILn 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 9b2ce1f167..07c0ec3ec4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6332,7 +6332,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); @@ -6695,7 +6695,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); } @@ -6782,7 +6782,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); } @@ -6831,7 +6831,7 @@ static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_ else mode = AV_STEREO3D_2D; - sc->stereo3d = av_stereo3d_alloc(); + sc->stereo3d = av_stereo3d_alloc_size(&sc->stereo3d_size); if (!sc->stereo3d) goto out; @@ -10032,7 +10032,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 02:59:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50049 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp884734vqz; Fri, 21 Jun 2024 20:00:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpQ63VFTbnQ+MBAyddDymKWKH6f9v1xV8EZSsnqueuQNZzkn7bYX759a9L35D7FY9xiiAYjX0557JEkiuGKPdYcUA9oGzgr0cs1A== X-Google-Smtp-Source: AGHT+IF2mTd7GgZbm6EWoBcM5PUaQnhGjMNZSTw+9TQvkyLn9LrysTntdva3WJjVO/fohrRZxQ8i X-Received: by 2002:a05:6512:131b:b0:52c:8e00:486a with SMTP id 2adb3069b0e04-52ccaa53dc0mr7861819e87.55.1719025240701; Fri, 21 Jun 2024 20:00:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719025240; cv=none; d=google.com; s=arc-20160816; b=0X0Dr5ISAvQBvfrMzYMjZhLozB7m/lITrvi8XSlC869WLgHM342JBcXUdfAEDui83W VNzVTq0qdhlfEtJz0DMT7eHzthS9N1YKc5wyS7oAd8CIeAbpZ5dwolH57lKx5HSQNLuS n8/aLUn2VhUMa9d940yaluK5Me7OPUoC83dYqtO+JCBKc2YsBCuaD3TS7TjeQzKLLa1e 73iSudb6cI/fMBwy5HD6IGlhBfbLzxcUTsL0fNCzhXr7dsWyMRdhdpFEU2pBR2QvoLU0 3oX6NEaUmHMFfnDtz39cEuAkXODa6bdfUDGgtp3jF1o4E8MoKtEdrsjPGsQzouo5Gfkx /nwg== 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=j8oX8SIXIKcNNuguXqDgiOnNR9YGvDydMYsgC52ELLk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=iisxWjF4IP7huvStfUEHykVPkGK1u1F8MFEmjsMrSxu/1OJuKcqo1A4P2T2sB7e9O8 /pF8pYYw43FqC+mdzSqfbfuz/2EXh7yq+uLeqW4UFkCGWR4FRUtwqJy63PzQ6ruwRnqc aMKRoLe7Zrm3C2Q1ILD5uMPGZxDqp1KTVb9a0NtoHx1gSSx/3zbc8i0cs2eUciWWkMFT x3uZkor5FWnvmhkXu8K99PRjemFibBD7ZUWwGjoQu63NbjYTs8oyb8X7wx+R2+aJjHAx eOuM5WfDDeucJ+GvNrjteI/QaKu7jsw6hTE9YzhsI9iYWYEvAy3ZpzJbw/5tpm6bGmnW hlgQ==; 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=VV0Nyq4E; 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-57d30af4726si1332858a12.516.2024.06.21.20.00.40; Fri, 21 Jun 2024 20:00:40 -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=VV0Nyq4E; 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 A2F6E68D7CD; Sat, 22 Jun 2024 06:00:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3DA268D715 for ; Sat, 22 Jun 2024 06:00:08 +0300 (EEST) Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3d23a0a32afso1301969b6e.3 for ; Fri, 21 Jun 2024 20:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719025206; x=1719630006; 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=3WHZ617zzThCSDoqMw1BEkjPuMhVKL7o5R5/x29PtHw=; b=VV0Nyq4EX0Nx8327V7yk+Dw1o+M1Qnwx9uZI2uBeYL0JH5z4pe2mpyCZLr2roDAgEa 31iox0hfkIV6asZlI7OlI3+UKzYGxYpsXfZIdrqPP+xRntCNjQx19rC5VGyGVH9dsyZ8 XP59PJN6MKM1EpFdi66uhEWVh87wAgLe+u5IIz9qMaTKPitD/U1IH4hu8MEjHZ/EhZb5 tIoW5Dgzwp71/NLSiuNodOB72pRKG656jFQMQH037J/O9m+zXSlJhCdsDLNa1mBoSMyU zJRIJFVfvzDuqXQl8gV3c/yJ5x4vQFYsuw9/jugi2E+efVuO5qu0Xf/DkScn2+1stDvy 506Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719025206; x=1719630006; 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=3WHZ617zzThCSDoqMw1BEkjPuMhVKL7o5R5/x29PtHw=; b=Q972rIorG89HB5BnSaJqhftX5+UrEEXye/s1BMIQk7HcCMjXrnbsAzxNWYvQHdkwHX 8jv5pOqTPs58JPO8oWe6HmAD2DisSfMsYzS3HV6MHdFzCvM14QDx9kS2Rd2PTuz6BiY2 tf8S1BGJy3FEeR33w1uoC9q4NNfok7pSrmfkbMTXJiJvauZ7Udy0shvxCnty3MRcaG6q anezgknztk/ZbV/tXRIbSAmU2GJrC0gOvk/HON05rPMLLGrxdONKYsqWrmKKmYlMcpz1 rypzbX64BTAkYXI/Ft/37DMv2H5Zip7WUB8bmE0UUwdutG7f2T3AyPhlxud7cI7YSkQu /+CQ== X-Gm-Message-State: AOJu0YySBdBmyKG/ci9Ag0NoyzENQjl7x6hSVOEt+4OQVN5UdQp0Iqwl Pv3LXbzQsPKxqz3sJfJDu4b6q5Ny2l3RcIYrq3K1htOVwJ95EP7LTI3WQg== X-Received: by 2002:a05:6808:1707:b0:3d2:1bb6:88df with SMTP id 5614622812f47-3d51b9bc10cmr11754004b6e.14.1719025205832; Fri, 21 Jun 2024 20:00:05 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7065124dd03sm2132236b3a.113.2024.06.21.20.00.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 20:00:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jun 2024 23:59:53 -0300 Message-ID: <20240622025953.7951-4-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622025953.7951-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> <20240622025953.7951-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] 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: 8QyYJ+Ja/qAi 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 6bc5fa621e..d1a135ed63 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2253,8 +2253,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); @@ -2262,7 +2263,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); } From patchwork Sat Jun 22 03:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp894125vqz; Fri, 21 Jun 2024 20:37:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXceV536/LCtbdAzQ4IpzxLxOkkPIQp/n4OXgt6FKv8FbGNLcGo4h4y2ltKIZOiGv0Mb1FjfFLQBfvh7LSGvka4bBHqwdsBpmgLeQ== X-Google-Smtp-Source: AGHT+IFQ3UCyaa/uA3F48749Ej6yrCv9JNnFtsI6+QZp7rdQc5knbCqio0DfDSIY8adS80CVj/Lt X-Received: by 2002:a2e:a176:0:b0:2ec:165a:2254 with SMTP id 38308e7fff4ca-2ec3cfff3a4mr57102231fa.44.1719027443058; Fri, 21 Jun 2024 20:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719027443; cv=none; d=google.com; s=arc-20160816; b=mFeS19U9ow/+rXEYrxAnBI0eastf7dp7nkDJumD5EraOQkwAyBAd8Xdhdzz7WR6Z6m pXemGr98JiNcgbRILygIv14d8ULnUQjBEpltNvX/ES/CvIgkYk39lQB8pIb03nXXmvui B0SWuxD1lhZX5YJB1R4hsZP5D2SBe/pn+A42RIo8XBszOIzm7Kp8+iCplmvMF3ZyAaes J8L0N7rNxvdN+tIxUwY9lv3Zt2LK4b+EbrWOkM90DJu1XkaqUX7r38uN9qFGHE+o8SG7 WBQwEQechAZ5NFW561rzDCtVrJG4BI3V3FWevnJHEoy6vv3geTcLOFE5T0w6JsZPCnP/ G5dA== 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=sXssqj5btseGmkgGSWYWsUjaQGis6fqT3U9NrtQoUjg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=C5e3WMMys7cfUjoTcK0sSmDf+jHHbcC2j+iMqyWtqvkcdbuW4wqLKx5+3x7hEnVX5x RX1pfrjbpPU+XhPysJ1db5Pi4ZycCUn/LNud3cj7uIzrblxxaJBYxe3Pb59/u43Aageu ONkyOqt09hegWwg095urxwF9xQZrRA6VnOWcD3bIv7/OXLJ4/SrN9v08Yb7U7qxsPEwC 3ttgfYhONCYyTs7qv9EX16LT70miIgwvQ7KnOaFcx+KWCwMYkVFkgeWXtWXF8VxurGHL W8v1SyxD21/A47qErWdiqVThR4QG/Pg725IQJYHYIfDp5MJV0/2lsx0NU9hq75gK9iY2 CvIQ==; 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=TNJu4pHF; 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-57d30af4355si1288555a12.499.2024.06.21.20.37.22; Fri, 21 Jun 2024 20:37:23 -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=TNJu4pHF; 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 B718568D470; Sat, 22 Jun 2024 06:37:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C555B68D470 for ; Sat, 22 Jun 2024 06:37:12 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-6e7b121be30so2022175a12.1 for ; Fri, 21 Jun 2024 20:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719027430; x=1719632230; 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=4/O60/QjjfWXZSSJo2duXpmVwDgTg2XwYtdEoR6XjIc=; b=TNJu4pHFzjEjYy8Zv5C8JYUr5F1057n8VfCwTZ2HT8zJFZIS6nbHMtZgCy9X9AB7dj 3doYMhuGKNvFPLR3Cm7RBxSGo1hr8O7HSEGhS3TDw3gv9TTT2rouc47rW/3hlv6an1Ld 2NeYB5VKffJunYDlom8bTNaHd2T8hi6aBiodQ89U9p+dW+YF0Ar1bmnrutL90GnS2HvU YeGNKfCpLijsPQhGKSH6xK7ZPwHgSgME+Andea/SoVsZtILQ/mAQ5vkrk86PobC2fyU9 Nwx2fbgSgXyeJsRk/rre+PRbHXoYGwc+efm0ezTFr72bpWs0OmJPwyqEjbCdMiZQjwVJ IoRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719027430; x=1719632230; 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=4/O60/QjjfWXZSSJo2duXpmVwDgTg2XwYtdEoR6XjIc=; b=v3Ldx453Y9p2yPL/na7Cr6Yn7zRWJhd9OUABoK3DDHxSTInOesJiUN60j01AESNxfd KH4dMe8etIiut4XMPOg1045ryojLi/4OUAEbtg4fM/NhCYh3GSlf/0Wc/u0W2+TAC55J UaHzf8WMgG+8mgvN98Tz3MWbKBeSWJN2fuAIIL2LrM1dwB8stpYIIkSjjrqb0ckD5CM5 W6Y8nUmQ0IH6W3J3menDs9/0aGOq15xF7GYN7pFCUPayX7K2/7JteZ4WtRt4ac2paIHR M+NKQSFV4JW1idTGZ20twowNbDK+RcZt+VIYj5jvfeMBg4p3R/DRcnATpq8WLqN9l3w/ UylA== X-Gm-Message-State: AOJu0YysNzbaw1MYRCMr5vECrtKDyATmCyHV0KKlr9x/03FPI4TGpXHq iReTYkXDOZ3zoBExB7gvqjDjQ0ou7PZR9QTkDzd0eLHoZ0r5OZUjJdY2qQ== X-Received: by 2002:a05:6a20:2a2f:b0:1b8:6ed5:a92 with SMTP id adf61e73a8af0-1bcbb655bb8mr9541982637.39.1719027429652; Fri, 21 Jun 2024 20:37:09 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f9ebbb29e7sm21495935ad.261.2024.06.21.20.37.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 20:37:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 00:37:01 -0300 Message-ID: <20240622033701.8987-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622012531.5523-1-jamrial@gmail.com> References: <20240622012531.5523-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8] fftools/ffprobe: only print AVStereo3D.view when it's defined 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: B1rjAapi7ERi Signed-off-by: James Almer --- fftools/ffprobe.c | 3 ++- tests/ref/fate/matroska-spherical-mono | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index d7ba980ff9..f9124ad5d7 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2544,7 +2544,8 @@ static void print_pkt_side_data(WriterContext *w, const AVStereo3D *stereo = (AVStereo3D *)sd->data; print_str("type", av_stereo3d_type_name(stereo->type)); print_int("inverted", !!(stereo->flags & AV_STEREO3D_FLAG_INVERT)); - print_str("view", av_stereo3d_view_name(stereo->view)); + if (stereo->type == AV_STEREO3D_VIEW) + print_str("view", av_stereo3d_view_name(stereo->view)); print_str("primary_eye", av_stereo3d_primary_eye_name(stereo->primary_eye)); print_int("baseline", stereo->baseline); print_q("horizontal_disparity_adjustment", stereo->horizontal_disparity_adjustment, '/'); diff --git a/tests/ref/fate/matroska-spherical-mono b/tests/ref/fate/matroska-spherical-mono index aa17e9c624..254bb9903f 100644 --- a/tests/ref/fate/matroska-spherical-mono +++ b/tests/ref/fate/matroska-spherical-mono @@ -3,7 +3,6 @@ side_data_type=Stereo 3D type=2D inverted=0 -view=monoscopic primary_eye=none baseline=0 horizontal_disparity_adjustment=0/1