From patchwork Tue Jun 18 19:20:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50001 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2770708vqg; Tue, 18 Jun 2024 12:20:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwUxOgR8iJpmsa5olxP8lBEeY5uzRvO4FLH/4duhT6N07z0olKXb41nOsoXtjw0R979+VVtutiL8xqNWiyUT/VmGHnJCi+yAc0Fg== X-Google-Smtp-Source: AGHT+IFcZIOmWcxdpfsCgwgTpDS1I1ugWUSO3Mp51fc65vuoWzP1cQeR57pDZhTw0zQQ3PCSkS5F X-Received: by 2002:a2e:a548:0:b0:2ec:3e14:fa1c with SMTP id 38308e7fff4ca-2ec3e14faf7mr746371fa.5.1718738457024; Tue, 18 Jun 2024 12:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718738457; cv=none; d=google.com; s=arc-20160816; b=CbHlEx1yqhMyzn3AE3VBd0PWJHurbBri83XQinaqu3SqQuum/gG2BzHCyQJ1AMUyrg qVjOlNTkNXu507AEUbwhPUvOe7u7ezpB3X0yeYZy6a2JynMjj/PF5wx+l3L29qIiGBNt VVB8QpjW+NIkuStks/lAAbP9ydjmDu+jujZmIBessw7a7EVbRFhM+xqaPI6orE1cglDc IvT3AxfbUBy2YVChYhPF0VK/WVu3wHoq50gv64NVVXzrUCuuqotl2gHisxoYEZBAI3cq YnMH1CxiAmIMNhMZELmy+s0gi3k+hSmLF/MAeiEkkn/BoeMQ6xlexGiTaCXjenqZaflD xeEg== 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=NTOCXMPP1JP0h1FGwZHc6g+r2uTx7UQ9vpRl0A2Mp5I=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xA7hfLv4lYqxuolqBzYtrNaEX9dCDJDgNh9A6uIo76vTAUa4XiEI2G0R4l8ayBgAHy +ja4+IwfaQg880aLt1/pwTnt/okVjmV8m8yKTbNcBEPhgxELhOOvsi6/IsDhOVV8kLdu WPWgNpDoUv5QixCQBEmpYK1573bwhFrupPmrvNmWmU1JhNxsl8I0fEQcxc6zd6t0JFK6 gup9uggcfQ/jUGoykUvvhUoeqtNJGlz/yYl/yICnYdSkNBq1+bRjcOlW7fcTSBX21qqO V+MoBzJQnM/6o6NnodhqseJKQI35UI/ikeE/yPZ5CJiann016CoPn6B6nqY/fOv92vMZ hZWw==; 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=FgbPmJ4R; 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 38308e7fff4ca-2ec0625ef9fsi33432411fa.205.2024.06.18.12.20.56; Tue, 18 Jun 2024 12:20:57 -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=FgbPmJ4R; 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 02353688177; Tue, 18 Jun 2024 22:20:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8E8D68CCCD for ; Tue, 18 Jun 2024 22:20:45 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7041e39a5beso4291901b3a.3 for ; Tue, 18 Jun 2024 12:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718738443; x=1719343243; 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=qbSqH86A5CZ4QsOsRAfWigsXlC8JEaRAzgfxjjZu2Zk=; b=FgbPmJ4RNF3YFvQhM/gu5fDMP4JFmUsT66vJbO/puz4M1pZ69agsqBVomple5p7u2q pX+xxaqQIgd9rekMomrnQVeacbja6cvoIHSzEuRYTRFukMQ8+FElpCQ4+Lm7dl6NhxGe oEl78C3etehf6AO3X6XZqTqNEnjnjyQq6hunshetw+XRT9jPq3+GY820ZJlrEKOJ5Apr 4vGJaIPozn+5jR2QOywUz6XGie91qjBsxVM1YNOaxSYcn8kmuzDtG5W7pc8fkM6PLZUI eA7OOTBuX72+EAwbwhyWb+d5S9OGK0GreWa0TSfC+103M1tNSZIkxbu9ErWAs/yY5fYS MEqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718738443; x=1719343243; 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=qbSqH86A5CZ4QsOsRAfWigsXlC8JEaRAzgfxjjZu2Zk=; b=ODSTS7x6fWIBWxHlRWMvPeWUj07M2w5bwN9toGrVjKAdxCTDLuaOSUFXOvRwpLf/oj Wg1BfAylV2VhYEIPo5hqDUgfRLAYCc08WFHFunm9EH2oRa8D+Y9QwW61WNBfF2Fam+sg e96IQfZuQTKO3UiJKbT9CmoJWfl80NI7Dm37YnGwv4sNW54BlLQm0PV5dLgCYXO/xh89 Ds327y6mH2mL5Nz/j5z1f+kwFTmrbOF9vFs9ZK41gKcxuDVA8BQv7lxzu/ZfciOHRkXO bXfBGKOVTViOuNKvShHMADnYDPFHcbaiC5FMjAp8NHj8O3AOLQZ9XRSAHA85lMJHREWw it7Q== X-Gm-Message-State: AOJu0YwDPU/QLwsiSWsgdTcoiNCU7yjYYei6iBGdxMYls4YRG3q8QCkJ zWI1c1g3FsGefZGA6wMdjMex9uNvQb9ComUiWzMbU8wg4y1xdWd7zoAE+A== X-Received: by 2002:a05:6a20:4694:b0:1b8:391f:df9a with SMTP id adf61e73a8af0-1bcbb580adcmr463207637.22.1718738443046; Tue, 18 Jun 2024 12:20:43 -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.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 12:20:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 16:20:32 -0300 Message-ID: <20240618192034.5027-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/ambient_viewing_environment: 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: DcDoTmm6XnIN Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer --- libavutil/ambient_viewing_environment.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavutil/ambient_viewing_environment.c b/libavutil/ambient_viewing_environment.c index c47458cfa8..e359727776 100644 --- a/libavutil/ambient_viewing_environment.c +++ b/libavutil/ambient_viewing_environment.c @@ -21,6 +21,13 @@ #include "ambient_viewing_environment.h" #include "mem.h" +static void get_defaults(AVAmbientViewingEnvironment *env) +{ + env->ambient_illuminance = + env->ambient_light_x = + env->ambient_light_y = (AVRational) { 0, 1 }; +} + AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size) { AVAmbientViewingEnvironment *env = @@ -28,6 +35,8 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size) if (!env) return NULL; + get_defaults(env); + if (size) *size = sizeof(*env); @@ -44,6 +53,7 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_create_side_data(AVF return NULL; memset(side_data->data, 0, side_data->size); + get_defaults((AVAmbientViewingEnvironment *)side_data->data); return (AVAmbientViewingEnvironment *)side_data->data; } 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; } From patchwork Tue Jun 18 19:20:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50003 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp2770864vqg; Tue, 18 Jun 2024 12:21:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1FfvLZV0U/OChi8G1OuIlYtFtflnxhn6DzRV4+RKftN5kQaTQO8cGS1KJdGq/dxV+NlcCHD86gw7UDKDI5/O2qgww8V0hpidq0A== X-Google-Smtp-Source: AGHT+IFuMaJDlolDuQOIxLFqOGM5/CQWpO7TTHddnZsvuisOKi8IAG0QmdePICYoLosJYPdqK0CW X-Received: by 2002:a50:cd13:0:b0:57c:c18f:8ee0 with SMTP id 4fb4d7f45d1cf-57d07ed7528mr192277a12.3.1718738473546; Tue, 18 Jun 2024 12:21:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718738473; cv=none; d=google.com; s=arc-20160816; b=ioMnLwvyrBbht8JLC4SpXeudFfkhHkAJ873gaZvY42ssvXZvDYRdW626VlDyfLVgf8 v/jdb9TruNBPthNhELQOxyOZhQ8j0cGz5Gfwl+mpatP3SASeqT40085OuuSGWUON694j BpqjqpW6pAaE/M9kqheQgaG7OWRkFcoOxCIhP1BNciOu1WrdMGJhjBm315+M1WX31lMe N9RWmroIRAYJ5Oc4Lk5CK1CGecO8II/CONh1uwUVUQrz5gbnZLR6xQwlfX6+b0+Kzr+W Tf3RH/0iKEft/Fgj1uv+SEX98UQctfPL1vIVYV/o5PhWQQqDrF/N4xROyJCId3mlYdPd UN9A== 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=k5bGOofUpWoOhMpZ7N15PxOx+VxWiwIHlHIbdnR7nHc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=cLjI9nIrgWY4MkpjdOfDi0F9QDnFkfkcydgqR970cMYQn9KJ8cPk/QTukPOug2ihXe 9ABKptasb1nicdtusl/ZnByHkU2sTTCV/RHo4/YvdiMvLikwxDTtO79uhoLWVULY3Pzw PGBaPC7PgkBfb5mx8HtjF+4tTbh+GSHz40yT0BTX7qkM5ILvLNILC877VJ7vQPzrJTHY vRQB6JUSpFwqQLBxC/L+ZNWWH2mHJL5SKP2QUp6qjf5ncy4JvCfRs10+nkcicHjnRFDi w8BtCcPapQ8etpEhMFF/cnFSPiXBggz6F5aPApuCCwFUKXDuCBg514X2+HaWAB0y92QT hEyg==; 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=E5SfkWY0; 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-57d051987f1si308099a12.111.2024.06.18.12.21.13; Tue, 18 Jun 2024 12:21:13 -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=E5SfkWY0; 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 B67CC68D768; Tue, 18 Jun 2024 22:20:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD03F68D52E for ; Tue, 18 Jun 2024 22:20:48 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-70631cd9e50so10364b3a.0 for ; Tue, 18 Jun 2024 12:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718738447; x=1719343247; 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=d3h7zUkng9cofz6K1S3T3l9o4kjM75t7Ky79MYoX/t4=; b=E5SfkWY0Rx2icWuHnLDjp2Ya3KpR1LYntr/GS3igm06R4wqGqBHkB1tByPvSfBQNKu EUlK2VHrTzdDECHrnzkUwDKlSkGULzPur+D1zYEFjvNQhNe4rAyJvl3UhSvY+ZuJOEl/ w7SmNZAJNyrZ48kOQ1BpdtgYoo90LIByliIuPP/GdlBSitkybTs0quRwHj0cSErQXaF7 jdsVanfGJN+Kzrr8lfK61KCI53B8eCV4GVIAXSSTShai8Rdkh/WvHemRjnqZEuEbfsHh SrJQUoHCqqNuY0cpWJZYXwgPo8rx1m8smzfwAg4ommgfHap7GlhKWMty2oJ+rMKi64/n QEkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718738447; x=1719343247; 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=d3h7zUkng9cofz6K1S3T3l9o4kjM75t7Ky79MYoX/t4=; b=mTEXmgZI3JETA6vIqCeHKdJJl7QNOKkhw45EA5ydtRgw5zT7GG8c4t55HKpT46rz+0 hfPsow4OW/VgcNnsWxplIgH6nOOOIxdijf0eybgm/U+2Cj58hgQsNjM+qA/Q4Eni175Z qfKiGxeMIHaCN7JpX0LUqP9IzB7H2h3+W60vp+fyqB0JaepBoEz80g+x2jqVei1J41sX w2xrxSJV+SvvNprTNmNyEcYiiUeSK86SrptztS0NRlRvg1bUWkwBbjCsmDEw/gL0s/a3 eQRI5PcYOGwmwWaefqmUC0VpYxHMVj7g2+58iRZuLUXQwQW7qTsfPKIayIkQ45rgQl7V ElNQ== X-Gm-Message-State: AOJu0YwAuRYPoX9xm1gB+L5cvYfsecu9qHZB86s2FsiYTrxRW4ktg56p OJ4mOv+zOyYtVIFBrBMf00w/hYqjHEWQ3FO2YVbTK1U1FtmodhC1su7Syg== X-Received: by 2002:a05:6a20:b1a8:b0:1b2:53c5:9e71 with SMTP id adf61e73a8af0-1bcbb5a9aa1mr391001637.25.1718738446594; Tue, 18 Jun 2024 12:20:46 -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.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 12:20:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jun 2024 16:20:34 -0300 Message-ID: <20240618192034.5027-3-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 3/3] avutil/stereo3d: 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: IDbTfspFY8l6 Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer --- libavutil/stereo3d.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavutil/stereo3d.c b/libavutil/stereo3d.c index a40a9439bb..19e81e4124 100644 --- a/libavutil/stereo3d.c +++ b/libavutil/stereo3d.c @@ -26,9 +26,20 @@ #include "mem.h" #include "stereo3d.h" +static void get_defaults(AVStereo3D *stereo) +{ + stereo->horizontal_disparity_adjustment = (AVRational) { 0, 1 }; +} + AVStereo3D *av_stereo3d_alloc(void) { - return av_mallocz(sizeof(AVStereo3D)); + AVStereo3D *stereo = av_mallocz(sizeof(AVStereo3D)); + if (!stereo) + return NULL; + + get_defaults(stereo); + + return stereo; } AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame) @@ -40,6 +51,7 @@ AVStereo3D *av_stereo3d_create_side_data(AVFrame *frame) return NULL; memset(side_data->data, 0, sizeof(AVStereo3D)); + get_defaults((AVStereo3D *)side_data->data); return (AVStereo3D *)side_data->data; }