From patchwork Tue May 28 15:48:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49316 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp54695vqu; Tue, 28 May 2024 08:51:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUBAO4wb3R6XuwJg8s2ctZTgei0s2oYoKANG+F3zxaBM8JpaYyT7MumdBZMLLyBhPyobOogM586LLitjwthATjeIrfaUzaq2PzEIg== X-Google-Smtp-Source: AGHT+IE7GxwPUZPyLbpDUKQjFrZEvN+J+HtS3EyFLcF9aUK3grkIF+ivv5I3ioJtr5ecelzq4G35 X-Received: by 2002:a19:6407:0:b0:51e:fc99:d6ef with SMTP id 2adb3069b0e04-529649c5d8cmr7438274e87.18.1716911502521; Tue, 28 May 2024 08:51:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716911502; cv=none; d=google.com; s=arc-20160816; b=Fjo6WLGDED9GwdWXf/EmYXLszvQgIiOeyuQvzuIyr521MMLjkd4USHR28mNziv2zpp wtQxNrNPbCSBw3Ww/cZOL3qJesEoGzRGCzeQ/zOvRXe7Hh3w+T0d1LM+apZ1VJlvXDgV f5fh8D++CxHaZlvKijhbcant6unGF0WUacb5bPMRPuMKqHY3kbnAvafLcw71nNXhPZrp ETwSKIpm0r215nxbON1JX6heel6KHstnxnTSvgV+aPT/ZXZMzCn6RGdwSemetYyJl17O likOiE8+B6T4wStUDZ+bPc74l9cbsqweM0Tl4pIWYqjUBzaZSB4ao9oC0OcwUbFU+sWc HnvQ== 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=W3efWvZHaltxgDDWRUqQCrBrwy5W73MCX8d+7N1hZSvZj0bSVtW3Y1x/JP49VdDaWC k4Wms/YOF6qFsc/GtL8slh8Zx6fBzNEIZ/QbigyEPgcI8hrX2YrQc6oryU6oJeF4BKCR atzCTQ/vT5UPX9sm8j6NGlibYI3n8Vb0PoHS5ykDxF1NJ0WtoxgnEeyK9aTjxDW/6irs 9uotrGLt7It8jChqa89jZQXsOLoEcnNWiqMM4wDd4ctvHemh8cWZ2YGUxqKzHqDR0CPk JD6JKoClfpgd/dbamf17vvgIk4lwbb2XR3+ooA5hfYHpEuXmoUjtqstq8AqTf9LsQuBU 5qAg==; 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=mnyAixmR; 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-a626cc68d08si518001966b.632.2024.05.28.08.51.42; Tue, 28 May 2024 08:51:42 -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=mnyAixmR; 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 66EB368D59F; Tue, 28 May 2024 18:50:11 +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.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCA656801F2 for ; Tue, 28 May 2024 18:50:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716911406; x=1748447406; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SLTz+3Z0D0nonMsJKiN+ZdbfrJMZzteiCoNowvosqNs=; b=mnyAixmRU0HttTGY6KdSIIZn35KDAVCs1ZTw64eGZhobILbx25T9TDlo PjvCRHyMs6TTOP6TyO2iBHmupmVltTynX2qNuR2B+Dwlbjbek81/GCfRx sX90QQMmDFSw9NidTnjQZAGVA8fYabuItHxBU7I400E6dUz93yXM3ctLl R6qIbQTZQGwNrIpJKrjSAtR7omi24DelntiLG2p/8px/LZRcZ76RDdzax 9WRvn//yrNM7bFK+NTWsdAKL7TlyqjZyus29JGbf+d7IGetfXDfSHHyBq SvmgjE5PA5of3IpE/aFr3MTxTXlJmCxyP7w9uAWYBBRYuv9nxl3lJ5+Xo Q==; X-CSE-ConnectionGUID: 7iYg0q+pQLaez8BpFLEPEQ== X-CSE-MsgGUID: klBaczA2RGy6HnHJUdbu9A== X-IronPort-AV: E=McAfee;i="6600,9927,11085"; a="23821926" X-IronPort-AV: E=Sophos;i="6.08,195,1712646000"; d="scan'208";a="23821926" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2024 08:50:00 -0700 X-CSE-ConnectionGUID: cuQk4huFQga93voZpywiEg== X-CSE-MsgGUID: HX/C3gESQYut/gRnGKifig== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,195,1712646000"; d="scan'208";a="35731115" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa007.jf.intel.com with ESMTP; 28 May 2024 08:50:00 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 23:48:02 +0800 Message-ID: <20240528154807.1151-11-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240528154807.1151-1-tong1.wu@intel.com> References: <20240528154807.1151-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 11/15] 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: mRYjQ9BG6dm7 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);