From patchwork Thu Dec 1 08:14:01 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: 39554 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp196225pzb; Thu, 1 Dec 2022 00:15:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf4eIRxJ++cg/KAUiLEKuIsq4DQ95LQ2mY2VxU2BQ3NQouH6DfzN+CVdf1+v0VHXPTCJYab+ X-Received: by 2002:a05:6402:444a:b0:459:401:c23e with SMTP id o10-20020a056402444a00b004590401c23emr44854206edb.23.1669882539906; Thu, 01 Dec 2022 00:15:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669882539; cv=none; d=google.com; s=arc-20160816; b=RHPHMfjMXs1dJ4FjqLWL7s2WUzOiaIblESR3ZvVSZ3luRJ+5vqDBlWQI9Rr0/+n5Fp XcuQxp89cS/ZD7Bf6u205wATNMkDkogOcpc2VcS6yFw3MCYlh8+mCjFx6zBr/PArVPUL ukon6nEImOp0FQKShULfsPb91flaGLg63QXPauGUFq3Jxn8dfzJIGwSb/B25fpTo7uEa qJxbxnOcRWa7eDPwNvvlALDVYJGBvNsesJQIm3PKOQmpwYvqKTEkkcV8nOMXQxeA9dad ztBjKgrthC2pFLBw1hHcK2hWt8pK+AAM7MqS082Bqj0EzcMbS1XL6ycgIvMejHSIS/3T ewPg== 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=HZGqjGLdO2pun/NEniLLnGjgbTIJfqmnEgVm4/XfoNvlxxGaAxuz4LkFePS7JfOk4g boNMN5tVIGcJ4AUAN4+3oYjCFAujBRDipj23WuTtQK4J6TyHRPeeQAloUGlLDFG1OrAZ Uq3qvdvMft5jtdM6kWc1o+Ytt9cVoUj4IpiOyR9Z8SFjsdwcegLui5+J7YcCLJt0mzon R7A6OuFZVwDnk18Kym1uaExnFaFR8AffgM1zUi/nalBcaoXC7VcVYGVKwigVX/7l2pu2 5KIXTeVquHai2PpuMTyHArkJqTPM/AVXk47oevVSzj7dlOgOiyXWRbvJuY6FEbWWI4TZ IsSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="V5/MF90D"; 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 a8-20020a056402168800b0046b3407a453si993738edv.162.2022.12.01.00.15.39; Thu, 01 Dec 2022 00:15:39 -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="V5/MF90D"; 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 2ED2F68B9EC; Thu, 1 Dec 2022 10:15:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E586F68B9E8 for ; Thu, 1 Dec 2022 10:14:53 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669882499; x=1701418499; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=V5/MF90DuBbr5yhz6FlCd7S78eecz04PysOH/C+qYSOMYag305pApGhE k3xiAf19HsxyfJ/GTfzlqP5UnEso999zognIEL2ErTkbGQZ41nBC4g/qs ND13jmOfq/Hej4uZ97MzZPbsXxqLeKLrmeYQbWX5dS5Qused9+bkx2ljs Bod6wrAUyuCC220s1Ch8WBx3ufmMLj1VDARALAoCY48iEsN1UC+ulot1I BOHbP07tyEDAy/qM9CzVXSvUxrCgM0zGOyaInNmhbQPEBXGTV4/y5hVP4 ONQ06qvFTq/ULN7StGCszyV6AzGnBLgCnsXhBkix0uoqIfNqjGZBn6eAH A==; X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="298989838" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="298989838" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2022 00:14:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="675341750" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="675341750" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga008.jf.intel.com with ESMTP; 01 Dec 2022 00:14:47 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2022 16:14:01 +0800 Message-Id: <20221201081408.2194579-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201081408.2194579-1-fei.w.wang@intel.com> References: <20221201081408.2194579-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 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: A/N3HkYD9D4b 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;