From patchwork Mon Dec 5 06:09:28 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: 39607 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3010653pzb; Sun, 4 Dec 2022 22:11:25 -0800 (PST) X-Google-Smtp-Source: AA0mqf4Z1Q7rIWONzjpsuZsxL9bCg17GgfW/kMpfqME6C3gfQuo9oJ14jLxtDDyQJd2D6x/1xFPp X-Received: by 2002:a05:6402:4d0:b0:462:317a:e02f with SMTP id n16-20020a05640204d000b00462317ae02fmr60225993edw.125.1670220684996; Sun, 04 Dec 2022 22:11:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670220684; cv=none; d=google.com; s=arc-20160816; b=peslouAWl5F4BnsWq3oRqrjS/HXLTlYRLlmM4ODS3Trz35k3tiIwod0ZMdSqOWqtFV AdyAh1fW7+6PvOHxrYPSusoifISmIaQZlwpwV/BxbY89UQlbMXYkzV/5uZtoRehLg3ww FHnau8Qh5xMquOLsOwWp8BgQ0y5/ptdCGiqWuOWEFoLFSByNw144iNkuia32UepPf81h rPJScUPV1yryEGNRm3m9Qz0R7wtC6RpW7PU95yk9fz/TQsuPB77KCA1S6avFdCRQh6cp XruRf4g6cNy+OK0de9446ImxtpPDSck3kYAsQx9M+5X2Gi6/N0xm16NwKitOrnZ+bbFT M/GQ== 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=d0KfVYsD3idYq1KYCa0gPCCUS46apI/blf5XtaOiLhs=; b=jvHQcwXu/8GNaOexS5G+Xii/Ls2EAMkSEUyg7lnyPJ7h30LFIsRWgfOBEKtUKw0Y6H rQmCMgaj+5xUkk7rwhXaFO5+wxKVsw8ZIIuJo8dktjuhhtxfwuO488Pb8EXEQDkfABKm wITZ0DJ+6docGp37Mjc88Bl3fuzhYMvgSheiwRMghoTiN1yeLDdYLe2jAkmntY9vuSON OIW89JiiwsMNlQZFumwDytOKQBQQ69uwSLcmJvKbOocTO8Mn5B9OqlUrXVUw001dJjLP ZoDAf4B2PG1pbMfxMMNUCIIwiTUhdxZZmubWsZ4eGOy9Kg8OYF6xdocrqR8PWUupYE4p ZOuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=XfCYwJLQ; 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 la26-20020a170907781a00b007c0c8084a0bsi4882540ejc.970.2022.12.04.22.11.24; Sun, 04 Dec 2022 22:11:24 -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=XfCYwJLQ; 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 3F5B668BAFB; Mon, 5 Dec 2022 08:10:12 +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 1C9CF68BC8C for ; Mon, 5 Dec 2022 08:10:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670220607; x=1701756607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OHUixGZsACCW5pMzYM1ZohkUKZtuOF6n2w2a3NdJRVs=; b=XfCYwJLQbsL4vN211crzAwweNPEe08b2JKQ0o8SFxRz3jBgQX0S+ojfK 5XrD2F09hSVIHz/ZuLCXK4CMpktgGt2CwkusPTiYqDWJKLLdGHlEHudPG 2Ubd80r/ABZJjq9nQDLwXDFHUP/Oyt9Ko4uRK6ly7GakcABn2oT48zksv 7H0S8r7xZx3OVFVx5SzX1AYuoAX4XcNMR7eikz8hR+t55ZWKOl3OyIhLF 4pRdSyPsXWo52qBRCG/RFE1+UVc66u2HGAgurJCvi//YeaVdgmJ7hSmn4 jZ+9ZKVR8nhyitDIqGPvZfZTMajURBDrYeviAuBpA6nKNPX955vy2BO4K Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="295971412" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="295971412" 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:10:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="645700132" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="645700132" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2022 22:10:01 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 14:09:28 +0800 Message-Id: <20221205060929.2511871-12-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 12/13] avcodec/hevcdec: Replace number with enum 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: Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 64mf06rSyJ4h Keep same style with IS_IDR()/IS_BLA(). 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 aab816791e..94609e4699 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -75,7 +75,7 @@ #define IS_IDR(s) ((s)->nal_unit_type == HEVC_NAL_IDR_W_RADL || (s)->nal_unit_type == HEVC_NAL_IDR_N_LP) #define IS_BLA(s) ((s)->nal_unit_type == HEVC_NAL_BLA_W_RADL || (s)->nal_unit_type == HEVC_NAL_BLA_W_LP || \ (s)->nal_unit_type == HEVC_NAL_BLA_N_LP) -#define IS_IRAP(s) ((s)->nal_unit_type >= 16 && (s)->nal_unit_type <= 23) +#define IS_IRAP(s) ((s)->nal_unit_type >= HEVC_NAL_BLA_W_LP && (s)->nal_unit_type <= HEVC_NAL_RSV_IRAP_VCL23) enum RPSType { ST_CURR_BEF = 0,