From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EC7104A417 for ; Thu, 28 Mar 2024 01:26:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3811768D5C0; Thu, 28 Mar 2024 03:26:24 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E92ED68D26F for ; Thu, 28 Mar 2024 03:26:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711589181; x=1743125181; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=WdQU8Mg94r83PPFGlDOArgiZto68WfwbDOKeuLCckhQ=; b=VSmJy467XEet/FXDKrkBA71yGrI2iYt9mtdHZNgIPO0Cm/B3vKbIY/D4 f/9c+WUFQzIl0Yoz+WwUtdA1WW+kZoFmnxufFRRHlknMtH/pC+j8r/JcE i+95Nok6FTXhlb0jd8a6kiWklg9+p+nFFSnB5mQeAI0S32ryJb/yIgxYQ i172bKQwBYxAeT0zsc8ZPM1ZPU0DhLxi98SVqdsPsPfSOROPIBCSf3kC5 H1zcXthsJZ1MECacK7b0P2dFCCP67stQMvgI0FM0gFQeJPleRbAaoryYn 3BNsjGyuSKzXhIzvtXbkSSqNRSe3zygJea8/OpoSdwtawq18tZcdPcjTV w==; X-CSE-ConnectionGUID: wieuDMz2TzqNP434dywZUg== X-CSE-MsgGUID: oaf12clbQzqo0NX67utWbg== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="7324910" X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="7324910" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 18:26:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,160,1708416000"; d="scan'208";a="20996864" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by fmviesa003.fm.intel.com with ESMTP; 27 Mar 2024 18:26:12 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 09:26:25 +0800 Message-Id: <20240328012631.777476-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 1/7] lavc/vaapi_dec: Create VA parameters dynamically 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 29 ++++++++++++++++++++++------- libavcodec/vaapi_decode.h | 7 ++----- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index cca94b5336..1b1972a2a9 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -38,12 +38,23 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, { VAAPIDecodeContext *ctx = avctx->internal->hwaccel_priv_data; VAStatus vas; - VABufferID buffer; - av_assert0(pic->nb_param_buffers + 1 <= MAX_PARAM_BUFFERS); + av_assert0(pic->nb_param_buffers <= pic->param_allocated); + if (pic->nb_param_buffers == pic->param_allocated) { + pic->param_buffers = + av_realloc_array(pic->param_buffers, + pic->param_allocated + 16, + sizeof(*pic->param_buffers)); + if (!pic->param_buffers) + return AVERROR(ENOMEM); + + pic->param_allocated += 16; + } + av_assert0(pic->nb_param_buffers + 1 <= pic->param_allocated); vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, - type, size, 1, (void*)data, &buffer); + type, size, 1, (void*)data, + &pic->param_buffers[pic->nb_param_buffers]); if (vas != VA_STATUS_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to create parameter " "buffer (type %d): %d (%s).\n", @@ -51,14 +62,14 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx, return AVERROR(EIO); } - pic->param_buffers[pic->nb_param_buffers++] = buffer; - av_log(avctx, AV_LOG_DEBUG, "Param buffer (type %d, %zu bytes) " - "is %#x.\n", type, size, buffer); + "is %#x.\n", type, size, pic->param_buffers[pic->nb_param_buffers]); + + ++pic->nb_param_buffers; + return 0; } - int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, VAAPIDecodePicture *pic, const void *params_data, @@ -215,6 +226,8 @@ fail: fail_at_end: exit: pic->nb_param_buffers = 0; + pic->param_allocated = 0; + av_freep(&pic->param_buffers); pic->nb_slices = 0; pic->slices_allocated = 0; av_freep(&pic->slice_buffers); @@ -228,6 +241,8 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx, ff_vaapi_decode_destroy_buffers(avctx, pic); pic->nb_param_buffers = 0; + pic->param_allocated = 0; + av_freep(&pic->param_buffers); pic->nb_slices = 0; pic->slices_allocated = 0; av_freep(&pic->slice_buffers); diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index 6beda14e52..a41d7ff2ff 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -32,15 +32,12 @@ static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *pic) return (uintptr_t)pic->data[3]; } -enum { - MAX_PARAM_BUFFERS = 16, -}; - typedef struct VAAPIDecodePicture { VASurfaceID output_surface; int nb_param_buffers; - VABufferID param_buffers[MAX_PARAM_BUFFERS]; + VABufferID *param_buffers; + int param_allocated; int nb_slices; VABufferID *slice_buffers; -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".