From patchwork Wed Mar 29 08:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 40904 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp318060pzb; Wed, 29 Mar 2023 01:41:31 -0700 (PDT) X-Google-Smtp-Source: AKy350ZuuUfRVC21QSVce2vw9pIseQf7ZTafZep3bq/RBKylAdOTxmGiIn60XJNkO3DQitI5acny X-Received: by 2002:aa7:d7d3:0:b0:501:d542:4d0c with SMTP id e19-20020aa7d7d3000000b00501d5424d0cmr19270030eds.22.1680079291429; Wed, 29 Mar 2023 01:41:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680079291; cv=none; d=google.com; s=arc-20160816; b=z2NaZDSrkn+x/8958cbCVn2b/8tdi84MS4MGzLzPE4xSAg+7hMLOUEVwYSaIhsKECY Bn3Bqk66YJ5CKfV4wL35ck8MLsJYEg4uY+M443RX/nmd6KcV38/e7+9eht1aMtlQI5eM VC9O40hbcIWGOKl5T1c0sDh8J8wiCx3dGxVmmFmqIu6A1RgjbbVXveH7a2o1xScbaZ68 MqnnALfCrrNLs1NkjuuDfQ9EKACnQHbSmk6Bw1scycddFvuUs427TeJeX/AUFW4SH5sz ZEpJ5ryEy1/eyPslhpXGbwEr4x7SfaIMdqCIG1hWhvO0ZXx+MLGN8m6O4LwSZmc8x2Vl FTPg== 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:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=23EJCVBsB+pQbmWQE7sJpr7u1L+U0FLHJ2vwKhfqYjg=; b=atKxDpEI/iXbD6fxpRwCZYnyXp6zn5MolCBIwm8KAnF4cOdh840vMouESrG4c5Grfq yUsiHVIhuUdT+kvJ6vuB3G/kXp8f9ISta9GydaY5RkrdtR3zqMWSTly7AqSd4P4vM1Ia JSsDvK9i+HVuUw9E9F5iZK9jmXvOs/672WcC747Xvl/AmrGUR7BeSlX6kvXb4+i+lUuC UHhTw8iBPyAdAy6Eda85giIbdGMa2JeUlnDH9ZiDZG6Noh/gRMJepuR2lGViS/Vwlopp EZBGYi+WNXpweeB6OSpENYoN9/JdINmJBqBvjXXBHyU26vOxliw8JuoaWSx3M7YzEtJv RGog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ETtdDVfm; 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 w22-20020a50fa96000000b004ad15601457si30759695edr.629.2023.03.29.01.41.30; Wed, 29 Mar 2023 01:41:31 -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=@gmail.com header.s=20210112 header.b=ETtdDVfm; 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 58BA668C8CB; Wed, 29 Mar 2023 11:41:27 +0300 (EEST) 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 1707368C781 for ; Wed, 29 Mar 2023 11:41:21 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id lr16-20020a17090b4b9000b0023f187954acso15450181pjb.2 for ; Wed, 29 Mar 2023 01:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680079278; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=wkNWbiur5mJlh4tgYAEYM/Dk3bkMabaw9emPQHcYvdo=; b=ETtdDVfmY0vH69oSBs9Wzn7snv+lDiQkBTOEnrzPtZNHIWf0HwhFDhspGRR9PQVdeV YXTf6w/9gGpmJoViNUyEQs2JLJATvsbQYk2OC24qDumkWlHEK6y48If4cQknqXn84IqA 4f2l8qF+IgDsThy+KLREmw7U6yOoR4cC7bSYK/G1Xjml5xGSA3pDUKGeqUblbfdlFRH9 9WaJUCnj+TrK3YJ81xrtT81wgvYniZfqA9F3RYTZPetQ1tFA1NtDKbYlgxJvbtxccjpc RE+MrAFmUUqO9cjdxiUTjEj73OZMD7GdTg1pIF7gRDt5CopGDWilERypz+EWLqUQhisC wmjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680079278; 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=wkNWbiur5mJlh4tgYAEYM/Dk3bkMabaw9emPQHcYvdo=; b=krcnlWzhmBJI+QGTHncEnYeACgi3Q0bT5ssGb2f8edlOosg5PFp2HPIheZmWuID2Rs yRB4wePPLpIwM9jm0k/EmgRfInLhaxKSWLDVEI73Fbh72kX12fcl+6ny8+0UHXezuShW rxN0P63gdkGKAj7krlJgt5fxbPG7VIYEcoFBSM5RrgI3PFaLl9dOhRIsxmN65W1RjdNs RZrcV4EbYwq9EVmAhD5vq1HCGEBCGL6+jAthnGT2rPZSxBnCLOZznst/QxtW8+5W1G0Q n2qcrPEb+9sJDTuOkqOF4VW6rnEW3ejjjialaHnPv8XV4Dgm3nuw/pmUjaBha+WoTXNG vo7g== X-Gm-Message-State: AO0yUKVQ7ZlqMI4dZLD+fvSdc2kOPJ7b5XnDu6NOPNugdpcA8/+mNwMf kMXPQBePToMnauwZXgVqm8UoHKD+dGdbHXa8 X-Received: by 2002:a05:6a20:7b15:b0:dd:df53:4358 with SMTP id s21-20020a056a207b1500b000dddf534358mr16491887pzh.38.1680079278247; Wed, 29 Mar 2023 01:41:18 -0700 (PDT) Received: from localhost.localdomain (70.206.96.34.bc.googleusercontent.com. [34.96.206.70]) by smtp.gmail.com with ESMTPSA id 17-20020aa79251000000b005897f5436c0sm12112877pfp.118.2023.03.29.01.41.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 01:41:17 -0700 (PDT) From: "jianfeng.zheng" X-Google-Original-From: "jianfeng.zheng" To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Mar 2023 16:41:10 +0800 Message-Id: <20230329084110.200661-1-jianfeng.zheng@mthreads.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4] 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: ZXr5whn09ATA see https://github.com/intel/libva/pull/664 Signed-off-by: jianfeng.zheng --- libavcodec/h264_slice.c | 9 ++++++++- libavcodec/vaapi_decode.c | 5 +++++ libavcodec/vaapi_encode_h264.c | 27 ++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 7767e16cf1..d05b83a121 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -809,8 +809,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 ab8c12e364..dd55cbd6f1 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -398,6 +398,11 @@ static const struct { MAP(MPEG4, MPEG4_ADVANCED_SIMPLE, MPEG4AdvancedSimple), MAP(MPEG4, MPEG4_MAIN, MPEG4Main ), +#if VA_CHECK_VERSION(1, 18, 0) + MAP(H264, H264_HIGH_10_INTRA, + H264High10 ), + MAP(H264, H264_HIGH_10, H264High10 ), +#endif MAP(H264, H264_CONSTRAINED_BASELINE, H264ConstrainedBaseline), MAP(H264, H264_MAIN, H264Main ), diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 645f6a978d..9ad017d540 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" @@ -301,10 +302,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; @@ -314,11 +326,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; } @@ -359,6 +371,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 = ctx->max_b_depth ? 0 : 2; @@ -1144,6 +1158,9 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) } static const VAAPIEncodeProfile vaapi_encode_h264_profiles[] = { +#if VA_CHECK_VERSION(1, 18, 0) + { 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, @@ -1208,10 +1225,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: @@ -1304,6 +1320,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)",