From patchwork Sun Jul 2 13:16:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp3737590pzh; Sun, 2 Jul 2023 06:16:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlFZDmHOXuwzD/EDn2fakkXAdNMgq8xfOG2NEJ9mHzX0zonB2gfw8NQUeVQnj2LwofnQ5/5Y X-Received: by 2002:aa7:c1c9:0:b0:51e:720:3ae7 with SMTP id d9-20020aa7c1c9000000b0051e07203ae7mr1455077edp.3.1688303814669; Sun, 02 Jul 2023 06:16:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688303814; cv=none; d=google.com; s=arc-20160816; b=A3utAsXwFWRDrPQeNZpNT9CsEeGjntxf9JJiUmUxH45hHtW17LgqoPShI80CH94vxE ncwff0FXfUxAKhrOYdu9CuAA7gne0i4qJ3waSps9ve/BqjjeYkYGzwbsXLaVLp+u9/9t A6qXKsNSwXNvSCLjqKHmOFCsIIAcWSVlxIifGn0P5LV8jqEzdVg5DQybxi0VjMu3RGyg YIhwA5WJLTaNFgzGRPhGe06Wghju+QeqBvMlQQzcHRCOozxZWvFEsRWsrc7otYt8Ppgm L6RQ8BmLg6oRxt71NVztqXbnnqFm9Ip7XV4NBwuX4SCXBIa6Rda5220Ao+kB+JYd5F61 AevA== 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=AClYLhk4hh4AGQDL/ZNRbQX48tvsVR7AljIJsPaG/8M=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GB0EyqoTnL6VOQUjaxGp19t4/99oJJlaEJndCljPo88D4dqFjWnSWpyhXFkZuyB31F xfl+PAFUilAG2Ll8KgcD8m3+U1RuWtB8DOZ5/sojepG/n37iou32atoUxf6zRZQ5JOTq Lyyh1gs+w3kKHNPPbaqzvLVZf7LT4vEmZfuohunCiLQ3OUjiKYwYdPvkNaTU3h8RvnuW lymkvdAuwdFDVzNNNYoQ7Gldjp5K8cIIJZt6916g9CMmwzmCkd3bMHZAUb65nRqq8xJ5 COR56rOFYpMgjCZ0spJbdSoSo6pVuy+3B2kR9Jm/zHwHCZyx/WPw5EPBEIKoxgrYdJKG Kftw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=SdKvxlpX; 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 v20-20020aa7d9d4000000b0051a600e9668si6007125eds.672.2023.07.02.06.16.54; Sun, 02 Jul 2023 06:16:54 -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=20221208 header.b=SdKvxlpX; 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 0917B68C2DA; Sun, 2 Jul 2023 16:16:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82ED568B3CA for ; Sun, 2 Jul 2023 16:16:44 +0300 (EEST) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6b74e2d8c98so3099756a34.2 for ; Sun, 02 Jul 2023 06:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688303802; x=1690895802; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ANbjNhuBDleb7WLFDAh/Q4yjRbrx+Lk2ung0fPviBf0=; b=SdKvxlpXaXBe7hr81BUACGJ9hIIEVc7NlPuwCSrX0jB3TT7gFQqei6wjzZ5MpgKoSa iRHQQj2d14QsMWpf7eEZArlahy6Uairn9KENhLWZlOv6A5YQDbqkiOd3p8EaRikg0qRf hyW9MAIDp9UX5NYf/Wk73FLVNhs0X9L7HDz3z9upoetj4e3CyxnOTUmcvKoPFsni9A2O oIhDTemvouqy/eQZu7STChcZPSYkMWOP/IaNT9DJ2Rl/e+bsnbWtUiml+cnf682TVcmr TlBe6uAx6nb1IYClvNsQka6H/q9IGGC7KO5Jdg55iO9xJz9JiXD0a36KkJAME3gM+E+k YQdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688303802; x=1690895802; 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=ANbjNhuBDleb7WLFDAh/Q4yjRbrx+Lk2ung0fPviBf0=; b=DrGW19Hehacw3hnt4bk+zvDrYxfYL5t9EIKnVE1faz4R5wlUascZax8v0BK6u2mTl9 y549348hUMwmCbeQVU1lsKk8Hd1Ccw6ipK7t0dHa+510RBL3iKDeNVHx4j7UrVzTE5UC L8G8cDL0xKl9hNCTU/hto9f9LBKCX9ydMGso5pzlLXCWlYxT8ydI/IlLzKmSoKPaaB8u htUCYE/lvkYrfz2INQN31XHUW0UU48IDJ+zAAwduHahz17dEiUO7Py6NOmi4wavyvSdK zufMzK2GbW5/0Q7SBRm9xqoLN0OmxYj+X8MS7JbamgyrG/7Tvc1y8ViGgTCt9JAI1KtZ /2tA== X-Gm-Message-State: ABy/qLbYqHzIRjG9EdlLtTOnFNy+Nv3zfmNoNhtyupgFMUANO50M4f8m Q10rJf3cIyg3Y2cGOuz+tYH4CdQKHuM= X-Received: by 2002:a05:6870:3b07:b0:1a3:16af:56e2 with SMTP id gh7-20020a0568703b0700b001a316af56e2mr8589242oab.19.1688303802285; Sun, 02 Jul 2023 06:16:42 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id gv15-20020a056870aa0f00b001b08f19ec4asm4917248oab.53.2023.07.02.06.16.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 06:16:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jul 2023 10:16:29 -0300 Message-ID: <20230702131629.1794-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_h266: don't infer derived values 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: LMIkIrUea4I1 The macro is meant for coded values only. Signed-off-by: James Almer --- libavcodec/cbs_h266_syntax_template.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index ae44565a54..957735056f 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2015,9 +2015,9 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, infer(pps_tile_column_width_minus1[0], pic_width_in_ctbs_y - 1); infer(pps_num_exp_tile_rows_minus1, 0); infer(pps_tile_row_height_minus1[0], pic_height_in_ctbs_y - 1); - infer(num_tile_columns, 1); - infer(num_tile_rows, 1); - infer(num_tiles_in_pic, 1); + current->num_tile_columns = 1; + current->num_tile_rows = 1; + current->num_tiles_in_pic = 1; } flag(pps_cabac_init_present_flag);