From patchwork Sun Jun 5 17:44:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 36077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5803770pzj; Sun, 5 Jun 2022 10:46:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz33EQg9eQkCInHhZuswsio4Ewxip+Fo5Jx7EhCAc8BDEVMQDjjIMfUkPcNNSG2J5b0EZal X-Received: by 2002:a05:6402:249c:b0:431:3883:967a with SMTP id q28-20020a056402249c00b004313883967amr7195715eda.264.1654451165966; Sun, 05 Jun 2022 10:46:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654451165; cv=none; d=google.com; s=arc-20160816; b=ptTDkKimkMamr2Rpp+nWpia8Qn/3NiK9ywU7UqxyyRpw6dViA2il2Fkoy2ZwwmwZWY RFK8DNvhkIZmuoMMX4IZbjJ+2oGKwrjRPJz43BQACmiDo98YQbCGRkHLS5jnP2I2XcgJ ztZ3G/xjTttHqDv+ESBqLgtRFTwJp4yRSPqgD5XEzNHs/F4ev9lpvHZc6pq8IVEi2pdR SRPxSnqFnhf5eYgjWLA9CH8eT9f8HmEbWde3N/X/rs83dnn5ryi3tVwR80byXx5zbSXT JO4SAEfrX3JAR9B5Ff0RVC/b5kzbGRv5++1jkNUMOAXd0uvDw2krDL+oGsRTKnMzL8cv 0f2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=fWlbSYGPQRPdwcEoxR8d1/8XbqqJg4paV+wLdxIbFEM=; b=CP+OniwL3AehBystjPNFo4HL8/zh38vtWdgPGx7zCtC44k0dyK6GZRxFWwouZzRvt0 VRpI0H1BtpGQVndFH3lTV/EH+We8+hK+em5vA6ftH3tKowfAyAhADgcTWhzBocdhbScF fEdwEbeMW30VA1Wd/CSU2VDxOva/N1j/whcI/kVgeyZVjfgbZpUt3+k69BGpfFRjzef9 eV2BlmMtit7FvFFIW5Mft+eVoMEOh+7EzENSenTkyBwBDTHNFydvrNr/QmTKQ2+xN3BN QOE8kxcLcgz36Z3URgHw9t2c08iGbaZQCZJVkxweFxJihuBAdIgb2B7/OswUuycbc9Yr L3Dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Mpf4vvDA; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf2-20020a1709077f0200b006fe8d7af992si10844009ejc.894.2022.06.05.10.46.04; Sun, 05 Jun 2022 10:46:05 -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=@gmail.com header.s=20210112 header.b=Mpf4vvDA; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AC5E68B571; Sun, 5 Jun 2022 20:46:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F17DF68B425 for ; Sun, 5 Jun 2022 20:45:52 +0300 (EEST) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-edeb6c3642so16731106fac.3 for ; Sun, 05 Jun 2022 10:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=HqXzBCrfPym2I5xw65m2Z8nXVs2h8CON/rXjn9HIZNw=; b=Mpf4vvDAAEM3g83EwL2z3eKse3NlwkQi0OW+aiAY4Aq3sFqnf4Hpqhd7rA35k0KIZV DnOPrx8JZlaTxcgAGJcstf1RNi4BtLuUuwPPSdfYgnDY5/P0qucLdWgHfurp1SsGu47K biUdWYMS8pL1lbxexBelnSqobz5IRTROKAno1vcl9OTo8Y3I4nU4aMcUJd8OZ6I8JLhu 9rzOb5nstDymgReX/LINyHiVErQFIsS88sjff4K7VhtLlJ/1Rd8xyUWwfonJB4300UGJ w1AmNucltjozvXCtwQhdkztntomb+dseUdOTctSLsRk2FJOkkf8dYQk9hL2IuG1egl6H APZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HqXzBCrfPym2I5xw65m2Z8nXVs2h8CON/rXjn9HIZNw=; b=jzJemVns/zsJP0Mctx4YEguDy1cabx20L+ZfIuYLwSsHKcKwaKTlM+QkxlTU+ZkN+4 aVs1T9Vf8TKkFOHhVJcdj85fmU7PeQ9/gvSM5/0JR0O62mnqF4svjBflP6J3c8UImDR9 VVEu4xo+TCcdQyCVkgFJ8yerZkLNB+wzYu7E7KnfvPcV+tJrCi4D7MLyyfWr0HzPTFG7 Gk0LFJnGTXadSdGveZL8/hTnzyrIJkq5bZIMdNOYk7qbGuCBIUgOR0fDyQJwXehD3k5U tMMCl6Fwb9WuHwWcUfNHMDVcr1SqCSgFEDn7Sn3D4jpe751V+fJh36U1ukkCW9eiX8m6 S76g== X-Gm-Message-State: AOAM530k8GMk/5m8xUiNGi2csb4PK+UY4scFYSnHWcqwbKmhOMGcihw5 5h6B/1i8Xto2+5sdpnEFcZ2wOCxFVvQ= X-Received: by 2002:a05:6871:7a5:b0:fb:4293:64e7 with SMTP id o37-20020a05687107a500b000fb429364e7mr2395382oap.20.1654451150472; Sun, 05 Jun 2022 10:45:50 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id lq10-20020a0568708dca00b000e90544b79fsm5743116oab.41.2022.06.05.10.45.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jun 2022 10:45:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:44:58 -0300 Message-Id: <20220605174458.1942-1-jamrial@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EAjaYJMmlzYI Signed-off-by: James Almer --- Now disallowing src == dst. libavutil/frame.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 13 ++++ 2 files changed, 160 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 4c16488c66..86f9dcb59a 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -461,6 +461,153 @@ fail: return ret; } +int av_frame_replace(AVFrame *dst, const AVFrame *src) +{ + int ret = 0; + + if (dst == src) + return AVERROR(EINVAL); + + dst->format = src->format; + dst->width = src->width; + dst->height = src->height; + dst->nb_samples = src->nb_samples; +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS + dst->channels = src->channels; + dst->channel_layout = src->channel_layout; + if (!av_channel_layout_check(&src->ch_layout)) { + av_channel_layout_uninit(&dst->ch_layout); + if (src->channel_layout) + av_channel_layout_from_mask(&dst->ch_layout, src->channel_layout); + else { + dst->ch_layout.nb_channels = src->channels; + dst->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + } + } else { +#endif + ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout); + if (ret < 0) + goto fail; +#if FF_API_OLD_CHANNEL_LAYOUT + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + wipe_side_data(dst); + av_dict_free(&dst->metadata); + ret = frame_copy_props(dst, src, 0); + if (ret < 0) + goto fail; + + /* 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; + + return 0; + } + + /* replace the buffers */ + for (int i = 0; i < FF_ARRAY_ELEMS(src->buf); i++) { + ret = av_buffer_replace(&dst->buf[i], src->buf[i]); + if (ret < 0) + goto fail; + } + + if (src->extended_buf) { + if (dst->nb_extended_buf != src->nb_extended_buf) { + int nb_extended_buf = FFMIN(dst->nb_extended_buf, src->nb_extended_buf); + void *tmp; + + for (int i = nb_extended_buf; i < dst->nb_extended_buf; i++) + av_buffer_unref(&dst->extended_buf[i]); + + tmp = av_realloc_array(dst->extended_buf, sizeof(*dst->extended_buf), + src->nb_extended_buf); + if (!tmp) { + ret = AVERROR(ENOMEM); + goto fail; + } + dst->extended_buf = tmp; + dst->nb_extended_buf = src->nb_extended_buf; + + memset(&dst->extended_buf[nb_extended_buf], 0, + (src->nb_extended_buf - nb_extended_buf) * sizeof(*dst->extended_buf)); + } + + for (int i = 0; i < src->nb_extended_buf; i++) { + ret = av_buffer_replace(&dst->extended_buf[i], src->extended_buf[i]); + if (ret < 0) + goto fail; + } + } else if (dst->extended_buf) { + for (int i = 0; i < dst->nb_extended_buf; i++) + av_buffer_unref(&dst->extended_buf[i]); + av_freep(&dst->extended_buf); + } + + ret = av_buffer_replace(&dst->hw_frames_ctx, src->hw_frames_ctx); + if (ret < 0) + goto fail; + + if (dst->extended_data != dst->data) + av_freep(&dst->extended_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); + } 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); + /** * Create a new frame that references the same data as src. *