From patchwork Mon Dec 26 06:59:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 39756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2491879pzb; Sun, 25 Dec 2022 23:00:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXvLPv4W4+ux3Bwz6wDUoZCUDYsCb5D2LBGLucb9CSW5UAWMo7XseZMK3o1vu0zGGzDKQNlK X-Received: by 2002:a17:907:6ea9:b0:7c0:e7ad:5296 with SMTP id sh41-20020a1709076ea900b007c0e7ad5296mr18650496ejc.55.1672038036052; Sun, 25 Dec 2022 23:00:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672038036; cv=none; d=google.com; s=arc-20160816; b=MXDU1GTqgFxECwH7ghNhmt5LMEAil3S4CYSpXBNI66OcdZwGxzH0yVmRgD64PnHIWS EBXIRPONjk6y1EH1tvqvxx+7f0Q5Mrr3CrTOc8RbJeAs+T8Hb6Ob2SwKdbxz76M4P3X2 YMzbppqfRbGdjCmzvk6AZv7JOccO2oN2MteGwaBxhyaC6bT36NM+QIm1nf6yukjfoHoc zpAB6RjBSogetOPknG0hNwLvjwI8JZRPDxc6jsIyOBe5WOCEltgXKqM2PnGACw6OeK0F g5Ilhqn7NibAVaXL5ukPtfiQ2GSltNyTbbr7xo8CEovahhDxalsZ83zjwZnF7mZdbrX/ qYYw== 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:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=d/YpONpOHe/3QZvMrewxUKVehctQAoQFPtlOVizPNgU=; b=DVXfveUNSNxvtbeGcAnfI7nGsVylB4SAkP2a3U2kjtMfq14C16BiH5+iZk5uzz7FUJ v4JDhDkf3rgcB1Au7jcULQZcHcZUUvHnAXNo2MwccJxYCqoaf7ZaD9B08qG6x8xlShDf 0WDv1TOHjuQpjwViI7cRCCXr4PtBw9UM6GXofD3pGeJCpKFXEZVifrgAnaj4CKnp7mZl ZjYZTQDK7Z849fEsY6IKOoexMIeachosXUuLwKmrs5BTU/GdsSAmwKEZojDm7snTJcA9 hrKr2uOjMllPqwDwEJHsDBUQ3DgXIMLvMhKNOAPAi185630Q875lJ5d9BBPRFuRuWPmB kZEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=d9CoZKjK; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dr7-20020a170907720700b007c12e19ba40si7605406ejc.666.2022.12.25.23.00.35; Sun, 25 Dec 2022 23:00:36 -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=@gmail.com header.s=20210112 header.b=d9CoZKjK; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C06068B612; Mon, 26 Dec 2022 09:00:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0683680787 for ; Mon, 26 Dec 2022 09:00:25 +0200 (EET) Received: by mail-pj1-f42.google.com with SMTP id c8-20020a17090a4d0800b00225c3614161so6939278pjg.5 for ; Sun, 25 Dec 2022 23:00:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=bWDvoZLVSTH9CqPwSkrGRiUXDC1Mj0CfLG4xvXm1luc=; b=d9CoZKjKNsTnmKUC8s3gfD+ExecuHk7PDZcNA26JMZot56MbB+VgZwZhhPKowdofvd 9C8Un3CfZhlC462lmvBqk85ptybq7D1RnX3R8s7irgURrcYwpkS3xQ7NggNuKYAOWp2u Tbbitj390o0qZr6ghmWx4venFuTKiDyyisBT/hwQXxrcsRlJRgYQcKHWJ9G6tGDFU0// Tl1bfFVVQZR2KOkHB2y9BpscDX7kDAdVQ49mEIUWCZOCpWe4VDW8c2Uk9SPlLZDQ6b+i UzQYxpbFLvyNM6r29Z77izRm0ZTenPl/hZ9MfTDGPEAvLHqPQvAAbUu/4qQZmwk6VNFV q0uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bWDvoZLVSTH9CqPwSkrGRiUXDC1Mj0CfLG4xvXm1luc=; b=FApImzryRph4Otbpe6ahbEXj/8kS9FQPblyio1dOlql8HhL/5cvlbKVy436H2zK4Yj ts3ZxlM5KaksR5Y6xiBKjXBkcyLjUEsgEXnXsbMSllly0AMs2vHQ0ptQKG5QrH7yEC7F EtSLu/6z2l2vVcElAOmWqueytIxFDSV34v+1IQmj3uboq3KmXk8PjZ9fcqEssl4JKoHa ZJLZXF48fcGyPVcYsC0RuKzqhVfanTpleXTf0QLKxdWMa2eZBiMvkUz3PDVqdMBX6HjA XWZJ7fHLA8WIyRyInLngM6RWHUFV3fL+0sApSgFU0cCt86MR/UT5AGBLMnH4frMBa2mC xoNA== X-Gm-Message-State: AFqh2koibXlM5gO8CtmB5RzNLlefib4CXnvb80Sjae7Gn/QE8XauH6pC zGRjOMuH6IPpwD78aBlXpchQgGtM1WaPyzZe4cvntin5NBbIb7T2 X-Received: by 2002:a17:90b:3d03:b0:219:73d1:eb39 with SMTP id pt3-20020a17090b3d0300b0021973d1eb39mr1442948pjb.45.1672038023230; Sun, 25 Dec 2022 23:00:23 -0800 (PST) MIME-Version: 1.0 From: Jean Jogh Date: Mon, 26 Dec 2022 14:59:39 +0800 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] vaapi: support VAProfileH264High10 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: thJ9c1NXwqRS see https://github.com/intel/libva/pull/664 Signed-off-by: jianfeng.zheng --- configure | 13 +++++++++++++ libavcodec/h264_slice.c | 6 ++++++ libavcodec/vaapi_decode.c | 10 ++++++++++ libavcodec/vaapi_encode_h264.c | 24 ++++++++++++++++++++++-- libavcodec/vaapi_h264.c | 5 +++-- 5 files changed, 54 insertions(+), 4 deletions(-) @@ -256,8 +257,8 @@ static int vaapi_h264_start_frame(AVCodecContext *avctx, .log2_max_pic_order_cnt_lsb_minus4 = sps->log2_max_poc_lsb - 4, .delta_pic_order_always_zero_flag = sps->delta_pic_order_always_zero_flag, }, - .pic_init_qp_minus26 = pps->init_qp - 26, - .pic_init_qs_minus26 = pps->init_qs - 26, + .pic_init_qp_minus26 = pps->init_qp - 26 - qp_bd_offset, + .pic_init_qs_minus26 = pps->init_qs - 26 - qp_bd_offset, .chroma_qp_index_offset = pps->chroma_qp_index_offset[0], .second_chroma_qp_index_offset = pps->chroma_qp_index_offset[1], .pic_fields.bits = { diff --git a/configure b/configure index f08cdab3d1..ac199d97cb 100755 --- a/configure +++ b/configure @@ -2410,6 +2410,7 @@ HAVE_LIST=" texi2html xmllint zlib_gzip + va_profile_h264_high10 " # options emitted with CONFIG_ prefix but not available on the command line @@ -6958,6 +6959,18 @@ if enabled vaapi; then check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG" check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8" check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" + + # + # Using 'VA_CHECK_VERSION' in source codes make things easy. But we have to wait + # until newly added VAProfile being distributed by VAAPI released version. + # + # Before or after that, we can use auto-detection to keep version compatibility. + # It always works. + # + disable va_profile_h264_high10 && enabled h264_vaapi_hwaccel + test_code cc va/va.h "VAProfile p = VAProfileH264High10" && + enable va_profile_h264_high10 + fi if enabled_all opencl libdrm ; then diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 420758ba0a..b9236281b1 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -806,6 +806,12 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) } else if (CHROMA422(h)) *fmt++ = AV_PIX_FMT_YUV422P10; else +#if CONFIG_H264_VAAPI_HWACCEL + // Just add as candidate. Whether VAProfileH264High10 usable or + // not is decided by vaapi_decode_make_config() defined in FFmpeg + // and vaQueryCodingProfile() defined in libva. + *fmt++ = AV_PIX_FMT_VAAPI; +#endif *fmt++ = AV_PIX_FMT_YUV420P10; break; case 12: diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 134f10eca5..03bbbf2c41 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -402,6 +402,9 @@ static const struct { H264ConstrainedBaseline), MAP(H264, H264_MAIN, H264Main ), MAP(H264, H264_HIGH, H264High ), +#ifdef HAVE_VA_PROFILE_H264_HIGH10 + MAP(H264, H264_HIGH_10, H264High10 ), +#endif #if VA_CHECK_VERSION(0, 37, 0) MAP(HEVC, HEVC_MAIN, HEVCMain ), MAP(HEVC, HEVC_MAIN_10, HEVCMain10 ), @@ -510,6 +513,13 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, if (exact_match) break; } +#ifdef HAVE_VA_PROFILE_H264_HIGH10 + //incase 8bit stream being decoded under VAProfileH264High10 + if (avctx->codec_id == AV_CODEC_ID_H264 && + (avctx->profile == FF_PROFILE_H264_EXTENDED || avctx->profile == FF_PROFILE_H264_BASELINE) && + matched_va_profile == VAProfileH264High) + break; +#endif } av_freep(&profile_list); diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index dd17be2190..d26ac5a98f 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -23,6 +23,7 @@ #include "libavutil/avassert.h" #include "libavutil/common.h" +#include "libavutil/pixdesc.h" #include "libavutil/internal.h" #include "libavutil/opt.h" @@ -290,10 +291,21 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) H264RawPPS *pps = &priv->raw_pps; VAEncSequenceParameterBufferH264 *vseq = ctx->codec_sequence_params; VAEncPictureParameterBufferH264 *vpic = ctx->codec_picture_params; + const AVPixFmtDescriptor *desc; + int bit_depth; memset(sps, 0, sizeof(*sps)); memset(pps, 0, sizeof(*pps)); + desc = av_pix_fmt_desc_get(priv->common.input_frames->sw_format); + av_assert0(desc); + if (desc->nb_components == 1 || desc->log2_chroma_w != 1 || desc->log2_chroma_h != 1) { + av_log(avctx, AV_LOG_ERROR, "Chroma format of input pixel format " + "%s is not supported.\n", desc->name); + return AVERROR(EINVAL); + } + bit_depth = desc->comp[0].depth; + sps->nal_unit_header.nal_ref_idc = 3; sps->nal_unit_header.nal_unit_type = H264_NAL_SPS; @@ -303,11 +315,11 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) avctx->profile == FF_PROFILE_H264_MAIN) sps->constraint_set1_flag = 1; - if (avctx->profile == FF_PROFILE_H264_HIGH) + if (avctx->profile == FF_PROFILE_H264_HIGH || avctx->profile == FF_PROFILE_H264_HIGH_10) sps->constraint_set3_flag = ctx->gop_size == 1; if (avctx->profile == FF_PROFILE_H264_MAIN || - avctx->profile == FF_PROFILE_H264_HIGH) { + avctx->profile == FF_PROFILE_H264_HIGH || avctx->profile == FF_PROFILE_H264_HIGH_10) { sps->constraint_set4_flag = 1; sps->constraint_set5_flag = ctx->b_per_p == 0; } @@ -348,6 +360,8 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->seq_parameter_set_id = 0; sps->chroma_format_idc = 1; + sps->bit_depth_luma_minus8 = bit_depth - 8; + sps->bit_depth_chroma_minus8 = bit_depth - 8; sps->log2_max_frame_num_minus4 = 4; sps->pic_order_cnt_type = 0; @@ -1111,6 +1125,9 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) } static const VAAPIEncodeProfile vaapi_encode_h264_profiles[] = { +#ifdef HAVE_VA_PROFILE_H264_HIGH10 + { FF_PROFILE_H264_HIGH_10, 10, 3, 1, 1, VAProfileH264High10 }, +#endif { FF_PROFILE_H264_HIGH, 8, 3, 1, 1, VAProfileH264High }, { FF_PROFILE_H264_MAIN, 8, 3, 1, 1, VAProfileH264Main }, { FF_PROFILE_H264_CONSTRAINED_BASELINE, @@ -1175,11 +1192,13 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "H.264 extended profile " "is not supported.\n"); return AVERROR_PATCHWELCOME; +#ifndef HAVE_VA_PROFILE_H264_HIGH10 case FF_PROFILE_H264_HIGH_10: case FF_PROFILE_H264_HIGH_10_INTRA: av_log(avctx, AV_LOG_ERROR, "H.264 10-bit profiles " "are not supported.\n"); return AVERROR_PATCHWELCOME; +#endif case FF_PROFILE_H264_HIGH_422: case FF_PROFILE_H264_HIGH_422_INTRA: case FF_PROFILE_H264_HIGH_444: @@ -1267,6 +1286,7 @@ static const AVOption vaapi_encode_h264_options[] = { { PROFILE("constrained_baseline", FF_PROFILE_H264_CONSTRAINED_BASELINE) }, { PROFILE("main", FF_PROFILE_H264_MAIN) }, { PROFILE("high", FF_PROFILE_H264_HIGH) }, + { PROFILE("high10", FF_PROFILE_H264_HIGH_10) }, #undef PROFILE { "level", "Set level (level_idc)", diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 9332aa6f31..3e44c8caf6 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -234,6 +234,7 @@ static int vaapi_h264_start_frame(AVCodecContext *avctx, VAPictureParameterBufferH264 pic_param; VAIQMatrixBufferH264 iq_matrix; int err; + int qp_bd_offset = 6 * (sps->bit_depth_luma - 8); pic->output_surface = ff_vaapi_get_surface_id(h->cur_pic_ptr->f);