From patchwork Thu Dec 1 08:14:07 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: 39560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp196684pzb; Thu, 1 Dec 2022 00:16:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf7563zZaWNESwo6T/R4thiC5QrD9j8uxMOeC9ZRK8CkB7uecAD5ORrZJ/H8i8/HsNIPWRbK X-Received: by 2002:a17:906:d211:b0:79d:f5f2:6f55 with SMTP id w17-20020a170906d21100b0079df5f26f55mr36609367ejz.531.1669882590333; Thu, 01 Dec 2022 00:16:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669882590; cv=none; d=google.com; s=arc-20160816; b=p9BB5Fy+guZwcMS/aFIHMJETfLIThn7+J2MnMOQS+WEravbElRwj49+OZzmV4wuGg8 DRhXtwnBVcF1mQQE8b1lcOGG3LdomxWEbEcjDsB5czlCftHGc31q/OTD51BdBDt1v3rP TfwrQZ9ZhyFmOo3RkFS8EZP8BMUwvbMX6R+YAcxbjMFgq5t0aMH1d8wQXO+edmNLhyuL 7NyuQdGJjqwXmtSjaH1rw7Dy46HowQtRAHGElKF+CbavadM56+HgNtUlKdt/URUlFZ+G seYv+O5dXiobHl6B5seTatvlcBJsu8f+kTxWicOR58JMOiNyx9E3CRHhiwS6UiS+Sd1j pCeQ== 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=HrrT7CIV8g93gLEkYZypcf68FPeXhUBHOk1Yr+iJ0QJdGdIXrtGtCe8gm6IHdIH6MK 2pbrGG/7KB7mg5fWf06uOWXt1YQeM7JKW3gJdiCzg6i48OnFn9HuNm7Fc+mXjmqWObYu RdgC0kYZGhFIKKi6zsKghkMS/nJc4pK8hUDV1rOahqD9/7er/F11VKmW6eZJZcgfW1Hg Q9MaiqakyV7unrO266IDosbNlq4If5IkU+8TrKK/F00HEtUJ2NrTQ2eP25Y9/gWTfqf+ H59Wi8IW8eTGL1rkPosu023IVCBTw6GSXMp3gaIqcRpb765WLN8JfFtkIP7RV8vHQKB/ LBuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=EwT13oil; 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 ga5-20020a1709070c0500b00788a4c018b5si3012610ejc.806.2022.12.01.00.16.29; Thu, 01 Dec 2022 00:16:30 -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=EwT13oil; 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 C0B8368BAF5; Thu, 1 Dec 2022 10:15:06 +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 5B80668B937 for ; Thu, 1 Dec 2022 10:15:01 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669882501; x=1701418501; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OHUixGZsACCW5pMzYM1ZohkUKZtuOF6n2w2a3NdJRVs=; b=EwT13oiluzZJlGvXVNCz6vyqtiwMdJbeyMWBZnjGYDTfdUkFIN8jWiBe tHv4l9NI8qJsZtMki6x2Qk/MklvoJpHdFQRp8BTbjGz9+1woMkk22c3KT g63S+WxbsznijsQBFy6SdjIBIDq8Xy88np1DVorodIYBBQBGSjOkbkHOU qPAZQS9aHirpEyazcXGX4ZGDNIwtjfh17qJvNMHUih2EZsXKSGXz5ufNd n+hBGvdBSBWCvc94GS+zXpZp1VxsSN2CYH6+jf6KWX9gnXf0NfMgUTeJi Q+JTYosqskGWdKmBgzdrbKb/aK4d5iE8vYXP3I9PRE8HWp5E2Hi/K/wXw g==; X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="298989870" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="298989870" 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:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="675341799" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="675341799" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga008.jf.intel.com with ESMTP; 01 Dec 2022 00:14:57 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2022 16:14:07 +0800 Message-Id: <20221201081408.2194579-12-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 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: oOYawSAbrDqR 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,