From patchwork Thu Mar 28 01:26:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 47560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1013608pzb; Wed, 27 Mar 2024 18:26:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmg1RCoCY8x2k9J2P88XScDsUInJKue9eBAVtrEKM2omiVnCJCqZpoIGIvLVqAZrhuwN/AO7+latEQcpoHxcUotMOjAtcLEYa4fA== X-Google-Smtp-Source: AGHT+IE9x2u7kFg191XWNbJE+uWryoBwfLhM2WHAvk2dOFNDAXqWhcdr6QRvgv0NOA3oP9Krb9eB X-Received: by 2002:a50:9305:0:b0:56c:3b74:ea4 with SMTP id m5-20020a509305000000b0056c3b740ea4mr971529eda.21.1711589215708; Wed, 27 Mar 2024 18:26:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711589215; cv=none; d=google.com; s=arc-20160816; b=TdllACIaL44CXgD/zC5hP5yHCo+ADW7JtejRWCJtddpVziwxZnVaK2CicM9WEWTXFC j8w4LyNBvIkDGEkYYljyOVSHt+z/Jwl4qc7+tbpbgiRrVXM+JodsODiCrJzPfQTy6K07 fuzocKMqoI+AayueeH0bUPOG71A3zVR8Sl7z2/ST5Ftp/QrCzKOSUeY5YKrnkLjR/J/9 6Iw3eBFz5OWtfiCWgmV46a/BjkyVWhK4uEscRBQhd1N5q5TuFu7m4zskiPJN+1B0HuXA xxzksWZg7r1gQpmie+pqy82mqPr3hUAutAAkM/M9lomLifWEMvn7VN3ycdtP1LI4Abvx qPrQ== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=/jPbUgxpB1OZNAUMiHwwAe33wUpLjQzNM5SvMd8uHWQ=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=Ux8dmI34F+fv8OFQcpwlpfc7g1AYwFbSPKCPGYBeOTi8OMebJw8kuRrKuw1PlTJIvF gXYPNE2w/51LwQxI+sqsk9wi2BCOx9EjrQLEcd6ixE2CaxQzpFZLtdyJH68E1P5tAL9g I9N3RHLj4aDEm45He2hRnaVD47iG0NH5AjPW2aN4N5QId8awsuFKjPfgUxjko1E2zpnN WkgnkTErscuCo0n28Fcq7yry44UBOi6CECytcMY6p9jRJ4s5sKOhMow2Qq8QSjM+dp3C HeIDKilm1XcXEsmjcsiLccMuYujjRtnVm5sK8e6VwWnTrtxHE0DWM8HAww41mUsJ+84l TeXQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Vo6sVK7v; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u25-20020a509519000000b0056bd010477fsi199197eda.325.2024.03.27.18.26.55; Wed, 27 Mar 2024 18:26:55 -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=@intel.com header.s=Intel header.b=Vo6sVK7v; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09C1D68D5B9; Thu, 28 Mar 2024 03:26:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E366A68D5C3 for ; Thu, 28 Mar 2024 03:26:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711589187; x=1743125187; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=utwfDSxEgg/slcNX+HngWy+9ZMytOEyM43v0CZNXR1o=; b=Vo6sVK7vVZiEY1JST5ljKt6kip+vlEKz20S4M/Uftpschk6/epv0OIcb I6oDNF7ZNl80Lc3NOf/IC37oQQl1ep+aV1N5AE17iANawuPQ+G0yqHNxk D7UdlqtJVfCjPYexn0kVc/39h5C81xFsvDQaQr4OB062T0XzNs6uUDgFx 6n+F8rcp/v8vmNRktPdaZ5uhR4WrOyesOlZc05qL7HLKxAhxV3aznjLDs lB5jXVsB4Xx8OlnYe2UhRRyUW0XUXdTFWNVrCeTreFAsBaf88bFpi03s3 BXwz2qhXZ7ZT3oHqf6sCDP3E79QxIkQAEXVrT//kuHRg065x8KJj3kF47 w==; X-CSE-ConnectionGUID: b9XJwCppRYOMdaSCAbiBJA== X-CSE-MsgGUID: nTYyZZ8nRCWjx5u33Gp/tQ== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="7324916" X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="7324916" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 18:26:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="20996875" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by fmviesa003.fm.intel.com with ESMTP; 27 Mar 2024 18:26:15 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 09:26:28 +0800 Message-Id: <20240328012631.777476-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240328012631.777476-1-fei.w.wang@intel.com> References: <20240328012631.777476-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 4/7] lavc/cbs_h266: Add NumSlicesInTile to H266RawPPS 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PF5xGGCZcScV From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 19f83aeb49..87bd39c6f5 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -594,6 +594,7 @@ typedef struct H266RawPPS { uint16_t col_width_val[VVC_MAX_TILE_COLUMNS]; uint16_t row_height_val[VVC_MAX_TILE_ROWS]; uint16_t slice_top_left_tile_idx[VVC_MAX_SLICES]; + uint16_t num_slices_in_tile[VVC_MAX_SLICES]; } H266RawPPS; typedef struct H266RawAPS { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 12f821b3fd..3f378d199e 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1976,14 +1976,13 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, if (current->pps_slice_width_in_tiles_minus1[i] == 0 && current->pps_slice_height_in_tiles_minus1[i] == 0 && current->row_height_val[tile_y] > 1) { - int num_slices_in_tile, - uniform_slice_height, remaining_height_in_ctbs_y; + int uniform_slice_height, remaining_height_in_ctbs_y; remaining_height_in_ctbs_y = current->row_height_val[tile_y]; ues(pps_num_exp_slices_in_tile[i], 0, current->row_height_val[tile_y] - 1, 1, i); if (current->pps_num_exp_slices_in_tile[i] == 0) { - num_slices_in_tile = 1; + current->num_slices_in_tile[i] = 1; current->slice_height_in_ctus[i] = current->row_height_val[tile_y]; slice_top_left_ctu_x[i] = ctu_x; slice_top_left_ctu_y[i] = ctu_y; @@ -2026,14 +2025,18 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, slice_top_left_ctu_y[i + j] = ctu_y; j++; } - num_slices_in_tile = j; + current->num_slices_in_tile[i] = j; } - for (int k = 0; k < num_slices_in_tile; k++) + for (int k = 0; k < current->num_slices_in_tile[i]; k++) current->slice_top_left_tile_idx[i + k] = tile_idx; - i += num_slices_in_tile - 1; + i += current->num_slices_in_tile[i] - 1; } else { uint16_t height = 0; infer(pps_num_exp_slices_in_tile[i], 0); + if (current->pps_slice_width_in_tiles_minus1[i] == 0 && + current->pps_slice_height_in_tiles_minus1[i] == 0) + current->num_slices_in_tile[i] = 1; + for (j = 0; j <= current->pps_slice_height_in_tiles_minus1[i]; j++) { @@ -2074,6 +2077,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, uint16_t height = 0; current->slice_top_left_tile_idx[i] = tile_idx; + current->num_slices_in_tile[i] = 1; tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; if (tile_y >= current->num_tile_rows)