From patchwork Thu Mar 28 08:10:59 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: 47577 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1156519pzb; Thu, 28 Mar 2024 01:10:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoqe5cYsg0WoNkQbUQg7+DrC7xbuOtgFU8NYlRHG6ojM75QSmyYZHza2rugLnKk4h9PU39tf27csfCKdVdjGodlDsYG76/uYw/ng== X-Google-Smtp-Source: AGHT+IGHQ4pHr/Jyuul4zRMf54c+ihQoOeozdwWcABlVRTy9VUTUmnfXqXbt/hsFZhlK5oYqpaTD X-Received: by 2002:a50:f694:0:b0:568:75c5:8fb with SMTP id d20-20020a50f694000000b0056875c508fbmr1268024edn.3.1711613454055; Thu, 28 Mar 2024 01:10:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711613454; cv=none; d=google.com; s=arc-20160816; b=f1I/aPaFioKkT+WcVTvdp/rsYfhORSbU+04Hzh7kh50psTWEU9KO/0ubTrpXTt12t0 pSQYa63TJf3Yqu8jjohQJBY+5sKg/hJVwf64CXNiDXluR4uTRfY25DXiAqRCs/3QpQOk A3MEBnPrmA1iEU5Ax/UoCg4w+qQWp7XQST1/A1dLCIHNiGRytHqVUlSRlPxH2MxcLW82 jLmaZvEhEFYj6u+DfJrr2iuMnm/pFldh9nWReYH19GLaVoTLxOu265+Kzhpd7hgoGp29 u0q4r87nKPMU+Uj3bXqnMB6wa8/vLLcI+9FF01Hj5xR/y4CFixVoqAbJhr013yTDg3qk WTBg== 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=pqzrCWnL8fvhysngNoY9N8kjYkcYayipGB5fQGGR8tZAdjs68EH0th7I3oucpPvn5a gwlpSKRYF9bwFhaTb5oiQNPcuJhs5/eGwiRjC1Q5sYS7smWmC+dW6YPwzZId8XMmE7vZ Brb66A9TV9O+eYbM7o5Eslr8siqMAWxykKWidf3BcQLkii+ozhClKgCwbaf9efp33NUI MZcy6apY2pWhwDbyu91fevyxFyNzEV4koFMrvcU/g5kIgggOJbTTFwmw9FmnsEgVTvnJ LnlXVo1EXaTvYAitBm5xf1wMIcF2t4NfUE1CeYbfw3FSEg6abN30Cy1KBQjB33U1tBkn cHAA==; 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=DGXEV7AR; 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 b9-20020a056402350900b0056c1ac93013si533724edd.54.2024.03.28.01.10.53; Thu, 28 Mar 2024 01:10:54 -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=DGXEV7AR; 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 A4FC068CD66; Thu, 28 Mar 2024 10:10:50 +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.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D1D568CD66 for ; Thu, 28 Mar 2024 10:10:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711613449; x=1743149449; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3vfHuGGAycfjio8zv6rD77kxipuwwr4eWBEVwzDGU/I=; b=DGXEV7ARTmqLWl/rLjGyLA3gPvbQZUdk0VeQ4qu94Z82XJzJ7brfWlM5 72AbAgH+VqceSzIWxd9WkPKfA/jJu7rMq6ShbsPnW6IOqvTS1fUs8QSXj I3DD3RTbnJOsCu4lNo/vB4QgkshBClQeCdWMBHD/rtvwSzUg4pgGbLERB Pt97g7ZqGymxb0DmZ4nUusaLpMNwgFWlNQKsLebVUDHCKBjor8lwYaZxy KmXf2Pts4c12YQ1iFv1MkgG3Hxiwv572uQ/d2Xfw6Elu0OCrDph4lBZ4m wbRW6Bl0ukKSzq8i936DApUnB863sB2gJmxQhV1k8zo8Ug4Vp+zB7vy5g Q==; X-CSE-ConnectionGUID: ZKPLLBlETq+hwjpZggotnQ== X-CSE-MsgGUID: Z8bGHSaQRl2Y7f8haH5zzw== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="6687610" X-IronPort-AV: E=Sophos;i="6.07,161,1708416000"; d="scan'208";a="6687610" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 01:10:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,161,1708416000"; d="scan'208";a="21287514" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa004.jf.intel.com with ESMTP; 28 Mar 2024 01:10:40 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 16:10:59 +0800 Message-Id: <20240328081059.1057387-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: qgUuM2jSncbH 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,