From patchwork Tue Dec 5 09:40:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 44914 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp210734pzc; Tue, 5 Dec 2023 01:41:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IECKVhM5ZLlimJkv/f9Yigs3JeKHfrudFfC4tlQTnBSgHURDMAFMnJktCLEA/dgG9NREr7I X-Received: by 2002:a17:906:f9d8:b0:a18:b427:c4ba with SMTP id lj24-20020a170906f9d800b00a18b427c4bamr307355ejb.54.1701769300133; Tue, 05 Dec 2023 01:41:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701769300; cv=none; d=google.com; s=arc-20160816; b=CPndbGk9yurLa+MXlCz5LHJflw3SRjR/VHxdaN0dpen9aoJeeRELv3u/4J6x6Q/upE uGs4/H9rG+3bvRnaw1qWHbtk5/Xpe3JWEZHJEyOE+OVgwCotuBML8VHbOwBxZHGJnW67 2AW20Tbc+95U6hwxwHLvEOWeKtcLBkjajuykS4DSYccdVjwFPaeM31Ky/PMMPbcIZA2W ic7bHoz24P73Gno3pRNGx+SqtwsOUdeJV0WEbTj7XnsXsVdqs6iFYZQ+yuSAVrtW4D3O DcQfzLBAUG5+KlJT4h9gnvPMbsutxVdBD+0fH30Dy33UiLVMoYauLWUzBPGMUt5flSwT WeIw== 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:to:mime-version:references:in-reply-to :message-id:date:from:dkim-signature:delivered-to; bh=xScV6vwrYkObmdrc/XLrHDoK+ndBz6sNFbCCdR/jJis=; fh=GABYHefZpsCOOVRn8a1IgmYuOvaCu1oFlwEOjvaxWTE=; b=MkerK4jK2b0UqkQQOLGOHIh5+ZvSnp7/Qb6Y8AQ79tO8EZ80fTTT6lnqzqB9A5SbHl yzirAOqv5AgGZ636PHc323TYbJg1rAsT+9FsxDl2Cf9tIHsVn9CLWV+dWWoWAUk/Pw9o aYtUI9SFwqK4dLMbp7AU9h8qNy735mlhHoTSZ3xICfEVsXsaO7qibCmpZg0bwkriiTVB 55Z0/CqQZixg9AGjD1Z5vx5icKI0KNYDiculsxb+7X5DY4/O2SGOsF1+3R79SYWPunAR 1vaKGZdMjQrZjjzvg7ZMC3KlcCrpFtDFDcNMpeE0qezj5EpqiYu4TMzUgsiiAAEjrKbh i1RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@frankplowman.com header.s=s1 header.b=eDAYZ4R9; 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=frankplowman.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay19-20020a170906d29300b00a18c8e1f72fsi4992357ejb.231.2023.12.05.01.41.39; Tue, 05 Dec 2023 01:41:40 -0800 (PST) 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=@frankplowman.com header.s=s1 header.b=eDAYZ4R9; 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=frankplowman.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D43D768C98D; Tue, 5 Dec 2023 11:41:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from s.wfbtzhsw.outbound-mail.sendgrid.net (s.wfbtzhsw.outbound-mail.sendgrid.net [159.183.224.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDEA568CB92 for ; Tue, 5 Dec 2023 11:41:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=frankplowman.com; h=from:subject:in-reply-to:references:mime-version:to:cc:content-type: content-transfer-encoding:cc:content-type:from:subject:to; s=s1; bh=Oi7C5a7LjpH3hqgb7kkNrhg7cm4qIUO+hrVgWT2IugE=; b=eDAYZ4R9/fNacmqFHr1hDRzsGkEblVVXiYj+/arqlPpd+0QvzPhsyI2dv/p2klqee0+r SovVRDHQDCEOO0TiddDnE10ukBW70sgVe6Se86GlarUn/NYrsAu3uUEgDcsGg0VRSBbND+ AP1aiuH2dMwPOEHe2ZpzBeJydfN6VGL8EgR00tUkRNQBz/9j/TDwdmMGcBA2/LdBF2N5bc pqhP7SViKVdKMGrMvdOIMe+IOrqMUmc2AwZiOFMYMXs8xhfoIYQ8jhr1nwMfKbTrUNnO+1 d6zjMX1H6eCQHyx3xgiYjrpZszgYZXNen07E/QPJMs9Zt9333qP28rLJdaQtqQSw== Received: by filterdrecv-5bbdbb56cd-nws6q with SMTP id filterdrecv-5bbdbb56cd-nws6q-1-656EF023-2B 2023-12-05 09:40:51.959717999 +0000 UTC m=+4201259.243563008 Received: from localhost.localdomain (unknown) by geopod-ismtpd-4 (SG) with ESMTP id IDpwoelVTRqS0qIrD4KDDw Tue, 05 Dec 2023 09:40:51.675 +0000 (UTC) From: post@frankplowman.com Date: Tue, 05 Dec 2023 09:40:52 +0000 (UTC) Message-ID: <20231205094038.12293-1-post@frankplowman.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231203181259.63298-1-post@frankplowman.com> References: <20231203181259.63298-1-post@frankplowman.com> MIME-Version: 1.0 X-SG-EID: c4f4aE1Y0RBySa/irqQxUJWZDkoLQ0t/fkUe34xOGiGwhF5a5rjyuwmPWBxd26lDOCFCHMlWKlYQxGAdT1lZObEcSr06Hr5b9vmePSJuYgG1yHl1MqBalP0N29ZuMfrI9Ur+4MlzCU0BOJgwRqJOD1UeEI392RUKfM+DO0DakYVWD4Uqlr63Y4NRZZ6KzuDlnmX7txqj0np9z9+XCXruU9ZsT6MwdaH855bAblyAs90= To: ffmpeg-devel@ffmpeg.org X-Entity-ID: LpPALsXh5JN/Quf2dstifQ== Subject: [FFmpeg-devel] [PATCH v2] libavformat/vvc: Make probe more conservative 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: Frank Plowman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zjNrv56nDTbj From: Frank Plowman Reduce false positives for VVC files by adding additional checks in `vvc_probe`. Specifically, `nuh_temporal_id_plus1` is tested for valid values in extra cases depending on the NAL unit type, as per ITU-T H.266 section 7.4.2.2. Resolves trac #10703. Signed-off-by: Frank Plowman --- libavformat/vvcdec.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libavformat/vvcdec.c b/libavformat/vvcdec.c index 31c5ae1f14..0a0e24b71c 100644 --- a/libavformat/vvcdec.c +++ b/libavformat/vvcdec.c @@ -24,6 +24,22 @@ #include "avformat.h" #include "rawdec.h" +static int check_temporal_id(uint8_t nuh_temporal_id_plus1, int type) +{ + if (nuh_temporal_id_plus1 == 0) + return 0; + + if (nuh_temporal_id_plus1 != 1) { + if (type >= VVC_IDR_W_RADL && type <= VVC_RSV_IRAP_11 + || type == VVC_DCI_NUT || type == VVC_OPI_NUT + || type == VVC_VPS_NUT || type == VVC_SPS_NUT + || type == VVC_EOS_NUT || type == VVC_EOB_NUT) + return 0; + } + + return 1; +} + static int vvc_probe(const AVProbeData *p) { uint32_t code = -1; @@ -39,7 +55,7 @@ static int vvc_probe(const AVProbeData *p) if (code & 0x80) // forbidden_zero_bit return 0; - if ((nal2 & 0x7) == 0) // nuh_temporal_id_plus1 + if (!check_temporal_id(nal2 & 0x7, type)) return 0; switch (type) {