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 DF10242952 for ; Tue, 7 Jun 2022 11:40:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B95F768B4F9; Tue, 7 Jun 2022 14:40:07 +0300 (EEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4E6768B4E6 for ; Tue, 7 Jun 2022 14:40:00 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id t22-20020a0568301e3600b0060b333f7a1eso12745711otr.0 for ; Tue, 07 Jun 2022 04:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=fbORMAfUORePgECCaMuT+zchrLrXM0w9zBLdNLE0CMA=; b=EC1IFToMYq6fmCB0EDOZnUatnPO76YqpjcZipMZJa5khGtDfcEo3fD5SAcRHMpr9xx 2MgqOibKgBSIWp/fdQcsKXvy4Kmn9cN86xWeGnBqIN7P2CpDw2IoHY5ibGh2Rc/oeX+8 Nc5G0lPh0WIQBs/esMVFfuMjtwfr24A5O7zoeA6g9GfI/Lx6iE+B0rZvDBrFzwez0kmn zGOtPAwmwwITYk05Wbv3c2+DUKW7UYbp3pkBFkSXpz8nefnMusza9/RORZLEEdqX1edO fXBGmnF43y9YSq80GsTzJ8868pwCTHYpOyWQjdABzgKAX7yNDb13g5mMk08jqgTiyl3C lDqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=fbORMAfUORePgECCaMuT+zchrLrXM0w9zBLdNLE0CMA=; b=igbUvmdRyX5C5S97PDkI78vUBnyc8SxzZCxU1xX57mFMEiYubXm0CzdyoHPUCQwgF6 evh5SqglXXl+GGSLiIM4eSJg+fVRumtpObnY5EWsECPct3kLqZFnwWjyA+4xTNvLGn89 ED5lAXMxX/2JW70hztQBaewbmESe4DRypWWEYE8ORS10Ubo6JLYAfXDK3Y/ZvdV3D2/n oePK9eBy+SfAYBxZTIi+BnmiS2OpRQjz+AaYAfCxSj3QKYMOSK476cdhMrWF89mHPDZm qTLiZlqHU45Yf02awdFm8TKVSRTXlcBQQBlfZvAkNdlSpvu6ceKuYznf+YEn6FXMJySV 8YvQ== X-Gm-Message-State: AOAM53119eoosFa06zB16cdGD0kleBNRBfvJ2Kk8gCG3vA85lJCjmpAU 3qFLkOamTzsjd9z/JoCmrk0+TNa6DRM= X-Google-Smtp-Source: ABdhPJxcC4GhmbRxl32THyvgu+lX66wQq12iIdyWof6dLtpta3tsfevw5nUsjE5UKpnaEAqAPm0VWA== X-Received: by 2002:a9d:58cb:0:b0:60a:f901:322c with SMTP id s11-20020a9d58cb000000b0060af901322cmr12197402oth.368.1654601997817; Tue, 07 Jun 2022 04:39:57 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id lq10-20020a0568708dca00b000e90544b79fsm7876355oab.41.2022.06.07.04.39.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jun 2022 04:39:57 -0700 (PDT) Message-ID: <2bc03374-18b1-122a-b7c2-702a83b54d1f@gmail.com> Date: Tue, 7 Jun 2022 08:39:55 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220605174458.1942-1-jamrial@gmail.com> <165459729289.13099.12969587257195843072@lain> From: James Almer In-Reply-To: <165459729289.13099.12969587257195843072@lain> 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 6/7/2022 7:21 AM, Anton Khirnov wrote: > 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. Right, removed. > 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? Yes, but i was copying how av_frame_ref() handled this scenario, albeit with a bit more of code. Will change, but it will need to be re-added if someone at some point decides to implement replace for side data. > >> + 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. Should it really accept NULL as src, or you meant a recently allocated/unreff'd frame as src (So src->data[0] == NULL)? _______________________________________________ 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".