From patchwork Thu Mar 28 16:52:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1468293pzb; Thu, 28 Mar 2024 09:54:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVp/3jmMHiJ0AnxkqTCJVg1IlzueoTtKlDEc0uuBFasMGrQliezpkWWPt9OjTgDrTg9N17Zi5qBVinZzN+Ec6ci0o5mixW+6Pikig== X-Google-Smtp-Source: AGHT+IGtH3Ld3PPywZ72xzX8Nws2x+G3sN+13DgByhL03IF9EMjiBieFLoHLFSTmnuurD0eVSNEj X-Received: by 2002:a50:9b02:0:b0:56b:b0f9:b7fa with SMTP id o2-20020a509b02000000b0056bb0f9b7famr2631268edi.2.1711644855023; Thu, 28 Mar 2024 09:54:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711644855; cv=none; d=google.com; s=arc-20160816; b=dLiRwQaNOUUrGILAY+YGB9TaVYwwxhRTdi7SJQsz9ynaSlaBbbrvAv14EuQkoWmzEv jlXx9cFV3H2GM7uvJ/GLn9gL+kCNPzOQW7eP+GNDWVCmJ+Svt0ht0hzGqByKUBFSRcKj 5PN12uwKSqSB7ZV7C63juSKWmCdJTPkzSWjYdSpRHw/yzA3RUSIE68Xb9AXHHVfRQ54A kJ9JKbsKEFYd4bgDDyYfEkZlq29O2GQ6lpWRsKd5vE8eFgiPK88jYu+P7n1NUkK9YbTQ +HENy/ZDU6PO9v5ZzUr3Ph5tyFAaDDYR/d2LTB5VKACyd22PUNCO7WfmQYHsiZLWRtHy 5qHg== 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=YgUKp8LFxZ+0EaUu5fH2E29oNpSihlb4qCOADwHyR9Q=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=j6/2D+Q9KQFxrhUdF8h8ZBNi3xsW161qf01GUx9j8wUQ6zYLw4r0E9kggfZVd6Ll3M QxBnZn0Yf691PNsWxM/VLDpj+pGmHBPjt+HRyCoDvrK5SKlhW6SSMhDvZiEwVgZTRj0P wHgGORVRbxffHcw1C7GINQW6TweW7gy+3N+rM27h4ldEUriKb59wrAjx3Bz66/xRuzOD V362wavjI78EfOl5sn4x5fkgQMUIxP4AR7EYnWOJOJwRSJfllC4QMb5vS2fCPBAfNcXz G1vbn7yg+OZKiWoxvPhMgJMzyOiUczt1hP388PhTrzH4ez14ywcKZnSmrz+qv8Gp2rSj +2Sw==; 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=Ijv1yszX; 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 u19-20020a509513000000b0056bb0275c90si920789eda.368.2024.03.28.09.54.14; Thu, 28 Mar 2024 09:54:15 -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=Ijv1yszX; 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 96B4168D724; Thu, 28 Mar 2024 18:53:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59B1868D707 for ; Thu, 28 Mar 2024 18:53:34 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1e2232e30f4so4799915ad.2 for ; Thu, 28 Mar 2024 09:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711644812; x=1712249612; 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=cdmDbmhRfwrLuF1ItnfBTleLfF1gxKeLPb/7OhrUx1c=; b=Ijv1yszXfAqqHCn6ABW+enRCfNLJFARlnFhCPitiezDRO0o7sa8HoCFzHiJ3tC+3Of hKBJ2vTGkbfnhe+D48nm6UZ1OZnorFiD4esSR+WM2VYpXgtb8j4Jua889m3JjlffSCK+ 6qmJoYnG3h46quVVcr57r7aLNhFKKJHF1ekybVeykmi9QpZ8VPoCUV/jhH58CVmAq+hR MGr2A6xDGOmdgcHO5+e/HR1OLeUceJ/Dq/GdgEtZNpsb5UzHjNcensdk28IM+0KpucyO 4tfnP7Q/lmfxEAFwOHJMESZexEN1uPfc9kajRhZwzx8F/Fw6Fd9PfswlBUu36UpX03Uv lHLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711644812; x=1712249612; 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=cdmDbmhRfwrLuF1ItnfBTleLfF1gxKeLPb/7OhrUx1c=; b=s+G1pshTEDiP75Zm4os4fkBcrrtpEZn1sQiIgHttgLuc6kcJrElY0oVh/ToKKh/ggK 06rgRnJAZnHdsJUnU3OjTEcij3oUNfA1FKrLxCRDN0z2h/Gm6WqO6IU6tXB/qPSh7V2m IQxB2fycPrDUJWCV3g0Pd1V4bE6xuSTd/PSc2KB4woGmrgXj+SuEtebbePu56sAOcuGd te+1dnxAVQ790TSjtBPftpXnnT7UUxxY03G3w5XX51rTn0CZiKNWJqOW54Zj24hkvO4z 8mPF9shyGXdNRQrhP4v8P1L+8vKhd4DAHsLGxYYoTOUVmS3dHhbcsbmc0DLEOoEiFZhc 6I+g== X-Gm-Message-State: AOJu0Yzt+ImeWOlxPCAuEsoM2kzdyJeHSMpUJQuyNYeXvI5Glk8cxCO5 +v7GXXrf/67HFmpCAsZrm8zjc76hqpuVPEwtiDRuEzBN1wIeYSKUsYMo6vUu X-Received: by 2002:a17:902:ba94:b0:1e0:c567:bb42 with SMTP id k20-20020a170902ba9400b001e0c567bb42mr2847683pls.59.1711644811745; Thu, 28 Mar 2024 09:53:31 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id w4-20020a1709029a8400b001d8f111804asm1822860plp.113.2024.03.28.09.53.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 09:53:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 13:52:48 -0300 Message-ID: <20240328165250.64259-5-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240328165250.64259-1-jamrial@gmail.com> References: <20240328165250.64259-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7 v5] avutil/mastering_display_metadata: 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: cGj1iAX901gn av_mastering_display_metadata_alloc() is not useful in scenarios where you need to know the runtime size of AVMasteringDisplayMetadata. Signed-off-by: James Almer --- libavutil/mastering_display_metadata.c | 13 +++++++++++++ libavutil/mastering_display_metadata.h | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index 6069347617..ea41f13f9d 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -29,6 +30,18 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void) return av_mallocz(sizeof(AVMasteringDisplayMetadata)); } +AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size) +{ + AVMasteringDisplayMetadata *mastering = av_mallocz(sizeof(AVMasteringDisplayMetadata)); + if (!mastering) + return NULL; + + if (size) + *size = sizeof(*mastering); + + return mastering; +} + AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame) { AVFrameSideData *side_data = av_frame_new_side_data(frame, diff --git a/libavutil/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h index c23b07c3cd..52fcef9e37 100644 --- a/libavutil/mastering_display_metadata.h +++ b/libavutil/mastering_display_metadata.h @@ -77,6 +77,15 @@ typedef struct AVMasteringDisplayMetadata { */ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void); +/** + * Allocate an AVMasteringDisplayMetadata structure and set its fields to + * default values. The resulting struct can be freed using av_freep(). + * + * @return An AVMasteringDisplayMetadata filled with default values or NULL + * on failure. + */ +AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size); + /** * Allocate a complete AVMasteringDisplayMetadata and add it to the frame. *