From patchwork Thu Feb 2 07:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124917pzk; Wed, 1 Feb 2023 23:12:14 -0800 (PST) X-Google-Smtp-Source: AK7set++BZ8BNgh5ph0aPUjiwdvoXJKjFNhlVl38Mt7R72JYqPJcobytLeS1dSf9v1b6YTvSw5KN X-Received: by 2002:a05:6402:4508:b0:49f:bf08:b60c with SMTP id ez8-20020a056402450800b0049fbf08b60cmr5029676edb.26.1675321933840; Wed, 01 Feb 2023 23:12:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321933; cv=none; d=google.com; s=arc-20160816; b=BBE1muCSm+CiVJOYA5ZtYOr6REzva0JLilFsxl2PP1IeEKPa6JYtN9S/ABequ2LJny egeLh9vKxoAvdczW8PH9TNc3kGaNkfrhC8U6sScl6vQ8m3zSTiEI8SVw5i2AJxxGo0bh mKGduiq5nr+OiCdCgbHfMTB7oBsQrnaGjeCQhkSaW5jvW+hF0afs4B7IN5fl6prg1kps vaMGsjsN2IPWROzWRz/woEVqWthKJVqu4nGtqQSU6STIiCIW4h8sBEqFMNrcyYn5OpR2 RAn77zlVmgaCzunsW7nCknwCGZ8nPS4NlJP5TCsMZmh2zDWE36FOH2JMG5C9o96BI9g4 YYLA== 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:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=p7C4VEnJtbvRKwAFVIQNNeTXiv3j9Jx4qlbOdTD6Pzs=; b=q9CgxJ1P7RniW6sP7gpi3xYlRy2SqD/fJbU0lidrwok9epxxKDpcMrtlSJJwCqqi/S kkyNlSPZOXIVk370KQcJeacFdqUVWnYxnkLM4bDVWRQKT8OjFsi+5UKwlVHtDzn/F5X9 27k9q8JI+9Xn1lmRWT3J6lqHguDDNhrC6JfvKZk6yjv4l9tTd87P7GAWhxrQigjMD7sg bZsrvSRzxOWXKihvNu9sQ41oDjZ6kPXYxYh7XJ/LWQxGe30L8sTBAHpZ9epWDdpoa1Se fFsGxVUgTwJGAkZn1xWpIBNq95cwZGH9YbCVjZTpZTpWBsMjYob/B4yspbbz6X6y6LtY Rn6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ywm76QMw; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fp16-20020a1709069e1000b008785e08cd3fsi7000114ejc.468.2023.02.01.23.12.13; Wed, 01 Feb 2023 23:12:13 -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=@foxmail.com header.s=s201512 header.b=ywm76QMw; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CA9468BDF0; Thu, 2 Feb 2023 09:11:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D66DF68BB4D for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321862; bh=xKUuTTtTDCJZ3BMm1eGLB3BKRGGMK4FLt+fuMzLRNAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ywm76QMwwElQjm6i/ocie63dH7HhJRO6svcLh6KwkPYQqtnsJdliFd8XlgLpb19sO sqgNbCowTL+qcR2sb7GR4Al4vqOzPXOODwLC5A8d7DKlmA+yfkXlBtCT0tB9r4auIi oudsR4dlTA+nKrOM9QbmPvdOUK/Q/hdBuRg7RSAY= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 2C0380C4; Thu, 02 Feb 2023 15:11:00 +0800 X-QQ-mid: xmsmtpt1675321861ti0nl4kre Message-ID: X-QQ-XMAILINFO: OaoBA5NOFC/jZ/U8iOl/xTUa0zB68Mb22bj3kREl3GiJUYKtJhS0KjiBwmch66 UAr6MtHdXaJ8CIeKn4fFYGodf4E7Y6eGzdAKwHazq/SYedGZc7WXcgMEK7fjSPDMhnIph47UXYOd 5J4oY8aGnnqq8NXFSYGD4BYAzGpnRfiDTCeKXTt2a4BAUFzxMD86zY6rGCjVJiuofqtQSVl4OLBZ B8ev3iRq1gO/dr+8j7S1tAkOUgsck17dCO40amwLwnlPV6orWG7UFEhtfo8Vc0OToYLT9b2wiODs LbG9+iqkm0XnF/9y1JyXV/tY/i6Xa9BR4lvay7+u/7ZmAM8BxYPzBXMHzCGGNSiKdJh3l+ITqctC Igu+yixpyA7Xjzl45TSymbLgVru4AUlZeTJIxjbw8kEbeXUAakeyPDnThfXmkocVGuel2ZrIoAOp PM95h5d2osbbouDFFqIYWbYt1ut3R/pcZJQbjIDKxy3SygmKUfhBRghBkk54z9tzC4hPKCrbyVQ1 XPyghJAhjxNj8wtTeGkKAhKBLYJRMkrOiqH9iH4SZMah1vsy1zzD3r7XmH482TqBuXbl5LJ6BoTX FiIw6MEJY91bmRqtOqLGLirJpLEx/wpxTuejLcrZFJ3bHSy/mVQmsAl5NVpio68TEun+84ckePWl cpuu3PNv8mQ6avciHOLzU0eZGA9elcHRMpwQRjkMoDTXSNwS7fCajt9EIGGeDwopapWEBX8bkZLd Yr6DSnqx8p/TGM7x47zk9EWQvHAhDNJTqKiGAgocidMmSj21ELTVDEF6g4VdiJamnNEaYM28RkrW ypDzy3HoucjfVKArWGnJym5P+xoq+jOdHTBDflb+LmG//3Xda0Q0raU/BtaJaGdFmI8uankq57XA jc9Qmv/7UiPyWY0ZsT28wlVKfhrae9Vs9jmkAp2eDsxNSu/69593YUmSpVBeDexNhvhwlv0IrDTT Q38kGwFcJQlWqmkvZMnOiHCoD2eHGx/UFpvE06iwslx29jQKF9BQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:04 +0800 X-OQ-MSGID: <20230202070208.1962086-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230202070208.1962086-1-quinkblack@foxmail.com> References: <20230128135818.387953-1-leo.izen@gmail.com> <20230202070208.1962086-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH major bump 2/6] libavcodec/dynamic_hdr_vivid: fix start code check 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uiJ08aKvMkV7 From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index f7a41ed2d5..4bc1cd3c70 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -46,7 +46,8 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t return AVERROR_INVALIDDATA; s->system_start_code = get_bits(gb, 8); - if (s->system_start_code == 0x01) { + // T/UWA 005.1-2022, table 11 + if (s->system_start_code >= 0x01 && s->system_start_code <= 0x07) { s->num_windows = 1; if (get_bits_left(gb) < 12 * 4 * s->num_windows)