From patchwork Mon Dec 5 06:09:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39603 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3010414pzb; Sun, 4 Dec 2022 22:10:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf4QMdifQAILLoXrYUd3YpP7fOZKJlOX/rpv+ARZE9DT9HQNlc14mXYKHQ1DOMe3wh6XuQNq X-Received: by 2002:a17:906:7f96:b0:7b2:b782:73 with SMTP id f22-20020a1709067f9600b007b2b7820073mr52457352ejr.641.1670220651269; Sun, 04 Dec 2022 22:10:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670220651; cv=none; d=google.com; s=arc-20160816; b=PoXl/uKkLZbwLWj7EBD3TlQCr5vq1bBYBncuX6BZfkZ6lqdrtLOHXCVqQTkYq/hMTS mMnkBjAamIq2CUVqxfD1omV4mWODzdkavLyNuhqKDxQ+7C1BgIAuihTy2s/Nh22KDeZz 4T/9xUF782hoUQ4HvYikfMRJLadbeTtyl9T9YI0s44CMUYqXw2WazalhyivQkj10do/H U6IffA6fyCsyNm1ZhdCt+6J513uMtn+Ftxkfya3tdeWfMnPh5OdFJhozFbRn3q68ybhh xKUVi5ybYjHy+LPJn6p8NVzGK4zG8p1H827FUz6EU2i4UtXjzDj2vnM4jzAUaPVDvOFl MwKQ== 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=EvA/KiwpYfQrT5s8+tk8tz/WVhAOq56XwT3lQwjXMKM=; b=HtSu+hnyvyEcxwlvgqNCSbdaO4Frh3vv96Alkbacb9Lo5EOjiS3WVFSO1knlDLpxXu LAdlKUztnPCaDWd3Rx2ctzN2f7cMe6bYu8SbMcsd2np03kyv5WMYAt1tc0JiJBp6xKbx n0SMZYERcFOq8rx3wE5Slj1pC0L52rE2CzU+4RQMEX2ZdkQK8Z2zjlz78gjY9BBAtFPZ 1qeohhkoGhqHMNG1ex39fJMlEp9tOnD9ABHaZu9CdHdrYHjQ8yzStSIHPwAWjB4Uyurd +tASdJlvba+vlQx76XARLDyPtIjijiieNPyh+Cbqj8f5PYF6dLxkow0/NO3PpEcTkm+b 4Rng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IANJMzMj; 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 dn12-20020a17090794cc00b0078d4b605b71si834537ejc.338.2022.12.04.22.10.50; Sun, 04 Dec 2022 22:10:51 -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=IANJMzMj; 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 9806F68BC7B; Mon, 5 Dec 2022 08:10:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D65C268BC69 for ; Mon, 5 Dec 2022 08:09:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670220605; x=1701756605; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=IANJMzMj6wRVf9/iNZ6vTDP3QrhpHumHX931VkLmQKjPJ0KIGEdnFsxy Qpxw9qCW6HT3F/rcPCh5DnObheo4709L22XKpkh8WPRl7SlYYbsHIhiB3 j0X7Cu4UcxUXduwKUh2prZuTcqqdfd7rEDnNZbPWBs0Ox2SaGHymZGKoj KULHlMch2XWklw/Q6qBH+y6t/Yf33CRo1eZrLMwt1lElzVBkt9YmUZWFE 1CUmcHY1VMYxzZsQhCPVSFaRVEcAW0R6u2l6sfOfarZNdFMZU1KpWj3uD bOc8tgL85OhsHO/6bfdfhUOhOhgF0tZIho1Jt42lCGrQILDCYRn1zgcuw w==; X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="295971370" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="295971370" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2022 22:09:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="645700086" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="645700086" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2022 22:09:52 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 14:09:22 +0800 Message-Id: <20221205060929.2511871-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205060929.2511871-1-fei.w.wang@intel.com> References: <20221205060929.2511871-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 06/13] 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 Cc: Linjie Fu , Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4dTLOpxPvipZ 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;