From patchwork Fri Mar 29 01:10:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 47634 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1712985pzb; Thu, 28 Mar 2024 18:10:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6TUHp3p2lzLAVB6bItpPGrIpJvdu8oNxGiK0gfH9THWuIJL+3z4a8eC8K8wNQzN5hINbFn1stffWPi0yt0l2Xb6It3EkbaGetbQ== X-Google-Smtp-Source: AGHT+IFWru/2jjZ+IbzNMSG7JQ7/NmiIm1wfjtCOpuAGtGyKSl1IRdiMQUxxaGr3CT8HcWXn/ReS X-Received: by 2002:a05:6512:3e12:b0:515:d19b:babc with SMTP id i18-20020a0565123e1200b00515d19bbabcmr18812lfv.68.1711674622588; Thu, 28 Mar 2024 18:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711674622; cv=none; d=google.com; s=arc-20160816; b=WXKTi2AcUbyjbdfiISHYkytY0TFO6BgaqGGDPUqZZjRsh1MP6QnL8feVbIO3exv3yf BEkmkswoKV/0jqxHf1kOATJmBz7gZaWNkG0B8+c2mdlez0c2O7sUZ6KNBtMekIU/K9mh VsLDWH7goed+5dmXhU349HeHmnD5I0piCJYfFLQ/xEw688SlXZnUunO4hkhnCA0u3jRz vif/sV32kPAwI4AH/bDvP5zxDyX9puNrbj1BmDr1R5rPrwdeEbds/tfsPFBHFQsg2xkL lipPjOs6zjyje1fVxzhuqgmAQj0lUoBg3J9vkzO1BgBGYvaI7gWQJxBNUcZhqaBcKjTC IT3A== 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=nKgHP/Exgex8RWE3xYmB0XnZ52jiCSB6NhrL0tE86aM=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=WIssrR8u8ugf+5dwAlk+vaTWpdPY7TUgxOE66V9K4bX0xvUHtG26+/P+5M0rWBNBaB WKhXAwFbegYr09wCtPqUQfVGZTpll1QMwOAHYfFSS6oTIy/t7J9ZV/s1F6LlX0b2qJLy 98+k9kvLsJcBJwn1cc77fdkYBaoHhPRHO2jzmEjc6lrgPymARUQdNu1AIV3peJpBhFAl oUl1iALeT15ObdjeJaKU/wp7BUJOvSenTzZqaNDcbR56SU2Km+dmlSvY5LfD+oIGELZd bdlGLHa7OtdaxhySahDPLJArx6/3S4vRN7OYMnKeQtwbQsdBkfXUPmtdkSY5JAnntYQN zkTA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=L4qYa2Mk; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11-20020a170906bc4b00b00a469604c458si1220438ejv.742.2024.03.28.18.10.21; Thu, 28 Mar 2024 18:10:22 -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=@intel.com header.s=Intel header.b=L4qYa2Mk; 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 5470A68D751; Fri, 29 Mar 2024 03:10:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93D6868D5CC for ; Fri, 29 Mar 2024 03:10:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711674616; x=1743210616; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3vfHuGGAycfjio8zv6rD77kxipuwwr4eWBEVwzDGU/I=; b=L4qYa2Mk0nmqOGggzibo5/e8CdaJUcWZHuO3fRr8Z5CFqi3IAnUC8GsW yj3SzM8zQDSsw47hVy/O8QFWEhztHq7XKOB/mga5Ij6nZbOglObLiNOnH YHlxeAeQu2EgGdX/iIyG3W0uOBi1ZQLd3L79HfN+FA4BjTlvco99HG9s6 cnRYUmLsKOaTPdIzChvYcgDhzDXn0jASmtvUs68fJkEGwd/v0mDZ++HEC Zpb2dNtEVGXDSuFCW97hbYs0WRV2Etk3OoaGeRgM79NoavPiafrCdTB64 gDD/azHzJDAiXOUrS/JgAwyJC11U6F5Q4jT9ziNAmkGbcrM5cLTEoaqlN A==; X-CSE-ConnectionGUID: D0mXGp4nRf6s8b16pMS9Bw== X-CSE-MsgGUID: W81XAICZR3+OXQoV1leO/A== X-IronPort-AV: E=McAfee;i="6600,9927,11027"; a="6972730" X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="6972730" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 18:10:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,162,1708416000"; d="scan'208";a="16653735" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa010.jf.intel.com with ESMTP; 28 Mar 2024 18:10:06 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 09:10:26 +0800 Message-Id: <20240329011026.1090364-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] lavc/vaapi_encode: Add VAAPI version check for BLBRC 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Hqc5CmCkrLam From: Fei Wang Fix build fail when VAAPI version less than 0.39.2. Signed-off-by: Fei Wang --- libavcodec/vaapi_encode.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 940f0678a5..c4b5411e68 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1805,9 +1805,17 @@ static av_cold int vaapi_encode_init_rate_control(AVCodecContext *avctx) int i, first = 1, res; supported_va_rc_modes = rc_attr.value; - if (ctx->blbrc && !(supported_va_rc_modes & VA_RC_MB)) { + if (ctx->blbrc) { +#if VA_CHECK_VERSION(0, 39, 2) + if (!(supported_va_rc_modes & VA_RC_MB)) { + ctx->blbrc = 0; + av_log(avctx, AV_LOG_WARNING, "Driver does not support BLBRC.\n"); + } +#else ctx->blbrc = 0; - av_log(avctx, AV_LOG_WARNING, "Driver does not support BLBRC.\n"); + av_log(avctx, AV_LOG_WARNING, "Please consider to update to VAAPI 0.39.2 " + "or above, which can support BLBRC.\n"); +#endif } for (i = 0; i < FF_ARRAY_ELEMS(vaapi_encode_rc_modes); i++) { @@ -2032,7 +2040,11 @@ rc_mode_found: ctx->config_attributes[ctx->nb_config_attributes++] = (VAConfigAttrib) { .type = VAConfigAttribRateControl, +#if VA_CHECK_VERSION(0, 39, 2) .value = ctx->blbrc ? ctx->va_rc_mode | VA_RC_MB : ctx->va_rc_mode, +#else + .value = ctx->va_rc_mode, +#endif }; } @@ -2061,10 +2073,12 @@ rc_mode_found: #if VA_CHECK_VERSION(1, 1, 0) .ICQ_quality_factor = av_clip(rc_quality, 1, 51), .max_qp = (avctx->qmax > 0 ? avctx->qmax : 0), - .rc_flags.bits.mb_rate_control = ctx->blbrc ? 1 : 2, #endif #if VA_CHECK_VERSION(1, 3, 0) .quality_factor = rc_quality, +#endif +#if VA_CHECK_VERSION(0, 39, 2) + .rc_flags.bits.mb_rate_control = ctx->blbrc ? 1 : 2, #endif }; vaapi_encode_add_global_param(avctx,