From patchwork Wed Sep 18 07:10:27 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: 51643 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d32e:0:b0:48e:c0f8:d0de with SMTP id cf14csp732210vqb; Wed, 18 Sep 2024 00:19:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUWxi214fcFhysJpw7zYkuBwY3W5nqpcUMekOT+MAOT8Ll5MbkPHrzq7ws3SqUfrumueXZdFd0tunyEApI2GPl@gmail.com X-Google-Smtp-Source: AGHT+IE02rob2ZtG7LgzBRyWMNHhxvanAJRm1AkQwseXr/1AAOl35EHCE6sF7Gt5Rop44DnSNDSn X-Received: by 2002:a05:6512:3d93:b0:52e:7f6b:5786 with SMTP id 2adb3069b0e04-53678ff8a54mr10315425e87.61.1726643956756; Wed, 18 Sep 2024 00:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726643956; cv=none; d=google.com; s=arc-20240605; b=IbPEoGBN5CllXWzNIq3RN9X2nyJiD+dZ4e+XkQGkVKnc+khhNQWzBUkZulThywJPro 0QfEKNcjtJfGeeGgkasm64jnU51Hkk8lZyFA62573s7izOTdaJkn3Md3yrcQDwqb7V8o GQ+1j/mSQ5KYf/mJq9yMt6JD2OQn1nC++l7nICWe9XPc6+QHQPt+Hl1OYw4YDmKOWTP5 N2UdXiFpWFQ9BqqgLtmSch6Zjg2/X2WR86e7UBdQyqzyKHzd2l7LxiUjW/5PPlZYEcV/ 34I2YsuNn/KecGT4HBUKZ9USiq0H3X4DPfYpUgSkFenxfghEYYpNo4g2DButoe0dFXyX BHWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=ocFap6JnksnlLy6AsLOhuI8nGhrYUIjbPwO496pDgeM=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=BZoOIDXzoKH6Ue8/rIBOQNMCG84d0wo+YTWySbbzSYVh7OeB42lMvvuOLYP/UwYZx0 CXRNy2o2YmZiuV7Lk00YMyqU3lHMk+1cZR+lrWefM+HhfCTspcI9oButqsMWRCmZMwqd FKSj4Dv2jkwxTkl+4N9tLBU4MdrAqH6Xu7hhbVk+rL7oVLv2LDicCIl2g4Jgob4BObal 5pMwb1yqg5PIKz1FwFzk+WJLm6pmBQk0Pki8p5hSwavjrnkjh1E8dUZYrOfhs37r3uZo tGvkZ2uU7lldFc4s33kKcaHderyiQt1m80nItR9mDIl3Of4UI3ljbPk2VHu06rxk15LG 76LA==; 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=LNY7rfS9; 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 4fb4d7f45d1cf-5c42bb50e41si6480441a12.117.2024.09.18.00.19.15; Wed, 18 Sep 2024 00:19:16 -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=LNY7rfS9; 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 06A2568DCCE; Wed, 18 Sep 2024 10:08:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 608A468DCCA for ; Wed, 18 Sep 2024 10:08:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726643300; x=1758179300; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K0CCWmdMgYENqXSMnfd5a+qp3Ql8qgg/ajiOjgvPxDQ=; b=LNY7rfS9f+PKvmzcHnfmBwwnYxMR2lcuZVFjb2bkLEzz1WCdqJJiEuVn IwuHM7N02ZBRuN4fNBCwse8IBv6IGCNp04lLx59XB/8tA+Pdbz4icKlDd K0+ctJSe6Sdw9QeQqQjvU+IGW6V72iXRyDZqDKterhrN6hp5Nrr8J7w4I 7hqLtoJ6a88tezVg3avVoVfnV0evLskkB6qHE5VeX9BBTv6pMxW6R553B 3WI0pvGE4l1dLZQ5Gd42o540DCxHt+sP9MzFDj9LmmrfjUfszK/KPLdbb NAdIhCx/s7ejwGNB556outUPUTtxM3E3MoFRHalMayMOsTminxRp0ABeR A==; X-CSE-ConnectionGUID: TueDcUM0R6+l0FaY7xcW3g== X-CSE-MsgGUID: FaUbZQRzRTCNBXhr7N2F+A== X-IronPort-AV: E=McAfee;i="6700,10204,11198"; a="25695718" X-IronPort-AV: E=Sophos;i="6.10,238,1719903600"; d="scan'208";a="25695718" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2024 00:08:10 -0700 X-CSE-ConnectionGUID: +9LpPRfbQmWbtzfYfmp7Rw== X-CSE-MsgGUID: NnscMZbrSXil3kLZFFSL1A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,238,1719903600"; d="scan'208";a="69452258" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by orviesa009.jf.intel.com with ESMTP; 18 Sep 2024 00:08:08 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2024 15:10:27 +0800 Message-Id: <20240918071031.1377336-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240918071031.1377336-1-fei.w.wang@intel.com> References: <20240918071031.1377336-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/8] 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: sZVCPsm8oZ1v 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 7f0e537b31..67a3ff6151 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]; ///< ColWidthVal uint16_t row_height_val[VVC_MAX_TILE_ROWS]; ///< RowHeightVal 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 2e20119cc6..a6d926052d 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2005,14 +2005,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; @@ -2055,14 +2054,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++) { @@ -2103,6 +2106,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)