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