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);