From patchwork Thu Feb 29 05:34:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 46645 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp379773pzb; Wed, 28 Feb 2024 21:36:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWgesYSorm4J/3SzZVrjqd6r60Qx4Chm48nnVQB45Syt9j8muMEhDoqIG+XlCe6DXOMEajKyKC5dG1o7LA8UazDYNRFoPuxkvpAqw== X-Google-Smtp-Source: AGHT+IHfyEOVPxkAI5orTZ0JDh/2K5DUpeqqEPXME+4zVyv/cG0tIV8HnIVpUBgzErhkrlOPT6kv X-Received: by 2002:a17:906:418:b0:a3f:daf8:bd3b with SMTP id d24-20020a170906041800b00a3fdaf8bd3bmr581118eja.8.1709184979883; Wed, 28 Feb 2024 21:36:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709184979; cv=none; d=google.com; s=arc-20160816; b=K78iq9x1GHew70tm54puSubkpJ09QysJGB+mhFKK+BPyVEcHktGWEerXSValMawVrU aL6SfZOG9+iAlNQ0/BFv1xpu/AH9jghoKMUy8DoCcat7qydw2HLWsjpY/QL59LxdFnLW EGl9yj1llWUpAtcEMdfxtkhMtq55SIbmD2/3rogyc39sm0VDnOKOMZGos1DV6r0t0WJ9 Tf/4ytVN7yXZqBFei7UxtGAyt2pojT5EoU3XTnlmJkt5a4KTlKSyEYgz/lYJKDM4sq04 kRei4a8amsJ4mETLZu+P00l8XA7sWDX+bIQl9AOGOo7YfVSxArt9LB16uc7+OH6osLBi 5fNQ== 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=KnUqoioB4CvRbCyLhC9QdsrgHzwpOp1p0fzAZ60GSoI=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=iiD5CUBUzvhsKuhxVpbuveEHCy1Qqyatfvkjp2HDdLaPUfzLSIgjZQclEe+8nNz8BT QHwv0ETpH+2ON00B0MTV/UxR7mW31wmuVGIRoxpwD1b6NdXyI++YVubBnSnG00NLylH1 g9ejE773KSUE/q9OLCcoECSsl6tj0KGMzBD3dheQv7Gc+8HXVJjNdswH3iPfX+rf8h/C ++mDebl0eWO2x+2p3YN7OsnOH3cW0CK7nLR+cGRHh0frct3UjY9LDaJPR4Y0EQaKViA/ +O6vJx1T0YMKDqUf/zmfunNH8alYifPajptTADE6eOB5v7rgnUd+QdaRQYLVeNlGcFD6 x/0g==; 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=ihrEfkSw; 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 by21-20020a170906a2d500b00a3fc1f16170si255683ejb.626.2024.02.28.21.36.19; Wed, 28 Feb 2024 21:36:19 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ihrEfkSw; 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 0B28868D02A; Thu, 29 Feb 2024 07:35:13 +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.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0D7E68CDE9 for ; Thu, 29 Feb 2024 07:35: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=1709184911; x=1740720911; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=DMu5ODhfRXM9iHKWsJPyXYGt/iNEs9/zYvuyxEV/so4=; b=ihrEfkSwuuNSU8E+fgamtgFkNjdQmtbCTUkoj69HEfo7FLgIfyGKutou apZhEsXPEkVrjPtGLhGj/tO3acPm8WN0ZKU7tOGAdBBBxaD0vL3U046Mo 2dOx0AAorv9ZUPHGKvxIIoArG2+Tjx5y1/402utOONLK5ivbmjg5HhmlT obaUYR5fAY/Sv/xvIp1vMoPfBW0LwnJLr/CV2OQJBkiLFLR2T2RvxFVzU rYIGDkbAGkx/KcVj8E4j/23NAoya7/FTWTwNC0VtZ22Wd+PpZbbkFr4nQ H1hUb0TlP/AlBj30nz2ZbnyX0z25u8ZKhhDCENj1+yz613B0w9eRLnI+9 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10998"; a="21090389" X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="21090389" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 21:35:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,192,1705392000"; d="scan'208";a="7569500" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2024 21:35:07 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 13:34:33 +0800 Message-Id: <20240229053434.2476820-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvenc: always allocate the array to store mfxExtBuffer points 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nclJSOl5jLEt From: Haihao Xiang This allows us to append mfxExtBuffer per user's settings Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 44 +++++++++++++++++++++++++------------------- libavcodec/qsvenc.h | 1 + 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index c63b72e384..27e0e7ee71 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1608,6 +1608,7 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) int iopattern = 0; int opaque_alloc = 0; int ret; + void *tmp; q->param.AsyncDepth = q->async_depth; @@ -1668,35 +1669,40 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) if (ret < 0) return ret; + tmp = av_realloc_array(q->extparam, q->nb_extparam_internal, sizeof(*q->extparam)); + if (!tmp) + return AVERROR(ENOMEM); + + q->extparam = tmp; + q->nb_extparam = q->nb_extparam_internal; + memcpy(q->extparam, q->extparam_internal, q->nb_extparam * sizeof(*q->extparam)); + if (avctx->hwaccel_context) { AVQSVContext *qsv = avctx->hwaccel_context; int i, j; - q->extparam = av_calloc(qsv->nb_ext_buffers + q->nb_extparam_internal, - sizeof(*q->extparam)); - if (!q->extparam) - return AVERROR(ENOMEM); - - q->param.ExtParam = q->extparam; - for (i = 0; i < qsv->nb_ext_buffers; i++) - q->param.ExtParam[i] = qsv->ext_buffers[i]; - q->param.NumExtParam = qsv->nb_ext_buffers; - - for (i = 0; i < q->nb_extparam_internal; i++) { - for (j = 0; j < qsv->nb_ext_buffers; j++) { - if (qsv->ext_buffers[j]->BufferId == q->extparam_internal[i]->BufferId) + for (i = 0; i < qsv->nb_ext_buffers; i++) { + for (j = 0; j < q->nb_extparam_internal; j++) { + if (qsv->ext_buffers[i]->BufferId == q->extparam_internal[j]->BufferId) { + q->extparam[j] = qsv->ext_buffers[i]; break; + } } - if (j < qsv->nb_ext_buffers) - continue; - q->param.ExtParam[q->param.NumExtParam++] = q->extparam_internal[i]; + if (j == q->nb_extparam_internal) { + tmp = av_realloc_array(q->extparam, q->nb_extparam + 1, sizeof(*q->extparam)); + if (!tmp) + return AVERROR(ENOMEM); + + q->extparam = tmp; + q->extparam[q->nb_extparam++] = qsv->ext_buffers[i]; + } } - } else { - q->param.ExtParam = q->extparam_internal; - q->param.NumExtParam = q->nb_extparam_internal; } + q->param.ExtParam = q->extparam; + q->param.NumExtParam = q->nb_extparam; + ret = MFXVideoENCODE_Query(q->session, &q->param, &q->param); if (ret == MFX_WRN_PARTIAL_ACCELERATION) { av_log(avctx, AV_LOG_WARNING, "Encoder will work with partial HW acceleration\n"); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index c71bf2ed50..f2f0687bfe 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -196,6 +196,7 @@ typedef struct QSVEncContext { int nb_extparam_internal; mfxExtBuffer **extparam; + int nb_extparam; AVFifo *async_fifo;