From patchwork Wed Jan 11 10:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 39964 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4642649pzb; Wed, 11 Jan 2023 02:46:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXvzcAJ7wOFDJBA4t8dx3XIOVzRLyncGZVh8GMBDfs/+IskA3iFm3ASxUZBJfvi69LwfmoOW X-Received: by 2002:a17:906:2854:b0:7c0:e30a:d3e5 with SMTP id s20-20020a170906285400b007c0e30ad3e5mr57752724ejc.18.1673434008704; Wed, 11 Jan 2023 02:46:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673434008; cv=none; d=google.com; s=arc-20160816; b=tJh2Hoc3ARvXIPTUf2uz9aHzx6DNkVtMMoOAIa3RMXf14IIh2ZpmhpzTMr45luU/kb KuSKthi354bFR6KKAEFBmhtBxqiqd52se5ZdHRdi5PNYOI7DT3wjZFe1SeS272kMBGLg qiav9COjmmYpYq43a/pv8sYAl3mDFsOAbPTedDmZ7norK77Jypzzm11xd9eC/SgXU/TF bKZowBVSJi4FkH2zkWCytj1LGGpOAMDa8aLCraqWTZ1pdBhXOgyFZdehuMQHOthdJL9q ZyvWIdJWljL135Wr8b3c68PpEK6mLqbQCSmmW7U0hImHeno4v86dFCBSu4Iqaw1yJWmf O5RA== 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=SF2onHE5rAcPWnI4GL1VBlm2TtCtTZor1cnN28k5JQU=; b=HLPjql+AnLDWf/Q9H7T/DJq5lI+BxBhsFY2h3lnO4gxuQ0l5bW9CNZC2NTaODg07vM r91HbFlHPGa0BpMMADOvK+taBDDMVqIXwsW4JgfBfF3rMMnMUf7yRdhbxDvv+7CmhwM7 Ni4TqzUmROA1O/oRFKOiSEg2sXddvyx401qin+VXaPF4V7sGJCNfMiRTbV07o2kAvX0G vjoxrVVT6nnNDR6U4gC5lk4q0ZmJx9LGLDCCU6T7NigM0MdiUapwNySsvCg9rz3cQG4c v4IvCGsGw1RL3E37OInr2hBHtQKxEO29doU0Q2+VmVwWScJcFSWfp0l2YUeeobeIgXYI zkSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ntur7EnF; 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 ne31-20020a1709077b9f00b007c171bf2316si16808538ejc.634.2023.01.11.02.46.47; Wed, 11 Jan 2023 02:46:48 -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=ntur7EnF; 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 3B7B868BD75; Wed, 11 Jan 2023 12:46:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5114468BC2E for ; Wed, 11 Jan 2023 12:46:38 +0200 (EET) Received: by mail-pj1-f46.google.com with SMTP id v23so15470387pju.3 for ; Wed, 11 Jan 2023 02:46:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6s3xBxUD57mkHm8h096E3er0yegNK50tHMAMnGMajHI=; b=ntur7EnFU8QuzJCcqGWfKzAGdo/XtgXZOeYraiAuQACB/rrcZ9+zpv9nUWbmIWvX+4 aHwMFF9eOKbpdInn3t0qVKpN8tPhaYreSyHno8TRwwY+8StxmN00c1TvVtSM3aJ/ntMu PPu2CM9KBmu4OBnMWph2La6LLGt2AW3OZrsKWz+qGKy8EN9vO2NGUYjzUenmeUJAK7MA fbVDez6bSft0iZoLzFs36OSZmWhdHKNzm0gFtldglF9+Io+hsyvWtxLfQVrirHePkNQZ I6KzBU4bHQXHJlp8FH4TmET6XAo9PP8LTo40flkV0c+o6d6tpsmWouaRmb+yCXjw4yz8 aVuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6s3xBxUD57mkHm8h096E3er0yegNK50tHMAMnGMajHI=; b=7MltKg106qmusBzAUrxmlZ/oOTyLsah06QyPvQXPaC1uL/fsDCbp7EIKlRtLgtoAas NY8b8k956rySlNAQCnC6gm/B38OxAh8+Ah8WeFQCH4nBNLDedBBasgyRTB++x7pyS6ex 5nOzXNx3KVBwrSeUZzJoOIITelnpA5fL2pBvhdnyyJTWZqYUMpjJ42yJwi7LnW+UStCB 9ij6RQATmOXNJFPq9v8Jsa265Zcua74Wj5qi4evOUfRaA7YJJD7MQkEJ5u3XIpXLxTIp zkqi+J/bPKlCp0PH1XysbuBTsLmG8uXK+7ReqxUuUbXQ+MzD1LUb6fHxHB0jD8fcPj33 g1Qg== X-Gm-Message-State: AFqh2konao0mC6WWcjb2rQlT2fIbRfRuI1tq6tHxU3j/UYFxz66kMv1m 9qw7joMqcq6rGRJSFe1RB63dy54IFJ8LgAtrWuY= X-Received: by 2002:a17:902:6ac5:b0:193:3980:98d5 with SMTP id i5-20020a1709026ac500b00193398098d5mr2091266plt.57.1673433996149; Wed, 11 Jan 2023 02:46:36 -0800 (PST) Received: from localhost.localdomain (11.131.220.35.bc.googleusercontent.com. [35.220.131.11]) by smtp.gmail.com with ESMTPSA id x15-20020a170902ec8f00b00189fd83eb95sm9938338plg.69.2023.01.11.02.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 02:46:35 -0800 (PST) From: "jianfeng.zheng" X-Google-Original-From: "jianfeng.zheng" To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Jan 2023 18:46:29 +0800 Message-Id: <20230111104629.402504-1-jianfeng.zheng@mthreads.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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 Cc: "jianfeng.zheng" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /WlwTLTO9dMK see https://github.com/intel/libva/pull/664 Signed-off-by: jianfeng.zheng --- configure | 13 +++++++++++++ libavcodec/h264_slice.c | 9 ++++++++- libavcodec/vaapi_decode.c | 10 ++++++++++ libavcodec/vaapi_encode_h264.c | 27 ++++++++++++++++++++++----- 4 files changed, 53 insertions(+), 6 deletions(-) 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..3abb671e99 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -805,8 +805,15 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt++ = AV_PIX_FMT_YUV444P10; } else if (CHROMA422(h)) *fmt++ = AV_PIX_FMT_YUV422P10; - else + 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: if (CHROMA444(h)) { diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 134f10eca5..048b27fde1 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 ), +#if 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; } +#if 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..e99e13cb40 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[] = { +#if 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,10 +1192,9 @@ 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; - 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"); + av_log(avctx, AV_LOG_ERROR, "H.264 high 10 intra profile " + "is not supported.\n"); return AVERROR_PATCHWELCOME; case FF_PROFILE_H264_HIGH_422: case FF_PROFILE_H264_HIGH_422_INTRA: @@ -1267,6 +1283,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)",