From patchwork Wed Jun 19 18:24: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: 50020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp408452vqg; Wed, 19 Jun 2024 11:32:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUPwZv616eN4GRsG9qBremwhWCWXjbESnRn9Ff7nx3lJKjcmKuxDzO5cjD2QkS0v595uX2oKhnFp1HOo3FwPSKIj4Vzi/bbrjNaZQ== X-Google-Smtp-Source: AGHT+IHY7YEBhw7Sp8BsKOH1w3VXxnFlLy5+poSIntD6gtcAq1B2IT2xfaBLEf603hPKLfcTliDN X-Received: by 2002:a2e:8199:0:b0:2eb:da20:7b3f with SMTP id 38308e7fff4ca-2ec3ce7d3ddmr18841601fa.1.1718821965290; Wed, 19 Jun 2024 11:32:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718821965; cv=none; d=google.com; s=arc-20160816; b=wLV+8czw3YO+fCsi1ylCSXx5wfCgPCaaOYKl5HsrLrEduvmDINfs1p7jQ9x8pKz8cM HVsir++LF12BYXVj12bvj7WZlh+0Tz2O1uVwO97zxybFCi2i9O2TglNu83YHX4v+Y2mb yKNEGgCUaxLHztm7W35anNGrFVydCdAgrXG0X+giPYC28WEA6u85viU5yuMlccnMhu5q fXh2Pv6+EkgrDs2PiawRscelPNnqeGM+E++aY9iAHv5UPtp6S7Kw8sAY6Dxdyw5LO15A Eh4KPXzukH3NFQN/3U7noLgQHmWjozbmZfjmMAsLWrWyIY7mgGvPRwI6ol/l0fbBtnpf 43nA== 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=AkumWNhjndOS5iI4Ru/ZGgo23R8wrD+0y4mWooWHAAc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FV6eqB0ada4X528nSrfkcDOIHvmNFvPDXeWgADJKeaPknPVtsJU9MTw2dxetxVdr2G 8T4fZJvVYJBmTVUe10nu2hfsqDfHVLR6o1UrDf7E6giu7qBPGRHpArABqru7BYqz2Sts OXTtgjdWGSPgJcP2RzEbeQJJpiqC/u1QX/Pfl/aQoz9GKMWxvbrg1EyB2ToTUZbgyy+T 58fHM2jn7ZJ6a7EXfp7dK0UwMs91TqXTdy9Pno+TELCUH/K9738V0A/HQRmwn836fdBY 0d9j7c8z4KX2xKzC2cgPeDh8aNEcOGYDNwxeejKhTf62N2lHGTSRIsRpgqt4f/OI5T0J 5D/A==; 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=GbvXScZb; 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-57d0331543dsi1407636a12.591.2024.06.19.11.32.44; Wed, 19 Jun 2024 11:32:45 -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=GbvXScZb; 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 1ECF968D83E; Wed, 19 Jun 2024 21:24:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01D7968D691 for ; Wed, 19 Jun 2024 21:24:26 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1f480624d0fso386055ad.1 for ; Wed, 19 Jun 2024 11:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718821464; x=1719426264; 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=0d0HfZw2YoJZgnWKWwU8aOvIMApAJhifHNpUmg3UJN4=; b=GbvXScZbNB/6gmHMexUgtu29rg94MKZUUOM+SWK7IudX0kbPhKudcd6oyq6XG9b0O8 /GLM99SH/MRdIWFY3YEQWEVlRk/iaSx1u+/djYPzLIL7sPrCA6TWbWSNdGIICu4e01La vpIRH5g992ceE72GVfu98FrlfLbPcSM6W3akE8Q8zlFRjPRLR7D54dUCZyMd53VakN+R 39HMJCbaoO51e7kgv38QlrvClBLesgwvuZecKb6B4IEAjn7iCDbHNOl0X7Tp8mMPic/A QKx0lb0+FClQybIXK2G0xa41gSzmLxjJEQ1PgIVJtWeNHV0L67dYQ3qek8e5SXBKAgMF ldRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718821464; x=1719426264; 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=0d0HfZw2YoJZgnWKWwU8aOvIMApAJhifHNpUmg3UJN4=; b=R8MN5T6PS9kxV1e0xyNE2E2HobFk49E2vVO1uKx0sLjJbjXiZIYbV6y3Rx9ToO683t a2o4lc33/UDk71tHc3AvXLfP/oXOWLsioW9qhZrkpm+7LV4s2dojjQxAFUv50wOlVCfj sNBQE+4an6RvL2uTh92+VjU9Wpd/0Ss4osnF86gN8807Xka/ea9IQ5IKzT8Thl8WfUpy W6JrHI+5Q2R9/O5o4iFfe7EEAdpHNAY50eGkvy0Ppc0HZfCeJBuHaf4WyWjcVqnqDKmh Oc5dm+sBhLhEZE51JPK4tS98IB06z0+A5GijhkRijVfU5lDDTZ/CeHLlFAYvDh6D4Erx bmIg== X-Gm-Message-State: AOJu0YwOaS56//aITBIxxrx+5y3xJY6Y+9l9yECHWORuU7a3/1q2PYvK R7X5rWyC11EvezTxbzQGjXRMoSxZgmtfUNKHBITJrM6L08I9V6ru/ljDXw== X-Received: by 2002:a17:902:e54c:b0:1f9:9691:7b9d with SMTP id d9443c01a7336-1f9aa3ed80bmr37501135ad.11.1718821463736; Wed, 19 Jun 2024 11:24:23 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855ee6e7esm120363405ad.139.2024.06.19.11.24.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 11:24:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 15:24:13 -0300 Message-ID: <20240619182413.3247-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619182413.3247-1-jamrial@gmail.com> References: <20240619182413.3247-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mxfdec: don't use sizeof(AVMasteringDisplayMetadata) 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: QvxfV5nIxMg1 It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/mxfdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 852fb7e056..a5863445ab 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -227,6 +227,7 @@ typedef struct MXFDescriptor { UID color_trc_ul; UID color_space_ul; AVMasteringDisplayMetadata *mastering; + size_t mastering_size; AVContentLightMetadata *coll; size_t coll_size; } MXFDescriptor; @@ -1424,7 +1425,7 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int } if (IS_KLV_KEY(uid, mxf_mastering_display_prefix)) { if (!descriptor->mastering) { - descriptor->mastering = av_mastering_display_metadata_alloc(); + descriptor->mastering = av_mastering_display_metadata_alloc_size(&descriptor->mastering_size); if (!descriptor->mastering) return AVERROR(ENOMEM); } @@ -2955,7 +2956,7 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) if (descriptor->mastering) { if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, - (uint8_t *)descriptor->mastering, sizeof(*descriptor->mastering), 0)) { + (uint8_t *)descriptor->mastering, descriptor->mastering_size, 0)) { ret = AVERROR(ENOMEM); goto fail_and_free; }