From patchwork Mon Dec 26 06:42:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 39755 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2485842pzb; Sun, 25 Dec 2022 22:42:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXuSuRmJSkKkT7xs71NDkNGKE7bR5PaRE9ETvTD/LIfMiAfBQmx2A+BgBQR3e944HpOQSG9o X-Received: by 2002:a17:906:c44:b0:7c1:700:9c4b with SMTP id t4-20020a1709060c4400b007c107009c4bmr13631016ejf.75.1672036978266; Sun, 25 Dec 2022 22:42:58 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr1-20020a1709073f8100b007ae2b7df929si8128181ejc.72.2022.12.25.22.42.57; Sun, 25 Dec 2022 22:42:58 -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; arc=fail (body hash mismatch); 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 C0DF568B378; Mon, 26 Dec 2022 08:42:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on2136.outbound.protection.partner.outlook.cn [139.219.146.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 915EC68B378 for ; Mon, 26 Dec 2022 08:42:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dYolGk9RlgQKxga/GXknJAo7miQU3F0/pECMawmr+TCcb3ZugQAU95ptH2AadNgFsVEFag8cqKJQUo81/U3vetxRm8TBMBZyAjP4HopR+u9AXG3/Z+7Jq6Un4WKwd7FjTcE84+iLsrqTPZHljvKyYxM/9AVwVlp3OsHkyfbtp1yh4euZG5ivnf5Y1nhdto0RzKxQAu2QERmcnyKe2fhMIG6Ywjyiljnv7bFy9F83HDPGMGGg24Pg87ZLzeirIxAdEmSL0KyZk6nvXhZW4p8DFBhoWMVhy2mEUI9rUFMK9Dm/tiTZqFSVoQgn5FS3ZWQ9ok5ogIix90NjJYixl/hsYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3ck13tLYEjbPXczZTPQvsX7YSW8CB3PeymVUcittiqo=; b=JDs5x9GoTqGM2b8BZdKmgaPelFmD1XMuBaegp9qSl/xpBMVhMrbNGU+AetR3YoKcJwlGPL6/G1OK5RC1OMiK77lbTDx5OQLsa0iltA4LoXicLJuqOrEZsjdv5V5lUk8BGrmyUpq69d6nQifYvoTFcI+wNWL5OMkxlZly3EhA/SwamPoWc6ZOtTLJP8pccQ228rx3Nuu8eScx6U8EkfEx1npcKAHY8A5Hp4RUi2wamujO57RpwThek3fDOjzdTocvVtlNG0QNV/etjrUriuMHN5nWxou5u26cOe0OTNHm3KPA1MQG7YkC9M6ifGFvjer+0CITRpy76QOPjiMT/kRojg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mthreads.com; dmarc=pass action=none header.from=mthreads.com; dkim=pass header.d=mthreads.com; arc=none Received: from ZQ0PR01MB0998.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:1::11) by ZQ0PR01MB1048.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11; Mon, 26 Dec 2022 06:42:42 +0000 Received: from ZQ0PR01MB0998.CHNPR01.prod.partner.outlook.cn ([fe80::354a:252f:a9c4:dd91]) by ZQ0PR01MB0998.CHNPR01.prod.partner.outlook.cn ([fe80::354a:252f:a9c4:dd91%4]) with mapi id 15.20.5924.011; Mon, 26 Dec 2022 06:42:42 +0000 From: Jianfeng Zheng To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [EXTERNAL] [PATCH] vaapi: support VAProfileH264High10 Thread-Index: AdkY9OWExPqgIiIqRBW2XvWv2VE20A== Date: Mon, 26 Dec 2022 06:42:42 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mthreads.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: ZQ0PR01MB0998:EE_|ZQ0PR01MB1048:EE_ x-ms-office365-filtering-correlation-id: a6eba0d7-4a9e-4718-082a-08dae70c63df x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5ZsF/jKmo5ZrRntcRVcBboQvcLMbG2F+uZf+eSVoC6uVLB/qcZdsC23AahdkTjjzQMWRGyldhGKpuyyIOLFeO7v/wB0Zcay5fLAccF2ulrt+qQtV2+I10yx4FIhpQlY3g0jR29VxYFx6VPrrB1hd6G2bHr8dKLd54RWeLFQs7XV8u1bwWJIEArcVBwaexq0NgwyGNC1MwniYJdnbd6ogXE0Nj3Jmeg71DQZ3b1EfNdP7DaSqApRkKf9GVJEJCeqHciQvAWyHKsztk5LzPtMqntm19Hi+Ah+kIf4/qs1H0L1WiIHVcSxZEwDk1rzU8QK5TZyU0y0+jfxXTxOQ+SgKdasYYpVGviGQqKe7al8zbgUcPFPf91sdctoWipcsa2eE8tL8ekZFmVWx7Fkaw8xhr/ENyV3Nq4l/PK0pmt5944mAb88ec2CotgM5Erb3VWfQBAgkeF3n2JQss6ui1/OBhmdytU5o2kjoHxm/YPsXj/zaAm4fF/IBPmq90iFeQgZt513KujoQwJl+nCcWN7qMXNJJ1dO4ZRC4Wwh8KOliEvj7Ieag914ZIkI9ZKXpZv2uG0rS1C6/v9U13QF82ZT6j6dEo4Xem7aZ8qREcafblO2FOZJkWhqU+/X5DNjfw4mT1V4ZCBo5kf5bxy7iPEnHGlUHU7/euxfhTVWRtW855wVJSwzLeERqjvGkbPQ5+etbzJcAe5l//d7O//XgPTSJUuNwrDlI+SJ25apyKDyX2ZU= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZQ0PR01MB0998.CHNPR01.prod.partner.outlook.cn; PTR:; CAT:NONE; SFS:(13230022)(366004)(39830400003)(396003)(346002)(136003)(451199015)(8936002)(66446008)(66946007)(66556008)(8676002)(66476007)(76116006)(64756008)(83380400001)(6916009)(41300700001)(44832011)(19627235002)(40180700001)(40160700002)(38070700005)(55016003)(33656002)(38100700002)(5660300002)(122000001)(86362001)(508600001)(41320700001)(186003)(71200400001)(26005)(2906002)(9686003)(966005)(7696005)(66899015)(13296009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 5RCAA07Yxrtv4dVnB5RPV2ZqvHytwhEjgtekchCjR8o8MtReNViCCE9ItJ5e3Qxn7LIPtFiJVUsVGXfoUtzCsg9K+6OEqQ90F2T1e/j1rdq3f9m8D0xOR6lWrXJ84Gb1Q7dR8ATZTkuUOgEY8QiPPw73O0VVTciFpOBcd/8rb/XxTg+416lJhk0e+J3FA2lpLI7p98uPXqK8YzDB6Py6n+B5nSC9DxhRNnLD07DM18q6pezRQTBcT0JWbma9by+/9vfpSGZKnyE/+MP3MgC4Vu6ULN+5+aSsBMlA/RAlB5XkrwExj5Q8mc1DohGPUvJqNIIQ7E5YxfoZKE6k1MOXDn6esoPlp2/f2DKSsepwsrD1asgwCBewkUs1VAqwdUBUQ4u+xFp8ehYap82tWLmk8FTREwVwDmcnBxbBk0h9j/rK9hL9i5mE00ylqyq5AHi2AUIGCsQa3Y4v/4fTYk8Vl6GWV2TzeJTWawlD4XsZXzY5tHXZHyL8U+28w+bGsY28AxHVYyPsjisL6y0A4AuDmsUk7ULnAoA07YI+JPoBBIf9N38z2yEwMTvJr0piFGUnRYhNM59IGHcZf8WuGG5xjpnUJ2FVejGyfA/pnIrc3vXcbxNG/K5M5mFL+woW7h1t1qicOhvBDk1eOhb09ry5kIMtkxs9ZtA8Mr4bSHK8vkdEDQjEdp90qRS6IMh+LiTz66duDnaAt2M5C8jBzdPK530OHbe2SJTxZ9QJ3I05fmGOec63PIA5FZ/9otZBUPggRzYuhZ7bQDzhtIjnfBO1EKhcIO84Fr9SUcuj3q3ep7GqRhF5gIZextmbJl/wBPYMZwXBX8NrO0nU8oCPC0vDdKEw86lurLhxqln21pKeY6BNsJxk52xDIaB4MaMygSc+LOdJmWarC44ebmo8RPODh1O1oHe6QetUED83qudbP/v92wXxE9B1Wk8KIHWlv8mBHK4g8j9TeqSpY4Lb56ZVOQPhvOmHyNTnDG6AoV89vDbS5/ITlclRdWMiLNyyBZxPhRCY+z1MKyW8+pdreeRnxceJeqGTchKoNu80D9iRh/eHFxi/bQ8OCDEFkGyzT7RJoq2CWNsOzRSPbEC1wdVpkqwfP8lk9oy0d1Xc+a3WreyyTqD7p6xdr/nuOPKOkM9IThnbHb751b1IUXQX9KtGD4e+QG1gn6gsXVS6Fusa7kkBE8HoSfZIv3/0l5WHxWizmAAusPrxa1e31/jyH/BLeocmdtC6lzneBXDMGo1DmIk2QEALPBIgcwbtMHff0BaWHHc9bkQA2Swtlv4wGJJqYAF7OuaORydU0xKc1XPN69h+m1WvgvNGq6w8fJOF/pTprigPY9lvMhp+IVcVD7SNLdN/+nFbBKziOBBnZU8edqKqUU3eieOfwzV3c5u619WDdkAvb/JgE2GcVm6vW9p5/Siy6XJwvUyO+tbwVuHIhtn/G9+z7NS2XBkpgrp2ZYsSlDWaWKaAfSmL3WEt3nlpOcvnwHO2KSodcU2tPYCGQ+2962kJcb3tW4iPfyOTMr6ygfcTBGVlOu/hhcdovGWc1Yi/Syt5DU8SEHvlKqiuTFmHExVz3Sb2jJiYNfTBZbtcOZmYwUEnXrCdQfUnRT1nJA== MIME-Version: 1.0 X-OriginatorOrg: mthreads.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: ZQ0PR01MB0998.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-Network-Message-Id: a6eba0d7-4a9e-4718-082a-08dae70c63df X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Dec 2022 06:42:42.6905 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c62c01da-7ea0-4633-af61-38df1eee6b72 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: RRXaf5rJCVm/y/+6vXhSd7wAw5ap01HvS1er1kCH+5f+1CwSnhlA97RZXIvWPH00ai47sy3Mqu6TAm1BWgEzxbUsTj3B7gMsvK8V5a4t4Xc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ0PR01MB1048 Subject: [FFmpeg-devel] [EXTERNAL] [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: PmZ+R0RAgncI 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(-) .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 = { -- 2.25.1 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); @@ -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,