From patchwork Wed Sep 25 02:15: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: 51808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp185312vqk; Tue, 24 Sep 2024 19:14:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0Ju+ny+zQHsKc35yOgPUWL2FJR9YbUiZKQP17SMA8N9hnj6Ly9nxBzP96rbruVM1AWjw/oHmI5IzY/ffmIUUh@gmail.com X-Google-Smtp-Source: AGHT+IFUo8QpX8N5Qe5vFieCMkcxqlc/xhZnuotOp+wctsj5KRJHiQg3LWzsChSebX4aaxIYFqZK X-Received: by 2002:a2e:bc84:0:b0:2f7:6664:f272 with SMTP id 38308e7fff4ca-2f8d0b67935mr20172051fa.6.1727230485503; Tue, 24 Sep 2024 19:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727230485; cv=none; d=google.com; s=arc-20240605; b=fabdv6+DJCSc79YdyGfcKJQJZ+kGFrK5E9+5QEMjZpf5ukWpLNXgxtD7e6afVZQC78 uyYMR+PlImoVgJbvpGMFCzTJ7Ja2A2jmE3LI0TJzkEgHm+Vhytp+kcb0j7FtpWxG5zHO T1IG3dbk9ibS6mNNuMkL5VxT70LJC2TbCWZfqzPWqNYYxiujljRGSNNtleoZqNsahMLx J+taSoizMJvA9IXr9tWet6CJlVNAtETIi6sqp6urSCdmjQZAmcqzcAUbIq1V2tDeRR6g LJjBlQUL7cb1cgjtaGFiGxPVcd6IAZ5hesGLPCSCFfzpN0JjvFTCvvG41P4EUJFEw08W nZzw== 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=Tc1vggbSpTWuSBNxhZibH4xwBZ/pDlWHyeoXx5ik+QR0cxo3G4UhKWgLrc3GIvRsaZ L/1CdGMJCg17d+4CYhzdzypC9iDosN0OIUMD+YDKCj4k029PhM4LMEkgGo5l8L4L1TiI suQWUni7Y2toEKoe0gzBdRKb06ecsrTe7RT3HkGWS2d5hPVcPOmQfHkOEahudmoJEpwL Jc3oglB3WhHCu5AVDdjXteyKy+2behjaZOVAyrDdOJrYQMcVdYcW2EF9sPZ53rpfD/nU cT5itMrjjxMtasXLMaRA1clhD8LvLAaN7AHOoTrjZ1MjMMxaApmkMO9Mvea7Io70KL6c pkLA==; 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=IhjRqQrI; 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 38308e7fff4ca-2f8d289f1c7si7791891fa.423.2024.09.24.19.14.44; Tue, 24 Sep 2024 19:14:45 -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=IhjRqQrI; 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 4083168DB84; Wed, 25 Sep 2024 05:14:36 +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.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15DE568DAC4 for ; Wed, 25 Sep 2024 05:14:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230474; x=1758766474; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=S3iXMPxZJvszjtcI4nKdHBlk69PK9cGh0jaO0+deqrQ=; b=IhjRqQrIG3V+QGbuHfZ6xYUBEPk4u30DddpfVKaT2ftG1f7tqgeU5Rwe cu186fSC5faAv6u4QWx8WTZgT+FXm0YipN34J327Lo2F9PWZ/HgwsvtjQ TkAc41KfiAXfjErsDfwB6z9J8YjHuOEUQhLD+ElCaXDhe0O7mJdkC5aJ/ k8HisAJDu7BXUlBSOwNcFaFYNz82UCm4jp/XOrXOdQq4g1PGPzKrI3oRk ljA/BYD9MoA+/pUADfTlOyCElMn80BjXVlGW13sQTEoFYz4iXhrPuuiM6 mp3Pqu4H/3WsXvPutFyjEMFmww28/771k3+cV2ELPS6Ohnie0odHU8Epj A==; X-CSE-ConnectionGUID: TeJPW4NIRFKOEe2rMy6RTA== X-CSE-MsgGUID: 3MrgNQfOQ7ydakw50889mQ== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37633933" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37633933" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:14:19 -0700 X-CSE-ConnectionGUID: eEbTQG7lSq+hSOn9CGIbqQ== X-CSE-MsgGUID: 3Gd3nE1iRU+M9a11VDyoFg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246381" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:03 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:26 +0800 Message-Id: <20240925021533.1742735-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: Ls7MKytpBHFJ 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;