From patchwork Thu Feb 16 01:32:43 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: 40402 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp115798pzk; Wed, 15 Feb 2023 17:36:03 -0800 (PST) X-Google-Smtp-Source: AK7set89TVQ+zQF1dtpXFWUQ2GBotGJmNTj53XWn9Xrb/f2gYbL46O3xI1HH4m4ZuIAA8IdP0518 X-Received: by 2002:a17:906:19d8:b0:878:7349:5ce6 with SMTP id h24-20020a17090619d800b0087873495ce6mr4148944ejd.71.1676511363167; Wed, 15 Feb 2023 17:36:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676511363; cv=none; d=google.com; s=arc-20160816; b=URTFuSUW4badez5XCe+FUbD92vOoyBTuqFSR8/zdqFwU3G+6PIWehp9xK5Vco7r4fP /mlTjHUF83pRomjYnWVss7w7qsWI1LMIuNVXCPpN4m9ahm3gtSMtrPAJUYVlF6EXx7Ko wCR9Kli+yg2GBOAtmXk7RFATCkzSLiqCFTXh7C+CiQKUDh+0KvRG2NO+7Yut2RNssKz0 xCAf5gD7Rs3cPHJV9Q9KNBKX2IBdMqu5hXKEH19dE9SKpzPV0LsXhLXx6gq4Gi8xnDWc S93i0ua/Y79dPdLbUesoqTpli4PSdTDo2ohYsWPCOTZc3TKLeYpbTbKxKjHTGoJJ+sWp YoQg== 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=vosILvdzXFhJKKVx6ITXS6KB0gU8GN7ZIVdj2q8OXZm8RsNzpKCeIGTCl4FZj78oKh n9z845c5m7vrW+By38hp7Alqh8Xw2KuQZZExU3zNZVE/ksn7MI9zEF82PmnPSne82/oA +vNKcXjWCW0ZDnQdkUqMppWafsgUamdxk8R9D1uEYBXzmqBDp1Nvyl8IBKiDwpeFgRwK qVmj2r3TFg1BbCS9heamqt0pUznQHeWs4czc7E+ThrIPa3t7sGicxs5kLQbAuBjk3uUB 3/h2Q+I5O6fA2WxzEbt0qk0KgnPUM2GPi7nOj/RsXzuxTLvx8sTXRHj2y2lSLB2E/uhw 5YRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=UASJNILJ; 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 wg3-20020a1709078f0300b008875216c082si289263ejc.374.2023.02.15.17.36.02; Wed, 15 Feb 2023 17:36:03 -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=UASJNILJ; 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 1DEE268BED1; Thu, 16 Feb 2023 03:35:30 +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 58F8E68BEA4 for ; Thu, 16 Feb 2023 03:35:23 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676511328; x=1708047328; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=UASJNILJ/CCdWOb6ghRcs4Cg7JhaDWZgrRLzjZatm5bGoRgcsYb/HkW0 AwrIESXJW97cOxb5T1fm1fCpVxtl7HzBr3A4W2SMadFNGaTvDO/nKKF14 5xWa4Djy98G2d2425yt+EL64Kra/wWSch6nGrza9n0QsxPCDYtkUsqXQa 8+CzdvwljJhPT5s+GzOSdfeyY6z7ttILsk7soFBFs1jOFNM5PaGrv2U4k 5wdr4Vb51wB3Fk7I7cmKQNvQ9ep/rrkaUGTOsgdl8ZV0AZ4M11uix/Vre 5zotzIi+PkNLlZqbPMf35Nd+mSY/kABqBVHUwOVhUgHo2GI3k+6L8ZvCV Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="311223804" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="311223804" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 17:35:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="779168806" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="779168806" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga002.fm.intel.com with ESMTP; 15 Feb 2023 17:35:16 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 09:32:43 +0800 Message-Id: <20230216013248.23044-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216013248.23044-1-fei.w.wang@intel.com> References: <20230216013248.23044-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: vdQRJ1ldS4Ty 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;