From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 118034ABEB for ; Tue, 14 May 2024 21:07:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D1F068D75A; Wed, 15 May 2024 00:07:37 +0300 (EEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEEED68CB57 for ; Wed, 15 May 2024 00:07:30 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-34da35cd01cso5659099f8f.2 for ; Tue, 14 May 2024 14:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1715720850; x=1716325650; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=m63X0qnzvksLlX1Vq9UhY6a6s9khRyKXcHMIQyv0zLU=; b=Dy+TdaDCdgLvtidyKjOwnJueiLAaY5eTk6R7JHOtJItqV29aRiZg7rnSlgVnjq2f4e hzzDrRPpP8gyrM9FYxAwC2ew8cjfdpdbP70LKGeuZUS4IqcVUqA55MIhfYyzu0Aq5UIG i2HIkPa3X9c3f/ugkbKwoOTuUubpp0y6AN/9mNbzUfR3gNB9N+c6LbcIqWz2/xto2CLl chL+2+r+BzEHo/HLxfTavUP/Ax0/Xyvlm0QzClGcL414UmxbFODWiYD3sNSWFDFtUYg4 mYs9oKMN6CVNaTNEert2nA8MC3+ArGd6m6usKCD5bd+VlwNm5HqMcgfXM1PjazboZ4zj GkrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715720850; x=1716325650; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=m63X0qnzvksLlX1Vq9UhY6a6s9khRyKXcHMIQyv0zLU=; b=C/45kOhzS8pZeXpH6dnW/sQGElpShf4vwRQ05AoGnEvPVhsQwCxP7zKLJU4FSedYk/ GzstY9zjNHYVeUyIpawHhCCka8AAgcKJsWbxW+UW2eSRown4zG7d9fptlGJPyZTbi9nB HRayn4yra5jr2OlCBX/LM5661OIaA3OwG9WuWuIfY5FcRw8JR6wblggRwT62+7bttsf2 MPhy/5FE4i1OAzy3+g7BZNIcWbbt5IEIQsCW2b9cA6SZDsIDE43AaLY4SxRaB7CrQzrK JzEfec7M8pXvY7AFKE0hKFpDKLdbXY9yckNGZg7xBimSSpEBVauXBEM+PjnaoWV0kXH7 dXgQ== X-Gm-Message-State: AOJu0YzlZxYE0Y6uYTPhog4RxMIfQ9nn0YFZbzg0dxwN+yZF0V2Sxu8N 4AyQKIECufOdoOsuvZvJA8wlMJqQnR4aeAqaom9uCy7nTsp/wwGQdYlvXwFlA+Xt9VMa6Xnr6i6 E X-Google-Smtp-Source: AGHT+IHzBLIlPvGey70sdEa+UFGANR9Ey/xVz05SNBAIHzu9WxslJ7Ew9V8DPzIZfON2ixIENlPx/g== X-Received: by 2002:a5d:5448:0:b0:34f:c7c8:5a12 with SMTP id ffacd0b85a97d-3504a73e7eemr11783952f8f.40.1715720850256; Tue, 14 May 2024 14:07:30 -0700 (PDT) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4201da9895csm49349895e9.44.2024.05.14.14.07.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 May 2024 14:07:30 -0700 (PDT) Message-ID: Date: Tue, 14 May 2024 22:07:58 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240418085910.547-1-tong1.wu@intel.com> <20240418085910.547-12-tong1.wu@intel.com> From: Mark Thompson In-Reply-To: <20240418085910.547-12-tong1.wu@intel.com> Subject: Re: [FFmpeg-devel] [PATCH v8 12/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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 18/04/2024 09:59, tong1.wu-at-intel.com@ffmpeg.org wrote: > 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(-) "... free funtion to ..." While I do approve of fun, maybe this should be a function. > diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c > index af85bb99aa..812668f3f2 100644 > --- a/libavcodec/hw_base_encode.c > +++ b/libavcodec/hw_base_encode.c > @@ -751,6 +751,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 7686cf9501..d566980efc 100644 > --- a/libavcodec/hw_base_encode.h > +++ b/libavcodec/hw_base_encode.h > @@ -222,6 +222,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 ee4cf42baf..08792c07c5 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); > Thanks, - Mark _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".