From patchwork Thu Mar 28 01:26: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: 47559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1013547pzb; Wed, 27 Mar 2024 18:26:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUZDGJIS1nZDDC+E8Gt6d73Faeh718CxyjuHZEFj30lakyDcQr6UJONtNf2z/IEP7Ck61t8+ZFDnCfYJ+HGEH13vcEOfVeHqvlvrA== X-Google-Smtp-Source: AGHT+IFpqU+rY56vvJTEkzm3e2MBHY5n8Jo00rp/BaKMmWvytAAeidKllEv9ooGY7wrbyYEEvN0b X-Received: by 2002:a50:9fca:0:b0:56b:b03b:2a85 with SMTP id c68-20020a509fca000000b0056bb03b2a85mr928347edf.0.1711589207357; Wed, 27 Mar 2024 18:26:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711589207; cv=none; d=google.com; s=arc-20160816; b=dTHJNDrv5GLy07Jt+qsdp7b1Ttt2piHll8c9aCZaIRQw8GHv1Mg8NZMGYbCyloz3uV a8VFuW8KIHu3abJxydwvJ+Mp0VB23bXqXNjmUybkrBo3dBBKYIifDjfKCvXy80dBiqNH cq0mAJme5ZikLz/cG0aLsDlUJ1gXQuQ6VJoyMbhyFAwbYGmWANKlc0wmn2dz8NDBnLRu xS5GmjVCzJdw5c+O20lhAVftjTW0x19la/pdPvyU650O13pmr8e1rFSS3OKeCiGLWrb0 wjSr2t2MLqqNIxwWO/HTMB2TfuOy1pvAJccW8di/QJGiPxwqA+6adrftxZSZNmAAWjJQ 7Y/Q== 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=9wZ6rTPXEzngp7gKr5+D5Zk7hOtod9oBjI6ThVpj4oY=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=mzx+fliYmCmci/HqOBiP66YdL2XiZHir2z8nUTLKcf73RQTDuxN7xwQeRwaFLISmqX tsR0seehc//2drWU3OtOpP+kdquLO22a99lC7clc+A/qww85+24YRXSBU6qWlzg8fmxR PA3uv8mGa+rDe1bBoiUIrJ7rGxhkoNVkCU/uTHDCffd7dNnLxB3/AWrRX2vKnbn3vLN6 EdVC3mn+/RZgibhW5s7ZT4NbLAF0VQRPlRi+G6GxAGMkLAQqnle6bHNPDq7zHOOeKc1Y +FHweceBCSWVY93KQPNibVKR48k2LvdEP6E5txBqpRGLFg25DZzsI65ppLdSXZ6ja/Xj 2FsA==; 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=LttFI4G4; 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 h22-20020a50cdd6000000b0056c05e25a0bsi203669edj.564.2024.03.27.18.26.46; Wed, 27 Mar 2024 18:26:47 -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=LttFI4G4; 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 C604568D65A; Thu, 28 Mar 2024 03:26:28 +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 BC56368D5BD for ; Thu, 28 Mar 2024 03:26:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711589184; x=1743125184; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=N89d+IlQinF5gBxBo1swXD6em6O/XZlgeE9+ombH2ME=; b=LttFI4G46g+xpckbLpCpGlq2qomE3t8J3g3DFMdM0bJGcl8Y+/Dw5wXN BxjK0m4EtEa2UirXvquNgb6doUYjCVxHdm6RQsJuk305cf88teRdZ+rPv s5diCPy48Ua36XDk6WKAMAQAy/c1T/R9uJ30vKTZuDGinogI9D5ZhDTWg iUsDHcQj8LUWwTnmW99k09/x3aHgnv2nJusH5cL3ytJNLhf5fiAdU2xBn oWwQZN41k6awLWvHsddQ0IicEDZWRMsizoWIGAnF/sZKtE4vekSBnKQyT MBPfit7Z7gprs+27mND822ppE4r5Z/u5fi5moJEbXorVdcWRXC/wc3sw1 Q==; X-CSE-ConnectionGUID: L7vlRf1LS3KgmhdhnRY6bw== X-CSE-MsgGUID: tP91TWbnSHatalQ/3RuQug== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="7324914" X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="7324914" 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:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="20996872" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by fmviesa003.fm.intel.com with ESMTP; 27 Mar 2024 18:26:14 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 09:26:27 +0800 Message-Id: <20240328012631.777476-3-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 3/7] lavc/cbs_h266: Add SliceTopLeftTileIdx 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: p2hrj+au4VSB From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 73d94157d4..19f83aeb49 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -593,6 +593,7 @@ typedef struct H266RawPPS { uint16_t sub_pic_id_val[VVC_MAX_SLICES]; 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]; } H266RawPPS; typedef struct H266RawAPS { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 0aae9fdfd5..12f821b3fd 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1945,6 +1945,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, else infer(pps_tile_idx_delta_present_flag, 0); for (i = 0; i < current->pps_num_slices_in_pic_minus1; i++) { + current->slice_top_left_tile_idx[i] = tile_idx; tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; if (tile_x != current->num_tile_columns - 1) { @@ -2027,6 +2028,8 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, } num_slices_in_tile = j; } + for (int k = 0; k < num_slices_in_tile; k++) + current->slice_top_left_tile_idx[i + k] = tile_idx; i += num_slices_in_tile - 1; } else { uint16_t height = 0; @@ -2070,6 +2073,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, if (i == current->pps_num_slices_in_pic_minus1) { uint16_t height = 0; + current->slice_top_left_tile_idx[i] = tile_idx; tile_x = tile_idx % current->num_tile_columns; tile_y = tile_idx / current->num_tile_columns; if (tile_y >= current->num_tile_rows)