From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B8EC24A98E for ; Mon, 6 May 2024 18:47:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5535168D6A5; Mon, 6 May 2024 21:47:17 +0300 (EEST) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 558A968D647 for ; Mon, 6 May 2024 21:47:10 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-51ff65b1e14so2715424e87.2 for ; Mon, 06 May 2024 11:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1715021229; x=1715626029; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=RPfZlx5Xc27Kffb2U7ZEiLeuXT4cUaKabE/3eQjUlJQ=; b=njNVbJB/xJ1xGGTJ/D5uFjAo1ncfZssoMOw4e7DbCkPNWd4fTvA6nQxU6pOGVWnilm OTqwoafVvuJbQOEalsX/Z0n9kSMGvRtwmLZlxpdqBvvvDgJ2KlgZ0F9GaTHzIYjbwDpp xigJfSgxmkn3x+MtK4MCd7r6irgNlg2vMyprz6AoJAQfJkn+FTCJCfPFpIROW4FtSn6Q 5gaspcOc3wuKq2IDatNG48XBYTrvh9/iVvBM9I5aIYMUBK70CkmS1Fk8wRHXo/bgud6K O/Y521BmG/RQbNVlTcX5X6Av2gG12p+OU4zc2GC+yTJFyYFvORWCs5bRJBeRRH4Ohj0y 6syw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715021229; x=1715626029; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RPfZlx5Xc27Kffb2U7ZEiLeuXT4cUaKabE/3eQjUlJQ=; b=VUKv/cJdNy3XmP/uKYoS/WJR8giiLe0tDdQipmULvrm1ZpKMN9uUNoZehqL+HxAvy2 l4oFYWk48ILpjjQxLASFz/zlKCbq3nV3UnVBUJZDtQgQS+soW+NPuTVQSCrKW5qUqa2e oEDRV2ohBj3ujgrytQ6ejSd3D11ejDDCBqebuOsJwWmg4f9YCeGzc55KOQcbCIAje9Mo kR0xkGmpS/4bdg3KtlIz3XauJbLVasJ4ImyvOywaUmxrN1Ka28ohX4agRZeiX8eWVkf9 Es99/FV9jU6HbmFxsApchFg4OBcBCpNaymJhQs8kOjEJEOka+QbHaFclmFglytEs1G/q SLWw== X-Gm-Message-State: AOJu0YxoY2ENmWuYn/uM15SY10n2EXeslw4BUtF2hsSMsCUEfPziW1TN Ly9T9nyuTmiX/QlxPtFu3yHSBKhr+5Fkqz/XyWQDKWbNFLbA2mDSj3Uor2BkVH7xZjisDmUgmWC R X-Google-Smtp-Source: AGHT+IFuIT2PoKsuZDtsaRk+tZz7+BzXUMqFk/OjQhY9pG1ylj2V9HcCDxSIClx2g4lCTF/aea54VA== X-Received: by 2002:a19:5e53:0:b0:516:c9a7:82de with SMTP id z19-20020a195e53000000b00516c9a782demr7359568lfi.38.1715021228805; Mon, 06 May 2024 11:47:08 -0700 (PDT) Received: from localhost.localdomain (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c501400b0041aa79f27a0sm16987184wmr.38.2024.05.06.11.47.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 11:47:08 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 19:47:19 +0100 Message-ID: <20240506184726.826159-1-sw@jkqxz.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] lavc/h265_profile_level: Expand profile compatibility checking 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Replace existing get_profile() with find_profile(), which finds the lowest compatible profile rather than requiring an exact match. --- Series changes since v1: * Added H265_PROFILE_INVALID with value zero because it simplifies some code (and the values don't matter). * Fixed the h265-levels test. * Added a new h265-profiles test which tests the profile compatibility checking. * Fixed missing VAAPI profiles. libavcodec/h265_profile_level.c | 78 +++++++++++++++++++++------------ libavcodec/h265_profile_level.h | 71 +++++++++++++++++++++++++++++- libavcodec/tests/h265_levels.c | 2 +- libavcodec/vaapi_hevc.c | 2 +- libavcodec/vdpau_hevc.c | 2 +- 5 files changed, 123 insertions(+), 32 deletions(-) diff --git a/libavcodec/h265_profile_level.c b/libavcodec/h265_profile_level.c index 7ff9681f65..2e4a1c88bf 100644 --- a/libavcodec/h265_profile_level.c +++ b/libavcodec/h265_profile_level.c @@ -40,6 +40,7 @@ static const H265LevelDescriptor h265_levels[] = { }; static const H265ProfileDescriptor h265_profiles[] = { + { "Invalid" }, // profile_idc 8bit one-picture // HT-profile | 422chroma | lower-bit-rate // | 14bit | | 420chroma | | CpbVclFactor MinCrScaleFactor @@ -119,41 +120,62 @@ static const H265ProfileDescriptor h265_profiles[] = { 5, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 2, 4000, 4400, 6.000, 0.5, 6 }, }; +_Static_assert(H265_PROFILE_COUNT == FF_ARRAY_ELEMS(h265_profiles), + "Incorrect H.265 profiles table."); -const H265ProfileDescriptor *ff_h265_get_profile(const H265RawProfileTierLevel *ptl) + +const int ff_h265_profile_compatible(const H265RawProfileTierLevel *ptl, + int profile) { - int i; + const H265ProfileDescriptor *desc; + + av_assert0(profile > H265_PROFILE_INVALID && + profile < H265_PROFILE_COUNT); if (ptl->general_profile_space) - return NULL; + return 0; - for (i = 0; i < FF_ARRAY_ELEMS(h265_profiles); i++) { - const H265ProfileDescriptor *profile = &h265_profiles[i]; + desc = &h265_profiles[profile]; - if (ptl->general_profile_idc && - ptl->general_profile_idc != profile->profile_idc) - continue; - if (!ptl->general_profile_compatibility_flag[profile->profile_idc]) - continue; + if (ptl->general_profile_idc && + ptl->general_profile_idc != desc->profile_idc) + return 0; + if (!ptl->general_profile_compatibility_flag[desc->profile_idc]) + return 0; -#define check_flag(name) \ - if (profile->name < 2) { \ - if (profile->name != ptl->general_ ## name ## _constraint_flag) \ - continue; \ - } - check_flag(max_14bit); - check_flag(max_12bit); - check_flag(max_10bit); - check_flag(max_8bit); - check_flag(max_422chroma); - check_flag(max_420chroma); - check_flag(max_monochrome); - check_flag(intra); - check_flag(one_picture_only); - check_flag(lower_bit_rate); +#define check_flag(flag) \ + if (desc->flag < 2 && \ + desc->flag > ptl->general_ ## flag ## _constraint_flag) \ + return 0; + check_flag(max_14bit); + check_flag(max_12bit); + check_flag(max_10bit); + check_flag(max_8bit); + check_flag(max_422chroma); + check_flag(max_420chroma); + check_flag(max_monochrome); + check_flag(intra); + check_flag(one_picture_only); + check_flag(lower_bit_rate); #undef check_flag - return profile; + return 1; +} + + +const H265ProfileDescriptor *ff_h265_get_profile(int profile) +{ + av_assert0(profile > H265_PROFILE_INVALID && + profile < H265_PROFILE_COUNT); + + return &h265_profiles[profile]; +} + +const H265ProfileDescriptor *ff_h265_find_profile(const H265RawProfileTierLevel *ptl) +{ + for (int p = 1; p < H265_PROFILE_COUNT; p++) { + if (ff_h265_profile_compatible(ptl, p)) + return &h265_profiles[p]; } return NULL; @@ -171,12 +193,12 @@ const H265LevelDescriptor *ff_h265_guess_level(const H265RawProfileTierLevel *pt int i; if (ptl) - profile = ff_h265_get_profile(ptl); + profile = ff_h265_find_profile(ptl); else profile = NULL; if (!profile) { // Default to using multiplication factors for Main profile. - profile = &h265_profiles[4]; + profile = &h265_profiles[H265_PROFILE_MAIN]; } pic_size = width * height; diff --git a/libavcodec/h265_profile_level.h b/libavcodec/h265_profile_level.h index cd30ac5c50..e4e63dfef1 100644 --- a/libavcodec/h265_profile_level.h +++ b/libavcodec/h265_profile_level.h @@ -24,6 +24,50 @@ #include "cbs_h265.h" +// Enumeration of all H.265 profiles. +// The list is ordered to match table A.10; numeric values are an index +// into the latest version of this table and have no codec meaning. +enum { + H265_PROFILE_INVALID, + H265_PROFILE_MONOCHROME, + H265_PROFILE_MONOCHROME_10, + H265_PROFILE_MONOCHROME_12, + H265_PROFILE_MONOCHROME_16, + H265_PROFILE_MAIN, + H265_PROFILE_SCREEN_EXTENDED_MAIN, + H265_PROFILE_MAIN_10, + H265_PROFILE_SCREEN_EXTENDED_MAIN_10, + H265_PROFILE_MAIN_12, + H265_PROFILE_MAIN_STILL_PICTURE, + H265_PROFILE_MAIN_10_STILL_PICTURE, + H265_PROFILE_MAIN_422_10, + H265_PROFILE_MAIN_422_12, + H265_PROFILE_MAIN_444, + H265_PROFILE_HIGH_THROUGHPUT_444, + H265_PROFILE_SCREEN_EXTENDED_MAIN_444, + H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444, + H265_PROFILE_MAIN_444_10, + H265_PROFILE_HIGH_THROUGHPUT_444_10, + H265_PROFILE_SCREEN_EXTENDED_MAIN_444_10, + H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_10, + H265_PROFILE_MAIN_444_12, + H265_PROFILE_HIGH_THROUGHPUT_444_14, + H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_14, + H265_PROFILE_MAIN_INTRA, + H265_PROFILE_MAIN_10_INTRA, + H265_PROFILE_MAIN_12_INTRA, + H265_PROFILE_MAIN_422_10_INTRA, + H265_PROFILE_MAIN_422_12_INTRA, + H265_PROFILE_MAIN_444_INTRA, + H265_PROFILE_MAIN_444_10_INTRA, + H265_PROFILE_MAIN_444_12_INTRA, + H265_PROFILE_MAIN_444_16_INTRA, + H265_PROFILE_MAIN_444_STILL_PICTURE, + H265_PROFILE_MAIN_444_16_STILL_PICTURE, + H265_PROFILE_HIGH_THROUGHPUT_444_16_INTRA, + H265_PROFILE_COUNT, +}; + typedef struct H265LevelDescriptor { char name[4]; // Large enough for all current levels like "4.1" uint8_t level_idc; @@ -70,7 +114,32 @@ typedef struct H265ProfileDescriptor { } H265ProfileDescriptor; -const H265ProfileDescriptor *ff_h265_get_profile(const H265RawProfileTierLevel *ptl); +/** + * Test whether the PTL structure is compatible with the given profile. + * + * @param ptl PTL structure to check. + * @param profile Profile to test compatibility with. Must be a valid + * H265_PROFILE_* value. + * @return Nonzero if compatible, zero if incompatible. + */ +const int ff_h265_profile_compatible(const H265RawProfileTierLevel *ptl, + int profile); + +/** + * Return profile descriptor for the given profile. + * + * @param profile Profile number; must be a valid H265_PROFILE_* value. + * @return Profile descriptor. + */ +const H265ProfileDescriptor *ff_h265_get_profile(int profile); + +/** + * Find the first profile compatible with the given PTL structure. + * + * @param ptl PTL structure to search for. + * @return First compatible profile, or NULL if no compatible profiles. + */ +const H265ProfileDescriptor *ff_h265_find_profile(const H265RawProfileTierLevel *ptl); /** diff --git a/libavcodec/tests/h265_levels.c b/libavcodec/tests/h265_levels.c index 66d72c63a3..9923f346f7 100644 --- a/libavcodec/tests/h265_levels.c +++ b/libavcodec/tests/h265_levels.c @@ -275,7 +275,7 @@ int main(void) } for (i = 0; i < FF_ARRAY_ELEMS(test_bitrate); i++) { - profile = ff_h265_get_profile(test_bitrate[i].ptl); + profile = ff_h265_find_profile(test_bitrate[i].ptl); level = ff_h265_guess_level(test_bitrate[i].ptl, test_bitrate[i].bitrate, 0, 0, 0, 0, 0, 0); diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 3bdd2dd1b8..77f55ff8b1 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -604,7 +604,7 @@ VAProfile ff_vaapi_parse_hevc_rext_scc_profile(AVCodecContext *avctx) /* convert PTLCommon to H265RawProfileTierLevel */ ptl_convert(general_ptl, &h265_raw_ptl); - profile = ff_h265_get_profile(&h265_raw_ptl); + profile = ff_h265_find_profile(&h265_raw_ptl); if (!profile) { av_log(avctx, AV_LOG_WARNING, "HEVC profile is not found.\n"); goto end; diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index 4cd7ce5621..a59a030b1c 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -478,7 +478,7 @@ static int vdpau_hevc_parse_rext_profile(AVCodecContext *avctx, VdpDecoderProfil /* convert PTLCommon to H265RawProfileTierLevel */ ptl_convert(general_ptl, &h265_raw_ptl); - profile = ff_h265_get_profile(&h265_raw_ptl); + profile = ff_h265_find_profile(&h265_raw_ptl); if (!profile) { av_log(avctx, AV_LOG_WARNING, "HEVC profile is not found.\n"); if (avctx->hwaccel_flags & AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) { -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".