From patchwork Fri Mar 31 11:54:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 40942 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp651195pzb; Fri, 31 Mar 2023 04:54:24 -0700 (PDT) X-Google-Smtp-Source: AKy350bjWLaxCiJAuTyCB3dn9+xSI4E0tRfXKmzStXM53r7415dZs1gcbajZ87Ugkkc+i8WXA+o/ X-Received: by 2002:aa7:de13:0:b0:4ac:d8a1:7385 with SMTP id h19-20020aa7de13000000b004acd8a17385mr9084447edv.3.1680263663847; Fri, 31 Mar 2023 04:54:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680263663; cv=none; d=google.com; s=arc-20160816; b=k8Brp1N1PzeCyCxF+8A7DLLTfr1PhkUx62kWAH9klaZAVXWmegfwckIex1S94ivPu7 sUH6GQWBh3P/u0cixPJ0E+aBuLkZxYEWt8+ev7FY/L/iGW4rY1y5uHdVmErHDTxllOAU ww/sWgM9JavtyTxsOMqAhO571wM3a5Xh5U1OeEc+KMMABF3ODs6GNQuklGURTX8baL+n HHS5Kg0b5W6L7KSJBOJPo1JwfF/Y+jLhpC1dOnwSuZMauAc5B8bksOkuSoMr6bFKVRYn ztbfVHVD67auAEj8u0YaDKnbDkfwdvkNpqTI9KJhdj0yqY8vNLH4iLlhpUbOKmSaFSMg fnHA== 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=D8PLenVHo+OHUtpHAsV6clVrBeXQoDG+Az3PtatjiFc=; b=hywa25cJpZLq4NE/3jDQWdfnqyTaC1GT+emQOz4pcBU66lm3nHwR/KPKVGoPSvyYlE lVkghtz5XWoW1L3Qi90bxE4Xu23aoXSvR6li7iMmcxE3UQwvo2yQt49ctuEmY0P5agmS nRWyn4KRuDHOMyB4LFv2ELvEJwArvLQ509u/eBg92p2KWm+RSOgzCQbOxza8c43U7q+9 U1gFluuEJ2M3eHIiBIIoXfdvG+YPJwABwu7DEyiD+kD3/Y4/5x2afxP1PmsHtyXAhok2 8jd8gjzSqnilGMlf3Rd3QLoom0Xkg8xwkm6vkjFnizQQ2rlHku3SqSG5BCjikXr9dR86 F+TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hwxdVLxn; 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 n19-20020aa7c693000000b0050277665b9bsi1546274edq.407.2023.03.31.04.54.23; Fri, 31 Mar 2023 04:54:23 -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=hwxdVLxn; 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 CCAD268C26C; Fri, 31 Mar 2023 14:54:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63ECE68C210 for ; Fri, 31 Mar 2023 14:54:14 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id j13so20182393pjd.1 for ; Fri, 31 Mar 2023 04:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680263652; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1kT/AY4d7wDgKzq9o6AJ2HECBfwF5BRfjilu2dn+wB0=; b=hwxdVLxnN72T/wjExD8fvLAkZ4mcFLKcgeXSVT/EyZVs4/aH0OXmalx3sWIIX0Ttfe jZef2UTLgohmziM3phxhS48aoffWaYd6+ZPD4TnJdC3CspKxUQPF8/DCznpjH0VIXMuY l7eHzcYVfqDY2tZjTFTnA6Dy1B21KUtlPoCyeNFjKAgv6nMTLJIU0E6ZAugWNJGkSMGI VEBQVfASalggwZgSS0Vw+4bRDfxfLZE/J38C5EdvOMlZA24OlJAp85Ihj3PfqNRrV2hU sEYgiLf+4TK7zYOxSHhijLiVcL0FBQ7mwXxlxy1Q51C8vkCm+Po/nTg868NfJJoYUAHT GNTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680263652; 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=1kT/AY4d7wDgKzq9o6AJ2HECBfwF5BRfjilu2dn+wB0=; b=SsvDc62z/qtqE++s/KIPOqiD/geN/rq15CtOwW3gUi1T9R7x3Fr3susz0Ym5PcjOVw vzhF/u86je/34pi53agnTARgQP0tSH+mQlw4Yi2dhazmL9nYxoCWaZc/YMAbgPVcxXhe QWe1XFo1e6kK6vkCL+fmujpvLKk0mmVY/Lj0bIGL4ForBENz6gAFXUGJxcsC2j8Ssnxt /xvFbs2LyipMtLjqKTr4D/BLy3wHBuTIS5ddWZrTMBkaAn8Mtk+2BGyi0+IYFkOE6SlJ fEgGQ7DOSLhzZDdQ187yj7EjUzOWDWOXfOE31GV17MsnSqZCxwjqD9rL9ywiE2iyL/hw bSUw== X-Gm-Message-State: AAQBX9cJ+bu9Ij9OzuZcmkHsszg3ZRDV3kEuoaI+mVBpGhy1zOZ88AXO bQJY3VrjMz1uYskwkBP6wVl0daQs+12agA== X-Received: by 2002:a17:90a:190d:b0:240:95a9:923d with SMTP id 13-20020a17090a190d00b0024095a9923dmr15523394pjg.48.1680263652421; Fri, 31 Mar 2023 04:54:12 -0700 (PDT) Received: from localhost.localdomain (70.206.96.34.bc.googleusercontent.com. [34.96.206.70]) by smtp.gmail.com with ESMTPSA id 65-20020a630444000000b0050fb4181e8bsm1458696pge.40.2023.03.31.04.54.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 04:54:11 -0700 (PDT) From: "jianfeng.zheng" X-Google-Original-From: "jianfeng.zheng" To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 19:54:06 +0800 Message-Id: <20230331115406.279001-1-jianfeng.zheng@mthreads.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/2] vaapi: support VAProfileH264High10 decoding 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: /7snAVXwBJWO see https://github.com/intel/libva/pull/664 Signed-off-by: jianfeng.zheng --- libavcodec/h264_slice.c | 9 ++++++++- libavcodec/vaapi_decode.c | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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 ), From patchwork Fri Mar 31 11:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 40943 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp651286pzb; Fri, 31 Mar 2023 04:54:38 -0700 (PDT) X-Google-Smtp-Source: AKy350YeoUgwpVYr2sQmyXWQV7hPkoSgBM42LeQNDHT3m+aZf8ht+YZ7tlVGpBA5vs9tsx2WYco2 X-Received: by 2002:a17:906:e2c8:b0:932:e141:29c7 with SMTP id gr8-20020a170906e2c800b00932e14129c7mr27780602ejb.19.1680263678411; Fri, 31 Mar 2023 04:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680263678; cv=none; d=google.com; s=arc-20160816; b=StgHp6t4p6+LEi/1LpJ0fgg/dOQ7y+Rh6K7y4FBeD1wGO5yqUvXSTh9WHCfSza65HZ TQajYkPnS9YjsvcA9DeXBqf5pn7RbOY9ZazgpIr9pusI79v7tn9eCz+h0fADClTnLE26 GOGf1ZGtp9oJJodVnAB9oH0oBb50XdypLDr/kww1cTIfyxdMdaEkJAegWDil7mXTYDAr qP9/QGx67RMRYm1zAEimmPn8uspDXSivc8RrJFE3zKU2JnNLM+QqMETug9JoWXkYdkBU rHu60ATCrU7YDHx4tZXqSKfkBJlxDUSKGJ55oDpA8ioU8mrwPPqjjv5AlF5m9AXBMtBg Mvlg== 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=Usm4JgePUex8frok4039EUUnLJWzuISODP2+KUPidnU=; b=NcUMfAt2JGvRsAWv9YzH7YbGjJuB3f2SAc9SUCiwG+2yCIOLoIg4JJGuUL/JBfKStz 70MbDdsnaLXrR7Ju16K3dLkO9I7HWPlPKF43qp4hmmZFiJue06TPh7Ogs7u4Cmi1RAtm Da5S1/gHaVkdmm6oJmGMTcrJsONIn28tK9w1Y1Z/ijcPl6l9/f4hh5fWdLzWO/WEoTn+ Gpy72uA6MvI7ofPPeHPCCGgreFIoSnFjn26P50tklfZAwjkfpLgOAEKltJWzBoG4yiDz 9qXLTGkWXbrPgSTMQDiIXvt+2HD7FWY6HV0MSDk/KoJVzVyNFzIGNxmp96yxM5PCTM3Z gSEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=T7X+Xqm1; 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 h13-20020a170906398d00b00933ccc61787si1682781eje.727.2023.03.31.04.54.38; Fri, 31 Mar 2023 04:54:38 -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=T7X+Xqm1; 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 E83D668C284; Fri, 31 Mar 2023 14:54:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A11A668C1C6 for ; Fri, 31 Mar 2023 14:54:29 +0300 (EEST) Received: by mail-pl1-f174.google.com with SMTP id n14so5129957plc.8 for ; Fri, 31 Mar 2023 04:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680263667; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ljmr63KfOWlf0Gzc2yf807bxtuxZ8P0lvx0wf1hqd9U=; b=T7X+Xqm1WdjCNrQwTFd9b+CvJUw/e5ICEtTx3JDPvbywkxgIya2zqnoy+ZmcRCb5y1 7dN3Jwd6kOzUi8gUSFsQJHynS1AotxPaSaiGYgQLQCTMawjpGO8+x0RbwJ/MCwDOphNR CRGZwhn4Rkqgaudb0tZEYl5Qyr1dew++nLfd+uZENiYDhzgTRxhfsBMaQcK4VBBupDfL tD7sRuE9fZtoxUllijOLdML+d8TFtA8GwV9MzJArOiVaqCZd4VRrSmPFd6LGk3DWE7DH ivn7a5cjVUyhxwkG/42H7YiBh9/1vB1vqT6m5x5wYDP7Eqs181OSDVn5bdn5X76hSpcT buLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680263667; 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=ljmr63KfOWlf0Gzc2yf807bxtuxZ8P0lvx0wf1hqd9U=; b=RgK8j0zjEx0WPdJlh9NSqktLn5Xq8V2XKE05I6dzsMUWRdtDlHJlu8FrM39de+6fXg CUTHZ+GOnS5Ct+J3KlXiO3WqokIe5DXyFOv/LBbzJy7NU0hpgCaXGxfHZdMyTEnj5RUT Ei9m59v/CRdV4bICBWc+ihOYT74MSSpckobPeanMl+T4uI6SUbgINDL7IAiyjnKH8IbX 1f4q14a6w/SEnUzem2uvwatb9bRluUwiMuLHEY7RhSWfNdbSUVVyeXB0BcKufuiNEyoH 7u4qE08UjPCeDDJeJ3ktBpXYwRDsVzQcoQIzAudglesJFhu1OJpYJ6AAAsGHHz67z28H E4zw== X-Gm-Message-State: AAQBX9evxSFzgcYloFxaCkXsH//SafzyF6slXfcFK/EVPK+vRQd9i2oJ 5mYgLDi1V7Dw5z5afihsOQtlwnJhOnkmRg== X-Received: by 2002:a17:902:fa47:b0:1a2:3e05:8efc with SMTP id lb7-20020a170902fa4700b001a23e058efcmr17581335plb.33.1680263667563; Fri, 31 Mar 2023 04:54:27 -0700 (PDT) Received: from localhost.localdomain (70.206.96.34.bc.googleusercontent.com. [34.96.206.70]) by smtp.gmail.com with ESMTPSA id x20-20020a170902ea9400b001a043e84bf0sm1388949plb.209.2023.03.31.04.54.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 04:54:27 -0700 (PDT) From: "jianfeng.zheng" X-Google-Original-From: "jianfeng.zheng" To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 19:54:23 +0800 Message-Id: <20230331115423.279077-1-jianfeng.zheng@mthreads.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/2] vaapi: support VAProfileH264High10 encoding 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: wenqIOhyRqiX see https://github.com/intel/libva/pull/664 Signed-off-by: jianfeng.zheng --- libavcodec/vaapi_encode_h264.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) 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)",