From patchwork Mon Mar 18 04:21:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 47153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp795693pzb; Sun, 17 Mar 2024 21:21:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWOpl0jPrfT4av4IuA1rF9MYw2FJNJf/4zu0MRXERdPojd7zuH86obmuM4gBm5bIXsu3Ij7mtZ/HZuNZH8SHQRgJbyvN3JXIKx64A== X-Google-Smtp-Source: AGHT+IF7ygg46NWvhQohpHHxF/vgUaxGVjRx4eVwbQVq1HawZ2K+JKiCz0BLihcasdURLC9gzxvt X-Received: by 2002:a17:907:a0cc:b0:a45:ed7f:265c with SMTP id hw12-20020a170907a0cc00b00a45ed7f265cmr9044359ejc.0.1710735674282; Sun, 17 Mar 2024 21:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710735674; cv=none; d=google.com; s=arc-20160816; b=uUz50kQ1ptHHfQD8oOoPKpJeeCd86HzcWZ+DEilqjKZQuavOoLCq1zgh16oD4dDWdv rRpcY3DCVl9zwBYLAP7Fhw9QkJiq8HGhBnQ2vd1sHPedlEtsVdjB7yBvI/ryuSHOlAYM g7VObKtvqRlFH+dkuSzMpQBt8ILA1gYJWtKXx1wD6Z0TOASbp8Etc3Xd9cX2w0keqxzW zxSPy7swf2yIgAHmh4AKxofc99LFtMr0Wq7RG4fjU/Wen+AEiZtDrx5Y8qnff5bbLO6M TRX4cSz9wUxs5vNlGam9Ulio2VNd4jqMXv4dFx7pEfDcDrj/qKkkLwVIbmx5rY0nvEGl zJbQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=rXZRxlEpBlRmZbZCf812seSuAP6KlQQqMiVoKgDr5hs=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=qfbRkiPf7n8OTDiP5J8G1ikTIPL9c3B7KdiOe+8MB5hyW2O9NgmXHrHBki2dVaaI/d 28j/79pYJrkJdojPqD3VbegjjWWiGG1+b7+0QpX1RMh0L4DXMt93uoHkUjXludvEJXjJ Pz7aOicwHqvuxwtgjsUzZgSmtB/JpcHLWG0mq8hvacINc5O6BkYbAEvV3RVzvsdq8YhA pOUabAZiXpXfWLlBZhowGLbmF3sE0Qq07HtbTUQlPzmyqvnS6mErt89MFHZKRcILpmmI xlg+bCRkSvJ3KFuXp0WiYv1oSSIXfTNniqasK2gNg/97xXOPCQf+nG2Ij9C/9LD2YI8V xOcg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=TRsrkOam; 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 l25-20020a170906079900b00a46277efaccsi4024598ejc.754.2024.03.17.21.21.13; Sun, 17 Mar 2024 21:21:14 -0700 (PDT) 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=TRsrkOam; 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 94CE068D222; Mon, 18 Mar 2024 06:21:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C70D368D191 for ; Mon, 18 Mar 2024 06:21: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=1710735668; x=1742271668; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nOcE9rV9ZrKma1FXcoUQoMhBKb7g+K98UvtLFv7XrlE=; b=TRsrkOam4/uxWh2amkh0VuXnjvPaCNxUTsW6LrITGtf6PzVII3gGJNkk KKKGOkUBWvVYT2pAcauv+X8z5po7t0FjcdWuLs5dYY85IFANste++g0X2 NRS/rAHR/2a9yKvm2C8OFt8jkvQXtdEbietICJHhxoTinvm2mxc+R24be iDyCo4W1FY01LfNJ0OZfIYy+9QD7TewV9yDcLWhJko/UTFYOEaIpPwvW2 lpQP78Gd2pUZKA7yCmgLvUoueiWVC7tPr3u3z5/GUh56h150SmEjguXU6 PEX3yVjRa0PGlFjxL0cGAAz4+Hz4fs5qybocvf0NITz6xVTzuQAM9MYZa A==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="16675931" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="16675931" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 21:20:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="50780472" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa001.jf.intel.com with ESMTP; 17 Mar 2024 21:20:58 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 12:21:10 +0800 Message-Id: <20240318042111.21983-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] lavc/vaapi_encode_h265: Map HEVC AV REXT profile to VA REXT profile 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uk5wwzmPVcUO From: Fei Wang There is no Main8/10 profile defined in HEVC REXT profiles. Use Main12 which is compatible with 8/10bit. Signed-off-by: Fei Wang --- libavcodec/vaapi_encode_h265.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index c4aabbf5ed..43755e2188 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1305,12 +1305,12 @@ static av_cold int vaapi_encode_h265_configure(AVCodecContext *avctx) static const VAAPIEncodeProfile vaapi_encode_h265_profiles[] = { { AV_PROFILE_HEVC_MAIN, 8, 3, 1, 1, VAProfileHEVCMain }, - { AV_PROFILE_HEVC_REXT, 8, 3, 1, 1, VAProfileHEVCMain }, #if VA_CHECK_VERSION(0, 37, 0) { AV_PROFILE_HEVC_MAIN_10, 10, 3, 1, 1, VAProfileHEVCMain10 }, - { AV_PROFILE_HEVC_REXT, 10, 3, 1, 1, VAProfileHEVCMain10 }, #endif #if VA_CHECK_VERSION(1, 2, 0) + { AV_PROFILE_HEVC_REXT, 8, 3, 1, 1, VAProfileHEVCMain12 }, + { AV_PROFILE_HEVC_REXT, 10, 3, 1, 1, VAProfileHEVCMain12 }, { AV_PROFILE_HEVC_REXT, 12, 3, 1, 1, VAProfileHEVCMain12 }, { AV_PROFILE_HEVC_REXT, 8, 3, 1, 0, VAProfileHEVCMain422_10 }, { AV_PROFILE_HEVC_REXT, 10, 3, 1, 0, VAProfileHEVCMain422_10 }, From patchwork Mon Mar 18 04:21:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 47154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp795741pzb; Sun, 17 Mar 2024 21:21:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7eCCK3rgfV/r0WxfvrBFjPNz1PnDl3j0+x+pb2LCZiUd5l8W3dCkLcgphUEAhXoPX4d8ds+82VbC1aMWByIMtahF7rEn+DNA4Qw== X-Google-Smtp-Source: AGHT+IGPdMs2q9z9aZaMHFF6chNNz+/z43GnezYlbtw9F2gp6xwLo4lozsPRu0PY0edgs5rrVsbK X-Received: by 2002:a17:906:ef08:b0:a46:bdde:553f with SMTP id f8-20020a170906ef0800b00a46bdde553fmr1314266ejs.25.1710735685096; Sun, 17 Mar 2024 21:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710735685; cv=none; d=google.com; s=arc-20160816; b=FawdMloUJHcN3QwMxMEsIJCxF5F9RRhU0jCQdSxmALKxxRgfW7A0fK51HSRPjA7w0v /bT5mz+vL7Tj+Qde6kpQuiMaxYs+sV7zgb14uXBxuLkhpA30qmaCo8bC4mzTvQy8W93a E4WUDxMwVUEPKABbKYt8rrMlE4b77ZOAbyupiqpVsVwUU6aKP/juzFhKJirh4xTT1xme LkyFQiu9Hw9QeP4VWyztnw7/BSWQo7aX2ft1xOfL/4IQjZhgi6qsw3aBx7RXQfKWCtUJ 2WFe5tOcEAHDmS1b/Xd2OOeHw16Q1U/ZSPtjFIdMIPn68sBIYxNDxnGrQO/hiO5iOt0I cTWQ== 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=aCsurKhS9Z41T5f8QYI0m6HkSStojrMPnIpM//sK2qs=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=KBawISgD07BydANQL4xDyGlQEYt9xqWh01fjVRf/yAuXcRnLQ21ZPTonVD0vxOCAj3 ASzFrxC7s5zp2oo999hoOLWstywBh5dAc9PGfBDBmfrFMxNLAyQZnD+DATd1EP9TIg78 ryPMGdcsYoqJKesaZPEVnBx2ZEuJTAbObYqVkHS9QuA9oIDxrzQHUx2ecG4CtmEFkjhz WyY5moeRtmnzmsTePXjR91wH8tEbwFLz83khSzk/UPZJC0YCmSDc+roq+UHkTTstutBL sdS7IK1VepqjwqAP1JRT+Ti5aZQZYshsPDyvYCfS+ONAWGJz3MNz0E5Fg5lrMLiffKFk aWig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=QB5iVqxf; 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 hh21-20020a170906a95500b00a46a1d0d0f4si2121436ejb.89.2024.03.17.21.21.24; Sun, 17 Mar 2024 21:21:25 -0700 (PDT) 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=QB5iVqxf; 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 A159E68D22E; Mon, 18 Mar 2024 06:21:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B236268D21C for ; Mon, 18 Mar 2024 06:21:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710735673; x=1742271673; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OZE76fflxqCamFf0x2tzjL3oW2Lgc6HuY/PkrVWGU/4=; b=QB5iVqxfgn9L5UIft9j2yvGi+LpAwSoThSAbGAiDICCNdBlPw8cNKqQw lXnHGcSeSsiyaFPHaJmrN8LfihzaMB/ywjtx3WKrz04StryqBw6h+Wm68 aU3iaqYN2seAxWZldWnfrvixpgYQv6OXbkiTQpmcG4v8iL5DeAs1Erz/L Az0qPyaYb11Is2PAFYj2iBMZKDBHL2aSbuLxDbYsPczQwrxyF03yne2P6 LfTfU5bKehT2fsEybWiZVMiZ/zRIPoNMjAQMVofhoNoz4XI2UBa/arALw Bp+Sj6kRV8QYV+XqGfTgKPrbOFfJoOihBkV2yQT2JXIGJc9cAjS6m+mmY w==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="16675932" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="16675932" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2024 21:21:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="50780478" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa001.jf.intel.com with ESMTP; 17 Mar 2024 21:20:59 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 12:21:11 +0800 Message-Id: <20240318042111.21983-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240318042111.21983-1-fei.w.wang@intel.com> References: <20240318042111.21983-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] lavc/vaapi_encode_h265: Set general_*_constriaint flags with profile 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bhCTkHTyvywJ From: Fei Wang According to Table A.2 in spec. Signed-off-by: Fei Wang --- libavcodec/vaapi_encode_h265.c | 176 +++++++++++++++++++++++---------- 1 file changed, 123 insertions(+), 53 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 43755e2188..5ed317ce11 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -258,6 +258,124 @@ fail: return err; } +static int vaapi_encode_h265_init_ptl(AVCodecContext *avctx) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeH265Context *priv = avctx->priv_data; + H265RawVPS *vps = &priv->raw_vps; + H265RawProfileTierLevel *ptl = &vps->profile_tier_level; + + ptl->general_profile_space = 0; + ptl->general_profile_idc = avctx->profile; + ptl->general_tier_flag = priv->tier; + + ptl->general_profile_compatibility_flag[ptl->general_profile_idc] = 1; + + if (ptl->general_profile_compatibility_flag[1]) + ptl->general_profile_compatibility_flag[2] = 1; + if (ptl->general_profile_compatibility_flag[3]) { + ptl->general_profile_compatibility_flag[1] = 1; + ptl->general_profile_compatibility_flag[2] = 1; + } + + ptl->general_progressive_source_flag = 1; + ptl->general_interlaced_source_flag = 0; + ptl->general_non_packed_constraint_flag = 1; + ptl->general_frame_only_constraint_flag = 1; + + if (avctx->profile >= 4) { + ptl->general_intra_constraint_flag = ctx->gop_size == 1; + ptl->general_one_picture_only_constraint_flag = 0; + ptl->general_lower_bit_rate_constraint_flag = 1; + ptl->general_max_14bit_constraint_flag = 0; + + switch (ctx->va_profile) { +#if VA_CHECK_VERSION(1, 2, 0) + case VAProfileHEVCMain12: + // Main 12 + ptl->general_max_12bit_constraint_flag = 1; + ptl->general_max_10bit_constraint_flag = 0; + ptl->general_max_8bit_constraint_flag = 0; + ptl->general_max_422chroma_constraint_flag = 1; + ptl->general_max_420chroma_constraint_flag = 1; + ptl->general_max_monochrome_constraint_flag = 0; + break; + case VAProfileHEVCMain422_10: + // Main 4:2:2 10 + ptl->general_max_12bit_constraint_flag = 1; + ptl->general_max_10bit_constraint_flag = 1; + ptl->general_max_8bit_constraint_flag = 0; + ptl->general_max_422chroma_constraint_flag = 1; + ptl->general_max_420chroma_constraint_flag = 0; + ptl->general_max_monochrome_constraint_flag = 0; + break; + case VAProfileHEVCMain422_12: + // Main 4:2:2 12 + ptl->general_max_12bit_constraint_flag = 1; + ptl->general_max_10bit_constraint_flag = 0; + ptl->general_max_8bit_constraint_flag = 0; + ptl->general_max_422chroma_constraint_flag = 1; + ptl->general_max_420chroma_constraint_flag = 0; + ptl->general_max_monochrome_constraint_flag = 0; + break; + case VAProfileHEVCMain444: + // Main 4:4:4 + ptl->general_max_12bit_constraint_flag = 1; + ptl->general_max_10bit_constraint_flag = 1; + ptl->general_max_8bit_constraint_flag = 1; + ptl->general_max_422chroma_constraint_flag = 0; + ptl->general_max_420chroma_constraint_flag = 0; + ptl->general_max_monochrome_constraint_flag = 0; + break; + case VAProfileHEVCMain444_10: + // Main 4:4:4 10 + ptl->general_max_12bit_constraint_flag = 1; + ptl->general_max_10bit_constraint_flag = 1; + ptl->general_max_8bit_constraint_flag = 0; + ptl->general_max_422chroma_constraint_flag = 0; + ptl->general_max_420chroma_constraint_flag = 0; + ptl->general_max_monochrome_constraint_flag = 0; + break; + case VAProfileHEVCMain444_12: + // Main 4:4:4 12 + ptl->general_max_12bit_constraint_flag = 1; + ptl->general_max_10bit_constraint_flag = 0; + ptl->general_max_8bit_constraint_flag = 0; + ptl->general_max_422chroma_constraint_flag = 0; + ptl->general_max_420chroma_constraint_flag = 0; + ptl->general_max_monochrome_constraint_flag = 0; + break; +#endif + default: + av_log(avctx, AV_LOG_ERROR, "Unknown profile to init PTL.\n"); + return AVERROR(EINVAL); + } + } + + if (avctx->level != AV_LEVEL_UNKNOWN) { + ptl->general_level_idc = avctx->level; + } else { + const H265LevelDescriptor *level; + + level = ff_h265_guess_level(ptl, avctx->bit_rate, + ctx->surface_width, ctx->surface_height, + ctx->nb_slices, ctx->tile_rows, ctx->tile_cols, + (ctx->b_per_p > 0) + 1); + if (level) { + av_log(avctx, AV_LOG_VERBOSE, "Using level %s.\n", level->name); + ptl->general_level_idc = level->level_idc; + } else { + av_log(avctx, AV_LOG_VERBOSE, "Stream will not conform to " + "any normal level; using level 8.5.\n"); + ptl->general_level_idc = 255; + // The tier flag must be set in level 8.5. + ptl->general_tier_flag = 1; + } + } + + return 0; +} + static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -265,13 +383,12 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) H265RawVPS *vps = &priv->raw_vps; H265RawSPS *sps = &priv->raw_sps; H265RawPPS *pps = &priv->raw_pps; - H265RawProfileTierLevel *ptl = &vps->profile_tier_level; H265RawVUI *vui = &sps->vui; VAEncSequenceParameterBufferHEVC *vseq = ctx->codec_sequence_params; VAEncPictureParameterBufferHEVC *vpic = ctx->codec_picture_params; const AVPixFmtDescriptor *desc; int chroma_format, bit_depth; - int i; + int i, err; memset(vps, 0, sizeof(*vps)); memset(sps, 0, sizeof(*sps)); @@ -314,57 +431,10 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) vps->vps_max_sub_layers_minus1 = 0; vps->vps_temporal_id_nesting_flag = 1; - ptl->general_profile_space = 0; - ptl->general_profile_idc = avctx->profile; - ptl->general_tier_flag = priv->tier; - - ptl->general_profile_compatibility_flag[ptl->general_profile_idc] = 1; - - if (ptl->general_profile_compatibility_flag[1]) - ptl->general_profile_compatibility_flag[2] = 1; - if (ptl->general_profile_compatibility_flag[3]) { - ptl->general_profile_compatibility_flag[1] = 1; - ptl->general_profile_compatibility_flag[2] = 1; - } - - ptl->general_progressive_source_flag = 1; - ptl->general_interlaced_source_flag = 0; - ptl->general_non_packed_constraint_flag = 1; - ptl->general_frame_only_constraint_flag = 1; - - ptl->general_max_14bit_constraint_flag = bit_depth <= 14; - ptl->general_max_12bit_constraint_flag = bit_depth <= 12; - ptl->general_max_10bit_constraint_flag = bit_depth <= 10; - ptl->general_max_8bit_constraint_flag = bit_depth == 8; - - ptl->general_max_422chroma_constraint_flag = chroma_format <= 2; - ptl->general_max_420chroma_constraint_flag = chroma_format <= 1; - ptl->general_max_monochrome_constraint_flag = chroma_format == 0; - - ptl->general_intra_constraint_flag = ctx->gop_size == 1; - ptl->general_one_picture_only_constraint_flag = 0; - - ptl->general_lower_bit_rate_constraint_flag = 1; - - if (avctx->level != AV_LEVEL_UNKNOWN) { - ptl->general_level_idc = avctx->level; - } else { - const H265LevelDescriptor *level; - - level = ff_h265_guess_level(ptl, avctx->bit_rate, - ctx->surface_width, ctx->surface_height, - ctx->nb_slices, ctx->tile_rows, ctx->tile_cols, - (ctx->b_per_p > 0) + 1); - if (level) { - av_log(avctx, AV_LOG_VERBOSE, "Using level %s.\n", level->name); - ptl->general_level_idc = level->level_idc; - } else { - av_log(avctx, AV_LOG_VERBOSE, "Stream will not conform to " - "any normal level; using level 8.5.\n"); - ptl->general_level_idc = 255; - // The tier flag must be set in level 8.5. - ptl->general_tier_flag = 1; - } + err = vaapi_encode_h265_init_ptl(avctx); + if (err < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to init PTL.\n"); + return err; } vps->vps_sub_layer_ordering_info_present_flag = 0;