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 78966428BA for ; Sun, 9 Jan 2022 09:25:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 34EEC68A68F; Sun, 9 Jan 2022 11:25:01 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 042E468A199 for ; Sun, 9 Jan 2022 11:24:53 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1A4C624017C; Sun, 9 Jan 2022 10:24:53 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id ZEZskXNm2McW; Sun, 9 Jan 2022 10:24:51 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 8ECCB240179; Sun, 9 Jan 2022 10:24:51 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id 8F5D116008E; Sun, 9 Jan 2022 10:24:51 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220103003318.442892-1-aicommander@gmail.com> References: <20220103003318.442892-1-aicommander@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches , Cameron Gutman Date: Sun, 09 Jan 2022 10:24:51 +0100 Message-ID: <164172029148.2375.17275383230465998544@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] lavu/videotoolbox: add support for memory mapping frames 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: Cameron Gutman 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: Quoting Cameron Gutman (2022-01-03 01:33:19) > Signed-off-by: Cameron Gutman > --- > libavutil/hwcontext_videotoolbox.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c > index 0a8dbe9f33..026127d412 100644 > --- a/libavutil/hwcontext_videotoolbox.c > +++ b/libavutil/hwcontext_videotoolbox.c > @@ -711,6 +711,30 @@ fail: > return err; > } > > +static int vt_map_from(AVHWFramesContext *hwfc, AVFrame *dst, > + const AVFrame *src, int flags) > +{ > + int err; > + > + if (dst->format == AV_PIX_FMT_NONE) > + dst->format = hwfc->sw_format; > + else if (dst->format != hwfc->sw_format) > + return AVERROR(ENOSYS); > + > + err = vt_map_frame(hwfc, dst, src, flags); > + if (err) > + return err; > + > + dst->width = src->width; > + dst->height = src->height; > + > + err = av_frame_copy_props(dst, src); > + if (err) > + return err; Don't you need to unmap the frame in this error path? -- Anton Khirnov _______________________________________________ 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".