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 6441342922 for ; Tue, 7 Jun 2022 10:21:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9639668B623; Tue, 7 Jun 2022 13:21:40 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DF5168B536 for ; Tue, 7 Jun 2022 13:21:34 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E0BA9240175 for ; Tue, 7 Jun 2022 12:21:33 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 0A1oMIoujd68 for ; Tue, 7 Jun 2022 12:21:32 +0200 (CEST) Received: from lain.khirnov.net (lain.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.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id BF8742400F5 for ; Tue, 7 Jun 2022 12:21:32 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id E9C8C1601B2; Tue, 7 Jun 2022 12:21:32 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20220605174458.1942-1-jamrial@gmail.com> References: =?utf-8?q?=3CDB6PR0101MB221483C655AE7B8A4C78BC6E8FA39=40DB6PR010?= =?utf-8?q?1MB2214=2Eeurprd01=2Eprod=2Eexchangelabs=2Ecom=3E?= <20220605174458.1942-1-jamrial@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches Date: Tue, 07 Jun 2022 12:21:32 +0200 Message-ID: <165459729289.13099.12969587257195843072@lain> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2] avutil/frame: add av_frame_replace 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: Quoting James Almer (2022-06-05 19:44:58) > + > + /* duplicate the frame data if it's not refcounted */ > + if (!src->buf[0]) { > + for (int i = 0; i < FF_ARRAY_ELEMS(dst->buf); i++) > + av_buffer_unref(&dst->buf[i]); > + for (int i = 0; i < dst->nb_extended_buf; i++) > + av_buffer_unref(&dst->extended_buf[i]); > + av_freep(&dst->extended_buf); > + > + memset(dst->data, 0, sizeof(dst->data)); > + if (dst->extended_data != dst->data) > + av_freep(&dst->extended_data); > + > + ret = av_frame_get_buffer(dst, 0); > + if (ret < 0) > + goto fail; > + > + ret = av_frame_copy(dst, src); > + if (ret < 0) > + goto fail; > + > + ret = av_buffer_replace(&dst->hw_frames_ctx, src->hw_frames_ctx); > + if (ret < 0) > + goto fail; This looks suspicious, since we just allocated normal buffers for dst. Also, can't t this whole block be replaced by just if (!src->buf[0]) { av_frame_unref(dst); return av_frame_ref(dst, src); } at the beginning of this function? > + if (src->extended_data != src->data) { > + int ch = src->ch_layout.nb_channels; > + > +#if FF_API_OLD_CHANNEL_LAYOUT > +FF_DISABLE_DEPRECATION_WARNINGS > + if (!ch) { > + ch = src->channels; > + CHECK_CHANNELS_CONSISTENCY(src); > + } > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > + if (!ch) { > + ret = AVERROR(EINVAL); > + goto fail; > + } > + > + dst->extended_data = av_malloc_array(sizeof(*dst->extended_data), ch); > + if (!dst->extended_data) { > + ret = AVERROR(ENOMEM); > + goto fail; > + } > + memcpy(dst->extended_data, src->extended_data, sizeof(*src->extended_data) * ch); nit: av_memdup()? > + } else > + dst->extended_data = dst->data; > + > + memcpy(dst->data, src->data, sizeof(src->data)); > + memcpy(dst->linesize, src->linesize, sizeof(src->linesize)); > + > + return 0; > + > +fail: > + av_frame_unref(dst); > + return ret; > +} > + > AVFrame *av_frame_clone(const AVFrame *src) > { > AVFrame *ret = av_frame_alloc(); > diff --git a/libavutil/frame.h b/libavutil/frame.h > index 33fac2054c..e5c10e2b66 100644 > --- a/libavutil/frame.h > +++ b/libavutil/frame.h > @@ -752,6 +752,19 @@ void av_frame_free(AVFrame **frame); > */ > int av_frame_ref(AVFrame *dst, const AVFrame *src); > > +/** > + * Ensure the destination frame refers to the same data described by the source > + * frame by creating a new reference for each AVBufferRef from src if they > + * differ from those in dst, or if src is not reference counted, by allocating > + * new buffers and copying data. > + * > + * Frame properties on dst will be replaced by those from src. > + * > + * @return 0 on success, a negative AVERROR on error. On error, dst is > + * unreferenced. > + */ > +int av_frame_replace(AVFrame *dst, const AVFrame *src); An important property of av_buffer_replace() is that it's equivalent to av_buffer_unref(dst) when src is NULL. It would probably be desirable for av_frame_replace() to work the same way - currently it will try to call av_frame_get_buffer() with invalid parameters and fail. -- 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".