From patchwork Tue Jun 18 19:20:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50002 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2770788vqg; Tue, 18 Jun 2024 12:21:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0vJSNuoa+TAGF5+I4F4QquxQeFum+Nj2kZkjN8OwEINzAqRJJdUIoWtUHo2mrVq4vXKRZY3+xV4gEeKQW6P+RVUp1iiDbPJtstA== X-Google-Smtp-Source: AGHT+IHYG3+1UO7T8yhEk014cgIeqdJQn+bK4h5RzVM5KmJl4DSED2OQNARWzThstGKO9at7FW03 X-Received: by 2002:a17:907:c001:b0:a6f:5ba9:584f with SMTP id a640c23a62f3a-a6fab607121mr23160366b.5.1718738465373; Tue, 18 Jun 2024 12:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718738465; cv=none; d=google.com; s=arc-20160816; b=HYGFUiah5++tLGoCgMlAgA1iuBXXe1OyzAtyXGsMJvv/kAqyidizAb/MGG6HbcHB9C EniLVmMdcEk80uqtQSdSTRX67gIAbGpUckXQvlpWvYXkvACSwKjApsnDOlMNYPVFNEBu u4m0yYqGrC3gr491H+2Xnnt9FqmyGyClIzKOfDVkF1Hx/lf6CQu9CgoZkH2qlQi4JdOb N3mcMP5X8Cd0TntyGVXvUKBSNdNQ4kzJMW0nZgSyCMBsjbBShmkbOyRtdj8uOtIl234A rsWGzx0KvbUwNUVUU/o1t6GoMOw8JfT6FyDlqprI1rI4coOtjOwUmOxU0BS7YCvGC8px eTYg== 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=Q23iWlQ5mRVzVt5cs/WWIwrWxb71bgKlMdRU9PsENLs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=sHgBczFcNzEsR5brC4IhBFSCUjXd33uhWSlqJAThcQFQMNL1BSkVYQXZ8TIcd2TSgR JbgvU29ZiK4fmQtmKaX5pEqUA3ypInYwZHieSzxHk/wY3vsiDrBtjRx/CW1KsDypU+kh xyGkMlO6dywNV4CFOMbvWzK0v+P5em1o5Nd2jy76Ven22nM8AMxqrzU8mIaQo3eKjcOA isNQPzK6qzSMORYUbxOEvhd8NEInMKTlDZ9XWGYtTWdYxG674qYped9ILf4j3+niRXTC O1csC1As6B3p4QqlZNw6796yPqzKX6NGy1AbaYcFHoum0VWiorby5uvncUZYXOqNHW8E OH7w==; 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=fvJxCFtJ; 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-a6f593d24f1si564290666b.8.2024.06.18.12.21.04; Tue, 18 Jun 2024 12:21:05 -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=fvJxCFtJ; 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 77D5868D75E; Tue, 18 Jun 2024 22:20:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9FF368D72C for ; Tue, 18 Jun 2024 22:20:47 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-70630cf1fd4so28853b3a.1 for ; Tue, 18 Jun 2024 12:20:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718738445; x=1719343245; 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=7/EXE7OJvZrVQXr/bPHFTdcMAatGaH1eQDX6Qirn7Fc=; b=fvJxCFtJWHtTNll+DAa2amOmAonEf1u9pFFge9RedCgStJkmLvxRvTyQVSeEdgGCZg ONLBAcIP4n9nsKCK6x7G2LkWoTbmEujsGeLKEYZzTNcElvdBdZuJO18YULZQB2CbUFvQ vfsfBApD2chz0nz1bnnkU/kySYapnPr79981DbCw1F3MIKXSsfe5dxlYslOL603wmFQ9 nuCd88zNjrhMrjtDREo2o9MTSwpCHVgwuHhScWtTBFhx1EmeggDnTzqViRNePc6t9xyL HzQ3dJLqS0STVbT0JbbBdH2rteDBiB7mSvl+/R5cK6rcyFpTIr75JD+6vaBtVUUjnyg6 nISw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718738445; x=1719343245; 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=7/EXE7OJvZrVQXr/bPHFTdcMAatGaH1eQDX6Qirn7Fc=; b=XMLUbKDLO11ORSmDe6QrDckdhTeXx7pReUBLlhtGCf6hJ5Auwiz2MHteZvtfhBfqJS uGrc4o1GoyOA2edk3rykdq+F6ZPAbVEbELVyHiwhoH4TXprOIm+kxl6aleYF85VxEcsE 2C7sZ0ynKUZ6Y44MA3ohSp6sF03/4nDJqbWWbxWORPhtm3Tf0cwfOgqudIUJl+unaS/V iebSAQl3lFzSzrlsYHV2Pmgfbw2R13rSvb/dBSvBeWfzblayC1U8/cG4b5aFy6le1Knr c36GMpxpBBdZssgJszrj4Ecfw2I9nZR0H67HzH16CT0+qH0169Plk5Cgb46SNcOb+C5d fzTQ== X-Gm-Message-State: AOJu0YzsWHyOpDOwHE3h/78OHly8Y9Lv41MtKqkAzc97T+i2/x6xJsf0 6WkURgxvav6Xhz7ckcTg/3kkr92a4+mHfUtHHqzK1ndTpuO6TLOddPLLtw== X-Received: by 2002:a05:6a00:1144:b0:705:acc1:a043 with SMTP id d2e1a72fcca58-70629c5b9e7mr737898b3a.17.1718738444679; Tue, 18 Jun 2024 12:20:44 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-705ccb3d273sm9300175b3a.136.2024.06.18.12.20.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 12:20:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 16:20:33 -0300 Message-ID: <20240618192034.5027-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240618192034.5027-1-jamrial@gmail.com> References: <20240618192034.5027-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avutil/mastering_display_metadata: set a sane default value for AVRational fields 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: LMIfDqnEO4F7 Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer --- libavutil/mastering_display_metadata.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index ea41f13f9d..73a36c661e 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -25,9 +25,15 @@ #include "mastering_display_metadata.h" #include "mem.h" -AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void) +static void get_defaults(AVMasteringDisplayMetadata *mastering) { - return av_mallocz(sizeof(AVMasteringDisplayMetadata)); + for (int i = 0; i < 3; i++) + for (int j = 0; j < 2; j++) + mastering->display_primaries[i][j] = (AVRational) { 0, 1 }; + mastering->white_point[0] = + mastering->white_point[1] = + mastering->min_luminance = + mastering->max_luminance = (AVRational) { 0, 1 }; } AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *size) @@ -36,12 +42,19 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *siz if (!mastering) return NULL; + get_defaults(mastering); + if (size) *size = sizeof(*mastering); return mastering; } +AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void) +{ + return av_mastering_display_metadata_alloc_size(NULL); +} + AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame) { AVFrameSideData *side_data = av_frame_new_side_data(frame, @@ -51,6 +64,7 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFra return NULL; memset(side_data->data, 0, sizeof(AVMasteringDisplayMetadata)); + get_defaults((AVMasteringDisplayMetadata *)side_data->data); return (AVMasteringDisplayMetadata *)side_data->data; }