From patchwork Wed Sep 18 07:10:24 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: 51638 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d32e:0:b0:48e:c0f8:d0de with SMTP id cf14csp727704vqb; Wed, 18 Sep 2024 00:08:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWeAAGg95XSs1uWARqNG8JchQGoyuvo+ydIpUNk643ctvQcqU8aWsrY1gvCff6fTQVULsGR+nRFGe8ugqg47TQ8@gmail.com X-Google-Smtp-Source: AGHT+IHQgnqa3YKP7SM+oGGfB8Cxb9TS4j/yTFbCahv7IcDTsP4AdrkGRMz5ldREP41kwY2hSbQ0 X-Received: by 2002:a05:6402:35d3:b0:5c4:4fcb:92fc with SMTP id 4fb4d7f45d1cf-5c44fcb9301mr1777499a12.24.1726643299121; Wed, 18 Sep 2024 00:08:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726643299; cv=none; d=google.com; s=arc-20240605; b=DVO9pbzjL9Cz+L6P5ESlakxrvUhyi0q/7BrGvoLehveJiZ/EDiFuc7QgOwS4utw3g+ ZB5JET87D34tFh27mEvYMdgaU0ckVAZ95o1FlfS+b5nyLBytNqp9r960nsx1j+h8Zf7m C1rzooVQsLdnBVmwkQli7g7FqmbRGLBebJMJKCWVq/0vlk0SZq23ubvC2HmZwZ7atIcy 6HsD1fkcr22yModxCrdzfK8sF67/1DM1WCZ4PXecLAhwS6G4YolzDvtCwmLjni8UoLEf sM8x2GKiarsWeCty6stegtmBOztgLdcl/9PMnVO14B1DI0KMqmjEnTE0ZO6kxt2+8Oxy TG8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=AduonBz9D2mMGqM1xUrweKECSs02cEuprE1Bd7VOfhM=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=XvlKNH7f2G5LgLemi4C0K2Iojc+sXo8WKb/oErNZBfyowREQF8SdLD9K6Oecg0t13r 30kqDB3gKO8MmD6r94c6W7GqDeqiVvbpnDMC/1dD/z3r2b80yvxRq//A6VfzGVsMBP4P obLoaI6aoo81zY6JZTrwzF59z0E924XjKT6idKmtcqZPHwCXJiLmgU1VAST8G51l4Rvy h2QstMP+q1kSlmqTpr6PZ7T1AktiUfjCW8OW7cI/xGCwfA1AGMClOboImPeK00+ZHxHa Ift2kvmiIBWEOHlddFNAiCGB+iUrLmJHUHrrRAnrMjcM+MqMfn29kLUQio6FlII8Xc+7 x1og==; 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=KdfVP18h; 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 4fb4d7f45d1cf-5c42bcad981si6320569a12.614.2024.09.18.00.08.18; Wed, 18 Sep 2024 00:08:19 -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=KdfVP18h; 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 9ECEE68DCA1; Wed, 18 Sep 2024 10:08:15 +0300 (EEST) 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 7AF9568B32F for ; Wed, 18 Sep 2024 10:08:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726643294; x=1758179294; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=S3iXMPxZJvszjtcI4nKdHBlk69PK9cGh0jaO0+deqrQ=; b=KdfVP18hLlWa6xY5d+kyGPkQZH4FD5keQapb1SfUDSjpWmipz+FVzBSA zYC1CKza8DdSiiRxmaKmt6kjsdJnEyEqUlvUoD/alHlVxCRDq/fNz0fOJ TOSXvRn8nC6YTeD5zd30e2ENZwnB2w8Xmn66H8jbfE307i19cI2aKwtLE OU26kVWs+c05Gyh0bHDoo+Fa5r3z0EiTnzRzflydymcSZWMEICtY6MZx5 L76o0FDdrNd1JwKOrHkDKgf1m5HMo6lvO4CROMXhNMiQYHSoiV5kH+ers EcExxNmOFZ7rt5M8fmmF5yA/ihepQvULwkDEhomPtZXqONYPkFz19ACXT A==; X-CSE-ConnectionGUID: hyH/UMfARGSNQ6YeT9HXBQ== X-CSE-MsgGUID: uYKFnr2fQeC1CiAMAh/l7A== X-IronPort-AV: E=McAfee;i="6700,10204,11198"; a="25695715" X-IronPort-AV: E=Sophos;i="6.10,238,1719903600"; d="scan'208";a="25695715" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2024 00:08:06 -0700 X-CSE-ConnectionGUID: zLstBEunTbKTWfMKGROSog== X-CSE-MsgGUID: wzxnhNocRYi5L9IupyBbPw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,238,1719903600"; d="scan'208";a="69452233" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by orviesa009.jf.intel.com with ESMTP; 18 Sep 2024 00:08:05 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2024 15:10:24 +0800 Message-Id: <20240918071031.1377336-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/8] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B+92pqRUSDPF From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 34 +++++++++++++++++++++++++--------- libavcodec/vaapi_decode.h | 7 ++----- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index a59194340f..709699dcaf 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -39,12 +39,24 @@ 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->nb_param_buffers_allocated); + if (pic->nb_param_buffers == pic->nb_param_buffers_allocated) { + VABufferID *tmp = + av_realloc_array(pic->param_buffers, + pic->nb_param_buffers_allocated + 16, + sizeof(*pic->param_buffers)); + if (!tmp) + return AVERROR(ENOMEM); + + pic->param_buffers = tmp; + pic->nb_param_buffers_allocated += 16; + } + av_assert0(pic->nb_param_buffers + 1 <= pic->nb_param_buffers_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", @@ -52,14 +64,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, @@ -222,7 +234,9 @@ fail: ff_vaapi_decode_destroy_buffers(avctx, pic); fail_at_end: exit: - pic->nb_param_buffers = 0; + pic->nb_param_buffers = 0; + pic->nb_param_buffers_allocated = 0; + av_freep(&pic->param_buffers); pic->nb_slices = 0; pic->slices_allocated = 0; av_freep(&pic->slice_buffers); @@ -235,7 +249,9 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx, { ff_vaapi_decode_destroy_buffers(avctx, pic); - pic->nb_param_buffers = 0; + pic->nb_param_buffers = 0; + pic->nb_param_buffers_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 702171e108..a373eb5d6b 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 nb_param_buffers_allocated; int nb_slices; VABufferID *slice_buffers;