From patchwork Wed Jun 19 18:24: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: 50018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp404904vqg; Wed, 19 Jun 2024 11:24:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXRh5swxyAcfZlLph90QrRdDa4pK2qZ87sX71oX7Z8NhDgrx4a2REEU7VdzcpdGw0ro2Txlzm6olcTgVmoJ//feeEe0kv837Ef0w== X-Google-Smtp-Source: AGHT+IEG81hfYNB/v54UpYaflVqOWlaWgVzO9paWcEwiYGQqFQAoT9mVT9PDO91rBpPaOMzA8VwS X-Received: by 2002:a05:6512:3c99:b0:52c:cb55:9af2 with SMTP id 2adb3069b0e04-52ccb559b19mr1827516e87.2.1718821474608; Wed, 19 Jun 2024 11:24:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718821474; cv=none; d=google.com; s=arc-20160816; b=j9N5I+aFxn5yH4xzPiqwowQABySDOHq0hgI9N2sutF0lJWPeEYRN3jtJL1KzOGRYAO psV8P/zqmPiCPtBwe2y49oLmPz8Et4/jE5GMffYMJlJ+ZjOVLnQxozJGzLlQjae/WDBx 5QQ3Pf4CiitT1BKeZ/VOhmZysNXagdaASoeAeASd98JjDxgNl8zIJ/c58vqdi5+JO9Y0 kS1/i3Jp3iWFVB8GMjDpC2amTVQYNhglG+/KlDDqpNafHzGhagnCMexws5WBukPvPtMg DsN4SDVbImjk4f6qpC5DBtR14XjepvF87h3ARecS5V6HIDJl8QZnMDNgoly5rVIF80/v TsiQ== 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=+IQjGeJcdYvWi/n1zxYfDT70eO1O322U2e3Zd/L+v2c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WQIKZIpeVhmiesvDh+2FAKPMUURTeAiFiNsb0nblnZ+I7ryxG8bGBkf0wSQxq0YW2T eSpZUtbZw+S/pr2nwYG2BbRzjw4IWL6anpYIK5QuPT+5FBNr2yiPda2z47SKQ+yjUEet bNp03XEEaQNpvlJxcBclBmizw1fgcQ3QLCV6ST9T+T6xdgo1uB+u+trNZQVaDepRJhfp j762HAyxSrwg9ren1ltMGeFijYIyE8lZjxBYOzORylENKrQnbvV9Dksj6lLlQvakJ651 Ph8TRVUg0QXBNoWJyXXYro/2uxJrGY7VSbgCadcR+ltYnkH2YQUmP2Z87+DYHDqg3q5w frSQ==; 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=aIRPZpWN; 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-52ca2826918si4042460e87.42.2024.06.19.11.24.33; Wed, 19 Jun 2024 11:24:34 -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=aIRPZpWN; 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 87C9768D845; Wed, 19 Jun 2024 21:24:29 +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 5D5C268D691 for ; Wed, 19 Jun 2024 21:24:23 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7062bf6d9a1so100270b3a.1 for ; Wed, 19 Jun 2024 11:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718821460; x=1719426260; 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=SHYvj+2/kS/bzJMzvooqaqqOP2eyDSpC+ZMDt3yTL7c=; b=aIRPZpWNAZMBjvI4/aDyom6RlvTqBV4oMIAtQ4+wCWGrxppfLulBU37yhzONFzLNvq Ux0SbC8gPobRzVmO4Ex8PYiy3gXQk/AdADvAKnpqyXMUFIwtUzftJjti1KicLotzwWv1 /0O/IPF9FN06eYP4E96xZkmhCDD1h3EnZz5wlvFADr/+mz6qIsGCewbLfI7Mj65Nhe1N jkvDiUYzHiTgucCldZ121U/XxtLDBEeH7VmcK6C+lTncIfEP7jbPomzD5m9nx16gOfdt zJbTPbKTzdVWjwnwdv1d2gPNwuAHfNb9ZSnjfLm38xndg61/9RGkqbPsQDEfHFzAfJip wD2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718821460; x=1719426260; 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=SHYvj+2/kS/bzJMzvooqaqqOP2eyDSpC+ZMDt3yTL7c=; b=wCX6ZYRsxqhfT5KcdJ2vd/A/co9kWqize2N0l+TBNNIBavRjjry2Y17ilXPZdgKEvs nbRxCqjhiyhWe+QU4qWvTTUA5qcDjBkI1JCkZZk7H0OGCmKjj6YSympn/xXNm5C2ADzJ HUdmddzW8TyDYRnAane9tR6MuM4i/qE7iS4yd4B7g0M1DM2xWcwMqUcjpEZoeGKmf63g 0pwMPP5wLEyJH6nSdJYhV1gabPyey2n4y10SURTTBXfTIK/CASXXUaUSY5wWkm4Trj9u Qr6MtCFGvrkEJfKS9gdYPQ6suhaTuzaGywgoPHJTgXp0r/xjyPI5FAPZMeMlWFpJE8Ju xQ3g== X-Gm-Message-State: AOJu0Ywt1AbQcpFRxYSAVto3V8oE7Mog1gU0WpFzXqUs0XxSSBPUlNR0 40v5TO+k2SBo7pAPrRNVhB6cIUNdWAKpcmkDQblBEPxax8NOUqO2768DJA== X-Received: by 2002:a05:6a20:84a3:b0:1b4:2f6:62b3 with SMTP id adf61e73a8af0-1bcbb573a6emr3128374637.26.1718821460221; Wed, 19 Jun 2024 11:24:20 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 11:24:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 15:24:11 -0300 Message-ID: <20240619182413.3247-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/matroskadec: 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: 0giMR2s4WNAq It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/matroskadec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 328109b354..6bc5fa621e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2324,15 +2324,15 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { } if (has_mastering_primaries || has_mastering_luminance) { - AVMasteringDisplayMetadata *metadata; - AVPacketSideData *sd = av_packet_side_data_new(&st->codecpar->coded_side_data, - &st->codecpar->nb_coded_side_data, - AV_PKT_DATA_MASTERING_DISPLAY_METADATA, - sizeof(AVMasteringDisplayMetadata), 0); - if (!sd) + size_t size = 0; + AVMasteringDisplayMetadata *metadata = av_mastering_display_metadata_alloc_size(&size); + if (!metadata) + return AVERROR(ENOMEM); + if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA, metadata, size, 0)) { + av_freep(&metadata); return AVERROR(ENOMEM); - metadata = (AVMasteringDisplayMetadata*)sd->data; - memset(metadata, 0, sizeof(AVMasteringDisplayMetadata)); + } if (has_mastering_primaries) { metadata->display_primaries[0][0] = av_d2q(mastering_meta->r_x, INT_MAX); metadata->display_primaries[0][1] = av_d2q(mastering_meta->r_y, INT_MAX); From patchwork Wed Jun 19 18:24: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: 50019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp404982vqg; Wed, 19 Jun 2024 11:24:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNIk6GqJYgn0ghdu67NcNBJEJAoP8Z8K4KqFCdHcIy68iO6z5nDeOc+t1xTQA6AKbjqzPyvRkrR6++CnB5J2aBSqEm0WM9Zt3CsA== X-Google-Smtp-Source: AGHT+IFgXqj4XlFhtUr+fZqfGzRlmLExhondT0+zpKMFEJcfKl4Iz2rfeip+veAh+q5m/Y+oLh3o X-Received: by 2002:a17:907:c904:b0:a6f:1d4e:734f with SMTP id a640c23a62f3a-a6fa449a9b8mr165203266b.36.1718821484307; Wed, 19 Jun 2024 11:24:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718821484; cv=none; d=google.com; s=arc-20160816; b=udRxUEdigRr16haj5cKpIEmP0d/h74ok0MrLZe2LM9LywpIE4q9oW4bccPYzd7VXXG HjTbyEgvZNHcpJeTRrHg8JVdfHoyw7GhnNl22hf76cgeFV3D177dfAAQB+/mmoQHHR13 C8Ky58t43R/NIGOSINp4LCVGm0X3ZY1pKzroFwTz8DcRUexD38qwbhI7EMAkrAuBPBwy Pb2A15/uL12YjSBoXWXgAxStuHhTKop4O75cKUU9OroeRb5RHNEic+hVfdMvgbX5fUXE vwXrCcex8qZeRvSaMR+r7I8/7Q/vWo2Z7nP9LeBdNt3kymhT6K1JaoMgvcGLX6+QuK2g ZUwg== 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=NF9KuAOEOgBcHUdAS0Z5H8t0NXQD7cOvqJM3mSbftM4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Wt4snAPCtdn1xnROgEBo3DNX2QL+5R602w3tlB1Dzqyrig1sdXxg2ahbxD8VlZGvg/ cpprFmgLAyaobvhNljmn7IxW71pJKkoao1ato2hk4lRszC6HVMWLfEMVlTkShTLWm5pZ 5FWkysVmHfWd7651udoyObRFSDC/LWL9Ejfxsh0cCE5pTgbAuWqFitx709qpRFt6kvjv CqtvthNPoWk5dkQo8czOu3RgBcPLOYV4AmZK8tom9+yIQCzl2yhIBb/vLdAlhoGqTtva ytuNo9u1tEAOtl++ICVxzHAahu2BYG61F6jihmMfISllqGECh9MxJu3iyPdK9w5969xG 6n1Q==; 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=YGcz6IaM; 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-a6f56e26f8fsi634287566b.745.2024.06.19.11.24.43; Wed, 19 Jun 2024 11:24:44 -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=YGcz6IaM; 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 AD83C68D84F; Wed, 19 Jun 2024 21:24:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6E4468D847 for ; Wed, 19 Jun 2024 21:24:24 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1f4c7b022f8so458855ad.1 for ; Wed, 19 Jun 2024 11:24:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718821462; x=1719426262; 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=dAu3mUVWyvVHfynd5YkoxnAvKQwG+vfz6NhDU9y3RnA=; b=YGcz6IaMwDSz9yQFcRQ/pwPKahHqq8zlDaunM8rJVeJ7rzvte7IbXbuSkcRuNhhhKF knrlzDzDeabBQeAw6H/lFv8Hu8qkMWGpg632kQd3Ry3iEs81XDbVGD43g4rMWRGQXot3 mB4kfvVuf/9XDGRqNLPwlXb522hYzsV2KNVwI1bZuH7N5uigyZVD12o6GYmuUXyWFI0S f3x91b8FuKfuoaqX0ZHeOgT/NzwXBMEiMN8BiCe4/of3PgNe7H07a848ANgQl5uDAiRI amzadA8ao5RUX1caiFb5NFD5g2W5E1tCp1sKsgDV8wGL2UuDrSrzM5CskF/vW+s5pVGO mG9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718821462; x=1719426262; 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=dAu3mUVWyvVHfynd5YkoxnAvKQwG+vfz6NhDU9y3RnA=; b=tCpYP6xJZly4ruOKPjUbicQEw6703YmXuJ6o6cih3/40wP4BsYbn01o0e1rxbkw8Xu mfNEJEqJTfGbDPBSS9wwHRdlOQV75eyI9QiXGGaOVzX73SI3ciJOFUOChVQ8Umo+XAmQ IIrlX30RMcJRA+5L610JShLAF4dXRyRXDesclTdMp8UqZq0Lkos23ljmUqyL5QANZy3E ctkjPHCVaxZz9zWQetJ94l8BYI/um6p4ufBgJSYeAUse3D/KWWTpEnXVzG9TyP+bxVHX If+ux2k3TQyRoc5KnTnzd9oeD00W6SS+a9jNqDQXyBz+vWiT6nOjKxmUcZMfPoSNxci8 OTAw== X-Gm-Message-State: AOJu0YyyJe3GVgysXnpiIoo4J3ey18Jee63DMEmOsrnrJuuPd9/JyRIm nkbzyb3v7wvOT7K/hBOOo+H2xhwwNABcSUYvr63acwUwTkZzau638U514A== X-Received: by 2002:a17:902:cece:b0:1f7:3d44:1f1c with SMTP id d9443c01a7336-1f9aa3bc92emr36493195ad.5.1718821462113; Wed, 19 Jun 2024 11:24:22 -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.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 11:24:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 15:24:12 -0300 Message-ID: <20240619182413.3247-2-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 2/3] avformat/mov: 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: 0EixVMB6ZDFx It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index c0a5788e08..35b767a52c 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -250,6 +250,7 @@ typedef struct MOVStreamContext { AVSphericalMapping *spherical; size_t spherical_size; AVMasteringDisplayMetadata *mastering; + size_t mastering_size; AVContentLightMetadata *coll; size_t coll_size; AVAmbientViewingEnvironment *ambient; diff --git a/libavformat/mov.c b/libavformat/mov.c index 367af8478b..2d5b24b9a9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6138,7 +6138,7 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_skip(pb, 3); /* flags */ - sc->mastering = av_mastering_display_metadata_alloc(); + sc->mastering = av_mastering_display_metadata_alloc_size(&sc->mastering_size); if (!sc->mastering) return AVERROR(ENOMEM); @@ -6181,7 +6181,7 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } - sc->mastering = av_mastering_display_metadata_alloc(); + sc->mastering = av_mastering_display_metadata_alloc_size(&sc->mastering_size); if (!sc->mastering) return AVERROR(ENOMEM); @@ -10043,7 +10043,7 @@ static int mov_read_header(AVFormatContext *s) if (sc->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 *)sc->mastering, sizeof(*sc->mastering), 0)) + (uint8_t *)sc->mastering, sc->mastering_size, 0)) return AVERROR(ENOMEM); sc->mastering = NULL; 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; }