From patchwork Tue Jun 7 12:02:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 36087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6829575pzj; Tue, 7 Jun 2022 05:03:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylNT5O+iyGczcFAMYzmJkFMnXYCfwd/7+phkQGAbWRDRvhH3wZzgJLvTnAy+lF0MzwpdFB X-Received: by 2002:a05:6402:1453:b0:431:503f:a2ce with SMTP id d19-20020a056402145300b00431503fa2cemr14186431edx.234.1654603403165; Tue, 07 Jun 2022 05:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654603403; cv=none; d=google.com; s=arc-20160816; b=v9qYXSkLlmg+0Q9lJ+KO9j0lqY9/E7eC+KcMqJpP4DENGWHoF2f66iTn4WJ+pQb47R p1lgb2x0mCyiGPIWAiTYYUivPgC55i6Jyn/Ru2G+vz+HUFWvbvHDDL039VtuUifMwZuM pd27Dv2jLadctwPFnAGVjpNULPeXcZtAZi3AcVX03jdu8N2nqI/cUZTOBEddqmF9JNJ0 S6p1TkSzlvMa9CinULyiZryHd+n1SXEQoj5ekKqmRkPX7HKaJwjQ2D/sqh5Zti77w8Dd fWz5ma8qL6iddiFgm4+Ta6vO9MZ6H3pc1HE8xlVCagz42fgNBWK0xZHCRkFH9tchJWJy ujVg== 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=Kb5V3iBnLKiRvsrHooghha2MoxnE6xs4XzlEUVQd0s4=; b=af2ogy5bjbxjsKJB+yTHYGjVn31h4CE1tuUOpG7/3EaOUdZWy2QxymY/bkKjXpg3Yo dadsEORkc+lo4Z3cebhoOjyZM0t0qTawOaRmqTSIcASDrsXbyn9jlGVLBXaWakP1jLDM yRBopGDEuYDfIE9EfsWB4ccC0xWQ56KCTxl7A6QQUMN1czd8U/WJKfJXn843ZzcVOaYz wXO95mnmdhI6At2+E1fQSLxVWnqH7Is5lekl8317GX2eRoz1WhPWYqBicwV7FuC7bOqq RSzbxy4Ybf88NnN0589ibA0oSL4Qv4qk+Ef7gSCJnn7LXyXbbVhFO/8E2dzCS35VleU4 n+XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IiSF5QEw; 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 a12-20020a50858c000000b0042aef7496f4si17615195edh.258.2022.06.07.05.03.21; Tue, 07 Jun 2022 05:03:23 -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=IiSF5QEw; 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 C53CC68B666; Tue, 7 Jun 2022 15:03:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 DAC7A68B63F for ; Tue, 7 Jun 2022 15:03:11 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id g17-20020a9d6491000000b0060c0f0101ffso485715otl.7 for ; Tue, 07 Jun 2022 05:03:11 -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=hMgWj4uDtowW9SmoAOr05k6FBlZTLwEO0gdZiRXjyIo=; b=IiSF5QEwgWOflUA2Q2nMg+cw518I/YYMO0R2Yu4QLXUQ4ggL2N2gTnicJJ01GXChfD U/vcvx5Vy4ZQ7vCZB6d+yZiW4OlA9V3qhUmZ06X8sJa3VuJ5tRGvD2fo0tuPM+OTzUEJ 3p8TBx1iC7cZPlUUgZEsy1dyZdnsPvc68+9pBI+gDBcjvuLEUMqXDhrkSxMFuXvIx5Lp VGGueD18N5Lfzq/VfjfLIDwb6ci1qzh8Lr8cOmYmn52HRkAqf+a7+VzAtoHvu2tMnUfw UwUwZVAGSyln2jLy+A++VVwVTqZ0Whfl1WernITd0VxbM9zs3DamnMzf+LgqLK8IDUjL LBEw== 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=hMgWj4uDtowW9SmoAOr05k6FBlZTLwEO0gdZiRXjyIo=; b=stf5othuSsmzfg9MLxZr6oO4WJMEVIJp08QvTam/On+QAjAxhPesSIqQvaUR/Pt4I7 aMVB+FluzQGehHhBOIUnYXDCKVg3LJgVaBPrtBV2CuXq2ScLpSfgTH6+LgPB+8mvMABz 9T6G7j/9SX8r1xtMB0kJK7gljt6z3kalZEMm1E56nE8fgzKi1QhBrDy3Vw0m0y1iytJa 9x0+MPgCAYtBl8DiJpn8Kvzv07zpPInSdHVfVY4yuwUncVUA4nVDbhSWH5D5lDp9Prxd ALFi6sgnXC3OsGFuvukS6cpLm1Pq1aBM2dN/FaK4eHE1ntu2DXyUtN2UKAJ/QxRqB9XK m4Ig== X-Gm-Message-State: AOAM532D5Ys1IUZdTVnxYHk+zQSTqfx1Evq5MIXSagURzp4ve2JR+bD7 QIOfGIAumTUXtVSdkKk50HJ9ONf5ODo= X-Received: by 2002:a05:6830:20c8:b0:60b:bf0:8ed6 with SMTP id z8-20020a05683020c800b0060b0bf08ed6mr11544546otq.147.1654603390146; Tue, 07 Jun 2022 05:03:10 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id bg10-20020a056820080a00b0040e6e53f6bfsm9772840oob.15.2022.06.07.05.03.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 05:03:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 09:02:47 -0300 Message-Id: <20220607120247.1666-1-jamrial@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165460245286.5088.10167011834893162223@lain.khirnov.net> References: <165460245286.5088.10167011834893162223@lain.khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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: 0X2SfkXuU1L3 Signed-off-by: James Almer --- libavutil/frame.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 13 +++++ 2 files changed, 145 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 4c16488c66..293bf6a437 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -461,6 +461,138 @@ fail: return ret; } +int av_frame_replace(AVFrame *dst, const AVFrame *src) +{ + int ret = 0; + + if (dst == src) + return AVERROR(EINVAL); + + if (!src->buf[0]) { + av_frame_unref(dst); + + /* duplicate the frame data if it's not refcounted */ + if ( src->data[0] || src->data[1] + || src->data[2] || src->data[3]) + return av_frame_ref(dst, src); + return 0; + } + + 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; + + /* 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; + } + + if (ch > SIZE_MAX / sizeof(*dst->extended_data)) + goto fail; + + dst->extended_data = av_memdup(src->extended_data, sizeof(*dst->extended_data) * ch); + if (!dst->extended_data) { + ret = AVERROR(ENOMEM); + goto fail; + } + } 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. *