From patchwork Fri Feb 3 02:09:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 40228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp835952pzk; Thu, 2 Feb 2023 18:11:16 -0800 (PST) X-Google-Smtp-Source: AK7set95+MYNn2jY2D3R5EVWoKh92LsZm94dRLvLBo6F5dhWjIPuw+BHDT5ojssvBZO+OIgNFGsO X-Received: by 2002:a17:906:8586:b0:889:1eb1:7517 with SMTP id v6-20020a170906858600b008891eb17517mr8417828ejx.30.1675390276383; Thu, 02 Feb 2023 18:11:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675390276; cv=none; d=google.com; s=arc-20160816; b=aOiMHj7G0tRgnt/2kLPWZcS3VgT0hdFrRI/Ngt6SIfaY7x7kx+mUgmgxnbIHsWJwd0 8DL0vFFv+2OlPLai4iHIkAbrtQZsDuP20/yp4TDeb8udSnwkJ6HYXEnOwQl3GFAxhqJp Hj6RocQ45Qf3LiXMA2TZMw/5uQEkqYsE+KGmptHuT15/QlcfeKZkuLPkjyT2SZskk9MM p/vXLHBCa1Y0YYsCCfetbtukd/WFgsqy6wMVWgFEcrDKBVz8GxZXzOAbnyO1ICzDVt5/ exxQ4Wkh0915Qxzo34+r/K8KcIA4gOYQYrVdiqyNtAEcdADHtCKuGeMuMw4OMjkBHGQ5 yH6A== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=EvA/KiwpYfQrT5s8+tk8tz/WVhAOq56XwT3lQwjXMKM=; b=SfccM7trQpJq65EYT02jO6eAZu1lmXDeNMChIPdqXGO4cPbesiEsyPudhwuGS9AK0q jfBun0tY/M8c10RVHO6K3c7h6wzm5p55f1SzOuwJ+k5GeufpBRtXpl/h0wTm7ly75On2 /uhOGagBrtttgcd/LMHp+Z6VQehti//5N+on/W77laL47Tb5JJT0YepUMcDdjsmA4zQN yp+r5CtvelD0nwWik3cRt6Zn++TDh3PzkJqLzr2BELU+0U8heZG/fNyKkzS/c0jzRrSw Pzx7VMTmd30baaqJBOqJkMWHGXstGEYehPZi3UHMnKitmffB7bJo8IwUMZXig/AdLWty 8Egw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=g88alkOP; 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 13-20020a17090602cd00b0087a56fcad9esi1657295ejk.278.2023.02.02.18.11.15; Thu, 02 Feb 2023 18:11:16 -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=@intel.com header.s=Intel header.b=g88alkOP; 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 C5E4968BE68; Fri, 3 Feb 2023 04:10:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B8D068BE17 for ; Fri, 3 Feb 2023 04:10:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675390240; x=1706926240; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=g88alkOPvSpIE2+9pGhoXYzrt075fzLfSn9w59qjQyq12lQNn8p0bQbo +v0Ksb24BcE8Oggcfu5u6wN9YxjXYt5+JXKdKPvt6kfvC9T7R1AM0RP9k qCwSNA/0CvLz+1CBzZCI4ZhJRDgsvCm/fvE5sDh9FtU9azodjLSZ45sZv PF0xj6pvMDPJ88Mobfu6vJY2xhWrvRhvtT3p3zbsQelauKvoJeE3rJMbx hQ2MtBdFt4EeLFwR7bWWxJ8XTsblctNgb8bCPvP9wIHuLj5Dk5Ci70VjT gv9ZJEoBqhCGDIERYVApbxGOFNsAB74iulg/Umuvwif0NXjLqKWJlpW/h w==; X-IronPort-AV: E=McAfee;i="6500,9779,10609"; a="328651732" X-IronPort-AV: E=Sophos;i="5.97,269,1669104000"; d="scan'208";a="328651732" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2023 18:10:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10609"; a="667505869" X-IronPort-AV: E=Sophos;i="5.97,269,1669104000"; d="scan'208";a="667505869" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga007.fm.intel.com with ESMTP; 02 Feb 2023 18:10:27 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Feb 2023 10:09:19 +0800 Message-Id: <20230203020924.443162-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230203020924.443162-1-fei.w.wang@intel.com> References: <20230203020924.443162-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 05/10] lavc/hevcdec: Set max_num_merge_cand to uint8_t 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: iSeRZR8TyRb+ From: Linjie Fu uint8_t is big enough and keep consistent with the definition in cbs_h265.h. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/hevcdec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index a7fc669bcb..aab816791e 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -304,7 +304,7 @@ typedef struct SliceHeader { int beta_offset; ///< beta_offset_div2 * 2 int tc_offset; ///< tc_offset_div2 * 2 - unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand + uint8_t max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand uint8_t use_integer_mv_flag; unsigned *entry_point_offset;