From patchwork Wed Jul 31 09:45:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Mascellani X-Patchwork-Id: 50828 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:12d6:0:b0:489:2eb3:e4c4 with SMTP id 205csp355283vqs; Wed, 31 Jul 2024 03:01:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWi+oAZWnNBYU6HsYCKYGArdfYOUzQVl9ZKDQU+4d1s48O5xfC5JpNQ4MN66raiAW14uKaEoEWl9R7ohp4OUD7WRaaQJ6H4w4k6Q== X-Google-Smtp-Source: AGHT+IFlP9Lz/Of8JkKsCCNWBBq3d+SXPZPDJ9OjTzXbeAhbNujijKoukPmYZVuzgmUSN8MA7g8Y X-Received: by 2002:a05:6402:3581:b0:5a1:73fc:6bd4 with SMTP id 4fb4d7f45d1cf-5b020ea7fd7mr9283704a12.19.1722420118180; Wed, 31 Jul 2024 03:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722420118; cv=none; d=google.com; s=arc-20160816; b=xzoROYN2+bq2jfA4v6Qx+2JXsPQ3NojeD17r0vluolIT+iRh4Efqzx4SPRVlyl7//D 1QsW5a7f8qeukIZWS6OgLrWzf5lnixUOunaQVm0M9ABMSvjGwcsZfR61NKKHjiO78Vmw 9jliVbgMzzWHIld/e5534DvMJzPP7uWflws8gAbl/Fsm+eoCJF9jXvY9Qi7wJmKswlan 6yIr3wzth2I8iLPo2UnzqauTE1Qq4nZ45r2Cy9LdCYpVb4z6yDDb4GSSyq7VNN1MsmD8 KWBHuC/GokkwslB6fyK4fOo5KjT/HZAXmC8EuuHY6fBX+6ekJHgwsT6HRDz4TQticR17 8pbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=XxKER6eZY0HgrxueXIBcG0Fh6jtjinchX068ACKWOgY=; fh=NJUXiZ9ySL+5Ow7BwRN07JO06kUiUS+DYYL0pKl745k=; b=v6YT0P8uDw/5MXAOJyXSTiitZ+wfRq4DUjnocF77P0KS3tssZFy6Dd3aNS8CbxYnJL sZmvnRz9x9n6pKtgBBadtOb0ZfaIh2SSYJkkcffpgYEQs05NjgfvrCAYOMVg8WmS+sQ1 S5lSnTHidAMr1uujCqGCwr7oRcelea/QXu0BS0BjXIy8xXY6b3O9bk97uv7FZ59OuN+W bs+XxlfOriLBu2Bwcj8lglolDRa3wj/HvWsWuu9Rp8vnhvhOkMuqHTXueC+YaN4HqZ1n EjtqLigeGgHmnpSsWsREfRRKK4SjIfkihirj79/12QCPfLOITi1FaCIe8bSQKtV5q3/v JX2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@codeweavers.com header.s=s1 header.b=DgrY3dEW; 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=NONE dis=NONE) header.from=codeweavers.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-5ac6339ceb0si9381520a12.33.2024.07.31.03.01.57; Wed, 31 Jul 2024 03:01:58 -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=@codeweavers.com header.s=s1 header.b=DgrY3dEW; 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=NONE dis=NONE) header.from=codeweavers.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4953F68D749; Wed, 31 Jul 2024 12:45:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.codeweavers.com (mail.codeweavers.com [4.36.192.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8ECA68CC56 for ; Wed, 31 Jul 2024 12:45:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codeweavers.com; s=s1; h=Message-ID:Date:Subject:Cc:To:From:Sender; bh=15IFIrgiqGZe1ucgFQwBUcVZD7yqjq9e0lqAfgznDf4=; b=DgrY3dEWvaNe+as+kbDkm773iw PO2qd6ByFXQlFMYclxtjADdkZk30jr0s1/pTTlwF+8mC/zFpq+HbcV9rVR5yvMXxl6ZUjf4+6TS0R OrJ5tu1y0w/6J3g7aGg/CCvSrZuY91RgETjjcKMYgiO1z7tqxVdNh8puF4mYf07N83+3dMTmbN1bU Ok0uPnnj6azKUphHiC9nglPR4DGnzrxEbSd2mJAME+3lHXSjYTyPvKUfkEp5R+IOwZ6WzzsDLhbwI j6AwvrGbNxg3yvwOHXmkPQXSgUH0UWJ7/37ysj0kkmLjv1T2URErMILC0ny+LVb8nH4S9ippOQSB6 IoY0G5hA==; Received: from cw141ip115.vpn.codeweavers.com ([10.69.141.115] helo=localhost.localdomain) by mail.codeweavers.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sZ5tX-00HRDe-30; Wed, 31 Jul 2024 04:45:20 -0500 From: Giovanni Mascellani To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jul 2024 11:45:13 +0200 Message-ID: <20240731094513.411877-1-gmascellani@codeweavers.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/h2645_vui: Interpret a degenerate SAR as unspecified. 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 Cc: Giovanni Mascellani Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OEqk2xfDZVjn The specification says that if either the numerator or the denominator is zero then the SAR is to be intended unspecified. Internally ffmpeg represents an unspecified SAR as 0/1, while fractions with a zero denominator are not handled properly; so we bridge the gap by replacing x/0 with 0/1. Signed-off-by: Giovanni Mascellani --- libavcodec/h2645_vui.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h2645_vui.c b/libavcodec/h2645_vui.c index e5c7bf46f9..c8df733399 100644 --- a/libavcodec/h2645_vui.c +++ b/libavcodec/h2645_vui.c @@ -46,6 +46,8 @@ void ff_h2645_decode_common_vui_params(GetBitContext *gb, H2645VUI *vui, void *l else if (vui->aspect_ratio_idc == EXTENDED_SAR) { vui->sar.num = get_bits(gb, 16); vui->sar.den = get_bits(gb, 16); + if (vui->sar.den == 0) + vui->sar = (AVRational){ 0, 1 }; } else av_log(logctx, AV_LOG_WARNING, "Unknown SAR index: %u.\n", vui->aspect_ratio_idc);