From patchwork Tue Jan 3 12:59:47 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: 39845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8049755pzb; Tue, 3 Jan 2023 05:01:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXva7/JlA/5INYZ79abQiisrOhD4tZXjmd/C08pvb9VEVlNtZ9wDb7hS6a2O7BYdVVs+nIDw X-Received: by 2002:a17:906:1419:b0:84c:9016:79ae with SMTP id p25-20020a170906141900b0084c901679aemr15227493ejc.53.1672750904474; Tue, 03 Jan 2023 05:01:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672750904; cv=none; d=google.com; s=arc-20160816; b=oHVp0T3RdPnI/C7WCD5P0+1KeZt3ZSeTTzmkBoSNz6QVfCNPXyf7c+hm3+a3W3WjLv XFyY1kX8pLnOPxhVOR0TRxB094CMoLFNtki2atwUVJ3QI3eknyIMaIRzkuQ8Uxy6zMxG 4UmOFli6OmePvAF9jZ0YJ1/iIO2uRW8wWe26uXj36/yc4vSp9tCwmBgBJuoE1I+iZkUw s8tj6XCvjCe897VbE3jnlnmKRNULADCmWI2pmiftuiOjWq5LSwl4XiN3VC/RnlrxpUXx +dhpnbXxt0yWWbvHUq3qtQFVxrWa8GDtwq87+0rwtQ4b0SVxlerY1K4znIXrJRJB1sOt oe5g== 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=IWbEE3dheDNKEi4QRFknOWPxBMQ6+vOlkV/pvfMu+3w9GBnIBIVejmO1C6/JPgYEZh etgf1BPVyn0poViLn3wgORjiBm4Tf1xE1RPAb3nqpv9xY6ES4NoNDR+n27wMlgNjtMqy E4phuPG75W0iev5IAxk20p2wuTOm30lTe17KjRflTzW7fuKMpCTlZJVaWR7wKAqAxanz bi7R2wnrnRRuQOkwvWGoI1Foh9HL8D8FwMKmXRlkkhkP8a57r6DhamurzXET3kOFJ5T7 jQslKKnSt9PrPJycSnFjIlKHyKh7PSM27WyyJyXBk7UaB/reQ4cHIfKDg7DIClzADTPx 9vfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ci7AwK8q; 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 hc44-20020a17090716ac00b0079bf804c0c4si26785503ejc.103.2023.01.03.05.01.42; Tue, 03 Jan 2023 05:01:44 -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=ci7AwK8q; 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 BDE5968BD60; Tue, 3 Jan 2023 15:00:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9416668BD3B for ; Tue, 3 Jan 2023 15:00:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672750848; x=1704286848; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=ci7AwK8qn9Yn7MdVgt7SPJuaf4zMEWfCQk0KsSzwVOd1U5OElSFfk+gM 0TzdauZBlxC63Hj/bxt/G49bBBGxVArwrpHB6jxlHAPM6KAagHrtToTr+ iHrH4ii3NbrlkDYS5zXg/DpxOIusiI7y6FGcnCD3m2LUJVqQvoiT9E0qU qM7Jpbao+CuNKyu63T0aG49yDtWSaCLbbfskJ790jx9E3r1OJx2rPaTMm oWhI7agHs4DWMQjbAxMXwdyU9bqA5TPGDBnjSTDUmPVCL2M5kACLcqBQE Rs7EZe1+J2hi53RKj+mNRnRKG90tRag3NMWdPSLO0WFXI+6akQeHooFD+ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="302026281" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="302026281" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 05:00:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="718091833" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="718091833" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2023 05:00:37 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 20:59:47 +0800 Message-Id: <20230103125952.2707824-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230103125952.2707824-1-fei.w.wang@intel.com> References: <20230103125952.2707824-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 06/11] 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: wVLFByHCiXqg 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;