From patchwork Mon May 20 14:52:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49059 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4514651pzb; Mon, 20 May 2024 07:55:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcdqJuhQQFAaURQvZKxoYwQWG+DI7Euw4Drzkz0ULe7h9YzMpwhjhVmSJU3zZHtComUpJiNcDoynRmEkk6q1j35hqUJgTUgS92mg== X-Google-Smtp-Source: AGHT+IHGBn9DR5EVlTHtHXRXuPKILBqHsJVcvTTpZinmdLss/HjWV5V5QrXa0F+MXTFa4GbMc7f3 X-Received: by 2002:a17:907:2685:b0:a5c:daf2:1cfb with SMTP id a640c23a62f3a-a5cdaf29605mr1845679366b.63.1716216931155; Mon, 20 May 2024 07:55:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716216931; cv=none; d=google.com; s=arc-20160816; b=gOg11xsoannWdO1ZfQcnu01YZAeaUvjiRl3xHgLdFVMvVZANI5Bwaixp4fGO+XcKaT gjJUVBslCe/3gf7IbHM4Al27QMAL0hphABOWTunN783sUGwUNND9/+HHNwOrv5MXT0BY 5qxJfiIXlkrir37ZcuyAAhdkh1GhY1Evhp02tBMjINfXnuFpxduqelQRETD+4niaM/73 7hvvEze9jeb4QWOlI3B1NmD0fvb0C1XDlC6NkD1pbDfJ0ATDU1yNXUVYrcFJd1A33TQJ /Jp0r49LGqQIqDPCH8/qFA+Y9CPd40VGjgLWhmCrQq0/WK9Fd/UUIpSpWfJJQubJOpNL +HLQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wfyUQ2gNra6aUKJRctOZaKmOEBfF+ZhD29YktJwxr7Q=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=UXuKDN9rVsLfuU4wl/SZDWCa0puGjSDfeJVPZOBO6bdx1iPaFkQCjlIqXOLH/WaA9O bqvVx+rj47p0xvWH5ScuZzzhqEMulb38gXRgbz/1cR+vs5zXypgDnuJEoOEDE9Msb/wF egEbStnSANcX9nLW4rxYeH0oKskjZMMvo/vOiKN65AmzwA+GD0UMOW6CeQQhazZ/yxDT 2Gupj/gJxFprJ79p5MVxct+4hqbBI7XfliU4KkgE2KJMa9UEeUuMWLT5vhxyi9dJ5kGk Rkmsi8vsY9NTlOH2fQzqJuOB8p9gqQTc/lqNOt1UpmDgV0n+t6ujqbHz3VZfqcbju9It Sjbw==; 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=TMXXLQ5M; 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 a640c23a62f3a-a5a5b1ae877si1041171966b.998.2024.05.20.07.55.30; Mon, 20 May 2024 07:55:31 -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=TMXXLQ5M; 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 B299168D2C7; Mon, 20 May 2024 17:54:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF73468D255 for ; Mon, 20 May 2024 17:54:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716216853; x=1747752853; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cQWovVr5I/lD/RbrUYvuZefltPgzt8wh96+kMJzho40=; b=TMXXLQ5M7nxdj0sBgtBRbRYCinee/kXuFdirKyp/NNeMT/bG4yW+BkL/ gdQE9DOo+IuyHVC1lb7rkEAHozwfShkyYBLXJJH38ew22RmE1oHAbKcdX FBXenwZm2RyjDb/RTa0xnB50v/cKa/rvJRS4PjndVbyHFQFiJytooNhnR 2DeVyOIkAHTVqYoNF8oK4TYd5w2/nD2WcI9/vz0DSOwHpe+jcG/eLj0Qb nPZsUPNGblb0Arg/CseRRNi/67lDEr5ZA4WYh3lJCrT8UWOEs+mB3Ezx2 Km6pBRWMFaRCDdkNxIZ8pUk+usZyIRno3t8gWEAMggkn00MDjePbnAnXQ A==; X-CSE-ConnectionGUID: V3G1Fk7cRpKWEXXkA98Ang== X-CSE-MsgGUID: yUMkEYayQWafBBdKyGm2HA== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12197255" X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="12197255" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 07:54:05 -0700 X-CSE-ConnectionGUID: iW2JQ96TTqSdVRvDey83Tg== X-CSE-MsgGUID: otDhmvNtQvKw9Tvq8dAQvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="55787910" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa002.fm.intel.com with ESMTP; 20 May 2024 07:54:04 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 May 2024 22:52:19 +0800 Message-ID: <20240520145222.291-10-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240520145222.291-1-tong1.wu@intel.com> References: <20240520145222.291-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 10/13] avcodec/vaapi_encode: extract a free funtion to base layer 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bbeAdRzz8v9B From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.c | 11 +++++++++++ libavcodec/hw_base_encode.h | 2 ++ libavcodec/vaapi_encode.c | 6 +----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c index 42c40cb48f..f743d119cd 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -748,6 +748,17 @@ fail: return err; } +int ff_hw_base_encode_free(AVCodecContext *avctx, HWBaseEncodePicture *pic) +{ + av_frame_free(&pic->input_image); + av_frame_free(&pic->recon_image); + + av_buffer_unref(&pic->opaque_ref); + av_freep(&pic->priv_data); + + return 0; +} + int ff_hw_base_encode_init(AVCodecContext *avctx) { HWBaseEncodeContext *ctx = avctx->priv_data; diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index 7d40da039c..76a39e2d97 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -223,6 +223,8 @@ int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t ref_l0, uint32 int ff_hw_base_get_recon_format(AVCodecContext *avctx, const void *hwconfig, enum AVPixelFormat *fmt); +int ff_hw_base_encode_free(AVCodecContext *avctx, HWBaseEncodePicture *pic); + int ff_hw_base_encode_init(AVCodecContext *avctx); int ff_hw_base_encode_close(AVCodecContext *avctx); diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 98b8c82da3..e89d6e01af 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -878,17 +878,13 @@ static int vaapi_encode_free(AVCodecContext *avctx, av_freep(&pic->slices[i].codec_slice_params); } - av_frame_free(&base_pic->input_image); - av_frame_free(&base_pic->recon_image); - - av_buffer_unref(&base_pic->opaque_ref); + ff_hw_base_encode_free(avctx, base_pic); av_freep(&pic->param_buffers); av_freep(&pic->slices); // Output buffer should already be destroyed. av_assert0(pic->output_buffer == VA_INVALID_ID); - av_freep(&base_pic->priv_data); av_freep(&pic->codec_picture_params); av_freep(&pic->roi);