From patchwork Sat May 25 10:30:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49248 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2241586vqf; Sat, 25 May 2024 03:40:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUAeLfQJMXg8MZr6/8QBME4bLXCfUu8K9E8jkA+T0JDOk2ftyiDJChha/P8bzGraStRr05vpWAqmyepdo3EbOt+7PJdtkbpkMAHjw== X-Google-Smtp-Source: AGHT+IG3Ov/F6nOBVQgVDAM3uUSJuoFV9Vt7b/waHqIdk4lbPeGyxv27uUb7+nN+metl3XYPWFtt X-Received: by 2002:a05:6512:1c9:b0:523:b7ec:a218 with SMTP id 2adb3069b0e04-529646df0cdmr2667708e87.21.1716633609413; Sat, 25 May 2024 03:40:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716633609; cv=none; d=google.com; s=arc-20160816; b=le75wxdOVzF/RMka/u63PD65+u/DN0Yd1Aca5UZ5Uabud0yUQYccV3jNnjNRNd916g uoFUytFJvzbTL60uFzPmM9akZWpFwjdqsYDaQgDHaqqV+zNlaZMxHXktCKz9oAvs3PM+ GQIL7EotxwfK3PnSavJSRvsx7ZoqCpIY6C9Q8Ehi3tQQ6p2VPUp9IcYku96QCTe8itMf WiPoe00L+OoWzZ58B220tmAfinrnIjpv4BgpbEu/3hkXIbrlVpU6OFNG8UdMtXYsFASS tXzz2oi6b3FnAij/fp4qa3jsVi/EhCal1F5UDdPcm6HqrqU4SZ+TQEw5OrRXolu5sySz RJeA== 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=RthFtGn5gRPdt6lkYQroMQnxxHu9uAdSyZ2Cnmvlgrc=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=yE5zmFPzJKrTQGAn3AtS5Zw3vcFjntsb6x8TD4/CC7WpkHN/4u62CdLv4hMfOg2beE ylx+jvHUzjz4vkKz4mXKsWG8+gPlGdKMQRIzDPXFc2CJ4ygthB/QhDUHnzyZmOTal2tB BJeH0oyG53v4vtQFMww0vPK2vrIEBUKnXURrerUPrk6Ah64C5IExrOUGvKQYuyj5/xOQ 9JssCWF9NpMrTq43dzr4nhdeXQ6KZMdokIj+TErQmLqR4VejFS1GNixreAWU4pi7upLt nlj46M8lEQcUYD7qNIhLJ/RrZZRRz6tlLN2VCzhUrkd8rBr0JqJh+Z4goT5aP1nOlvik lqDQ==; 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=O7EpBDv2; 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-a626c8019dcsi173103966b.121.2024.05.25.03.40.08; Sat, 25 May 2024 03:40:09 -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=O7EpBDv2; 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 9FB7868D5AB; Sat, 25 May 2024 13:32:23 +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.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52EF768D5B0 for ; Sat, 25 May 2024 13:32: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=1716633138; x=1748169138; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SLTz+3Z0D0nonMsJKiN+ZdbfrJMZzteiCoNowvosqNs=; b=O7EpBDv2uUkYgIRDtmbD15/eJh5zEnzsF1eeRiD7EdqIFOTnXnTRFRQn ly31YkjKuZMvxwA1WHiv2yFgQiMs442xeL1gBdCwa3+WHwIszhj9kI6Nr glG/UX6Tp8H33wlYfJSJCIJDGN/kjyaWXea/8FbaqsOUCJwtCQD9v0nSQ xlVKEOsWUq5QvkPqwCgb/2gA6UbOceNXIspYgA9SBFkdTqQfacrPnBOrs tUg0uRxM1oAUxpn0J3HEyCD4eD/y8YFFwb3eMhKhIUrS1Ssk1uJ3AsEgw tbPEiHbxlCI/Umjf0YmsblR6nNJE7s2DE/SoNgtplrgji2gJEDXl3KAKW g==; X-CSE-ConnectionGUID: 6dt09MnvRXacLQFA3ujAZQ== X-CSE-MsgGUID: PLA+/QIbRTKLepLhf1y31A== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="38391106" X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="38391106" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2024 03:32:09 -0700 X-CSE-ConnectionGUID: 0YTKov4jTbKmJ1Fyo+gJiA== X-CSE-MsgGUID: QcyZ4f0FQ5Oom/tGqPMmyg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="39252427" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa004.jf.intel.com with ESMTP; 25 May 2024 03:32:09 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 18:30:18 +0800 Message-ID: <20240525103022.1390-11-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240525103022.1390-1-tong1.wu@intel.com> References: <20240525103022.1390-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 11/14] 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: StK9Zr7yiNjx 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 31046bd73e..92f69bb78c 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -745,6 +745,17 @@ fail: return err; } +int ff_hw_base_encode_free(FFHWBaseEncodePicture *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) { FFHWBaseEncodeContext *ctx = avctx->priv_data; diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index f5414e2c28..15ef3d7ac6 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -224,6 +224,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(FFHWBaseEncodePicture *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 d96f146b28..b35a23e852 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(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);