From patchwork Wed May 22 01:26:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49121 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9214:b0:1af:fc2d:ff5a with SMTP id tl20csp82336pzb; Tue, 21 May 2024 18:30:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkPmhH8OmztUva04QZ/f2uEEO7WmNeSe9lbdRwCwGRX1FirRSNeXUzsGi3Hr1P5rLQB2K7jHWGAdbDirDIzcS2S7AMnAYcxavo4g== X-Google-Smtp-Source: AGHT+IFrj0WBmOpFlEfjNbm8uScLKxXuosk4OHEuoJ3E0gybb6T6o/9tyk+Gb2z9wzDbgj7VKUXP X-Received: by 2002:aa7:c659:0:b0:578:3510:993a with SMTP id 4fb4d7f45d1cf-57835109c57mr37806a12.5.1716341405330; Tue, 21 May 2024 18:30:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716341405; cv=none; d=google.com; s=arc-20160816; b=0QY7aCFrer+HnD6d76tTHJMo6tsGpqLpU8DtPWng+B6CQ0czJunCD/6ePIk7mi9mTB Fr3IBHKmVqOT3gJoQ+zy+NpBar7Y6IyG1iURAyp1ZxvAA9DTk/YZ0Nwq+pgg7MWpSUXI aMCnUAVdKqkXnyxWBtMm7QySliC0cSpBGfS7N9/I0wTfnxa1VB4b3Aqzcb5CkCSnz9qK D8NVamnThzmeuW1S8lGff0fruLqSvXb3dAqpGahBYBTiZjhUPEY+uVZeMUDmqJc4zyoP 9iLZaYq8r5HiGk03J1D4QJZd4PsfQCVyVoB/gJ3mfUs+Ozvmmr8XZNXkwPkaMi2RDs8U wa8g== 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=uSDqziY7PLd7j08GMkkahNESJmm36s28aGkC9hbLNmIB0WXUGheqmCKzlRQ4n1ufUI yrxEdDKleAfRSWutdulj4EIn8A2P+NlvtaKBNjUKxvPvfGCgZbUeiADXa3kZOs99lwNh 1rVBIuSYNgPRC+YzEV01t/Ksy1rsMpwm1ykAJ3bzyfn8yR0F6QkM+7GrXfAR1Vj8xEXc kqlxIRWWoO4JVtf3/sVmKFe7ZBrM7C9cghSbtUQAdnWT/zH+McuMSUApcL6HU4PSVUcX mPEaMrd3jfanzYUmA/ogStrJDl/aNk5HTQUgBniyWL/1CDCe8jScXTaYjlHRjFn3vkXW tQHg==; 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=Cnb1lY5Q; 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-5733c37825asi15171985a12.645.2024.05.21.18.29.38; Tue, 21 May 2024 18:30:05 -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=Cnb1lY5Q; 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 11A0F68D48A; Wed, 22 May 2024 04:28:24 +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.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5259168D422 for ; Wed, 22 May 2024 04:28:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716341297; x=1747877297; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cQWovVr5I/lD/RbrUYvuZefltPgzt8wh96+kMJzho40=; b=Cnb1lY5QecyzVXwg85sRGlgSpFIZYd1w9O+XxouC2xAaRXH4slLwTHAV WXvzE3Fv8FrjI2vo9h/Tyc4Vq9x7rYGBv5RTAKj9boDzdANevHaj7O9Wr q9MWAoIb/WtlF0tB1Wd2tyhZOD3RL6G2+RPtPcc/OnMZwDUHOPTvvpCVo gd0EWRYxe3cfzg5043d2moasQzPhXPKQUnzcDrhAgaliKdO8ReOARYR0B jWCWuPscwS+Jm7u2oyB71nK79W35BnqpjgyLGCKQ3OkSqRwNUO5hPW0ct TXNb8m2dt3Uj2TfTN5t5120AqUca/3on/TgmHx7J4jnO+0paVhHXw5HjZ Q==; X-CSE-ConnectionGUID: QBTrM/yISSu8lzcupEHrHw== X-CSE-MsgGUID: wA8GgWRQTH+EYeC3EllNfg== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="12797214" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="12797214" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 18:28:11 -0700 X-CSE-ConnectionGUID: /xhSmMGIROG1TEMaDRVz1w== X-CSE-MsgGUID: 97V9lnmJTdi/PMOsTuEjNA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33537504" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa006.jf.intel.com with ESMTP; 21 May 2024 18:28:10 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 09:26:23 +0800 Message-ID: <20240522012627.1386-10-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240522012627.1386-1-tong1.wu@intel.com> References: <20240522012627.1386-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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: H08m98AqHi+b 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);