From patchwork Wed Aug 3 16:02:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37125 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp531318pzb; Wed, 3 Aug 2022 09:04:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR61UwbjD6C/Bhm/tanCyo/LD7+xnErLx6jPUEZApJfLwRIisi3cP2Dk0R44eJlquyJP0re2 X-Received: by 2002:a17:906:8a4e:b0:730:9fcd:d988 with SMTP id gx14-20020a1709068a4e00b007309fcdd988mr6808106ejc.636.1659542644905; Wed, 03 Aug 2022 09:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659542644; cv=none; d=google.com; s=arc-20160816; b=yxEB4tS56zq+MxApfqA/smJ6HbGALmfpqTNpxp6vPrpTN39SPjPsAoV9PDkS3KtKFI iUpMOw1G+VOHU9pEZY+6ixHKd1shUDk0U7Cbtow/VkHzjqkXe/sIGAaKHwJzW081uzLn 4obe0IEpItSrKwvdMaKlx/g2+seOiOS6M83gwYU0DqblSLs541IDVuVp2MJ9g5RLrHKM xKZcC3xFZhthXpNlKprT1bEUB/vB+MVtzBLGPbWsI/7O7U+oqTEakf/mQxxKKVf8wZa3 xvtm3nfhuVA5XDTVDuQZSBgyp7RG6ReobZYLTG/Nbo+5QD0r5RpRc5j0YUcOTPi6qwcf strA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=P17mEzw/ImlZWkCHgCPLLkIEFFbik/ntLSZ/BsJ6A6w=; b=i2HowoI/B85pP7nZpzdUJntQqqltRj0Hbb/evcX0+y7PHRzsSkXBzM8aaZedLr78v4 0EDjfe5nD67N9wbwk/yLSycF5AMj0IPXTGulSC7dbxaDWeutizqfkZm3qdZahWKJMvlB 4bfhJFyo/nlbYR38MwTAet8Q2ZtcXq1XJp3fyCylpYOl5xx/lcV7JtXG0cxymI4IUQpb 4JgqpUzM8Z2fDYbunXvmHWdpVEkOeC7yUK+BHX2ypSG3NPXqO4jIvKa1bOCjl2cQKlQ1 Y8aS4aig2qGqV1mwpDMjWAXCd1uNQsHqwxLJSnXhq3+GrKAOFzq53k8EnMp3Sf/UpMhg iJUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=h8LuucmP; 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 s7-20020aa7d787000000b0043be773a90dsi12390773edq.45.2022.08.03.09.04.04; Wed, 03 Aug 2022 09:04:04 -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=h8LuucmP; 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 48AFE68B7A0; Wed, 3 Aug 2022 19:03:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B94D68B935 for ; Wed, 3 Aug 2022 19:03:42 +0300 (EEST) Received: by mail-qv1-f45.google.com with SMTP id q3so13231015qvp.5 for ; Wed, 03 Aug 2022 09:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=dNz9U3y7uWA31Ap2gtj1mPR6wTDw0t+YvvtBe+681EY=; b=h8LuucmPmCoejB8D2bguFwi6ZGK+9TsZmt9Rlbb4SczfjuGfJEMsUhpfCPcy9wUuiv fvqXPqe2LMSGLka83HQaQnLR2oU+mNqCsxsIEQ6d9F3qnSLqitw+xA4lK2j64IZOLV86 XzY+6SXi83hgnIZSXSXVQ0DMTHEGi8EyLA84BwwOriCgJr4LTqkdAjsKpwKoCAlYN8tg Ku7G0r8tQEXMBMY+2YBgd2Oy54k5BtvT/ACSPEt9SosjMQH4nFidrAWN1xijSkvjZyik nNRQ5qwnMScQxXYbPHSQVBtPYU/FmndkRs6eGj5Jmd+KXaj9Uc+tgSWXDDT4CqPRM2G3 q5iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=dNz9U3y7uWA31Ap2gtj1mPR6wTDw0t+YvvtBe+681EY=; b=sCUB/j2fMFNuC0t5R62al+d/X3qZ+K7lMCoBW/eKJVz/WUTQ2mb1+pUJ/AENSzcY1e FlBSoYS7gFg8I4pCUOME70kkmtrr1rVtOcLhiM7oIdNSnv9IWYvJIDJHtzNtB48TX+UG HmeOTKP497IXDsS6o7CnsgliMgfrFBrdq1bAacQ2pN/wRlZdNyDwQUGi9Bb4sSfGA7fy R1LXrgzU8qIx0iXl9Y8fcA2W1mNaEQ4I5jJf0UsrIM4wDassnNTJN87aCyOHKUbyMdQI PNahpZT340HAh2JdqJRmTYiemAQ1M2GCxsMWhZI5bXqVI9nHfGXFIzOKOE47pZO9Et4T DHiQ== X-Gm-Message-State: ACgBeo0W/ppIuOCXDQnqykKVgo18eM+yo/vcqIu13x70RmKMrq7+SSLC A7OEJ2ZQgh9tYoCPjIrIh5qmZIjm108= X-Received: by 2002:a67:ff91:0:b0:388:5133:660f with SMTP id v17-20020a67ff91000000b003885133660fmr1555770vsq.52.1659542610114; Wed, 03 Aug 2022 09:03:30 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id p4-20020ab06244000000b00384641c2bd1sm10548418uao.26.2022.08.03.09.03.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 09:03:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 13:02:46 -0300 Message-Id: <20220803160248.4190-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3 v4] 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: Tt6M3jxWyGkc Signed-off-by: James Almer --- libavutil/frame.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 13 +++++ 2 files changed, 137 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index de4ad1f94d..864c66371f 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -471,6 +471,130 @@ 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 = dst->ch_layout.nb_channels; + + 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 6d9563bc5d..859ccf6c6c 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -762,6 +762,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. * From patchwork Wed Aug 3 16: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: 37123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp531070pzb; Wed, 3 Aug 2022 09:03:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tTQdbRBsP2zt+Q5A8+PEsyz7YVhYczj96jQYNO+891ub8DsiQflqOkmwnNoNlKEdQlNo+V X-Received: by 2002:aa7:cd84:0:b0:43c:532b:65e9 with SMTP id x4-20020aa7cd84000000b0043c532b65e9mr27425784edv.330.1659542625868; Wed, 03 Aug 2022 09:03:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659542625; cv=none; d=google.com; s=arc-20160816; b=v7aZIdVCFIXfANVm6cPPyWsAXepxRrKydhnzqrber0N9HaDtyswBMdSltSSYp+INoX 76vW3ygyN3VtLeaerMsaY4cR71rpNTDnaDBVSp6RtJDHHQ4pGpauTq74/M2SUtr1wyOE 7y504YkTOJ72KrTkEjZCdrKaxCh5rq0iG6wYb4ntsMWOo0LBYPhgqWw5Z4aL3QT1DQTE //T1jSV6Ih+AJ8gWOWE17Y1RMBvj/5VNPqljFoDH0fZRUj5pNl+jfxbcFiO7LOCU1ynh PfprCFgMKEgXIb1CLYCX2Qrga/lLe1QNs9W+EKRwifC3wOhc+fO5K8txB2uqjUsfA1sW jt6A== 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=7YuVM+snbmzROgUaa2PsidgjiWCuUM74VGLZS0d2bBA=; b=GuUzCT9wqlEHp6VHHYGSX1oom1QQEeE9pIdbWBb22wgSbLSSJTDPzAgBvD1hBlyEY3 /hfg5za/8aAAFK85CT32Tk+C8VJ9xcqdN7XUw1YlhEotfADWyVI9RIBNhp14/Vi9C2GJ znOD6MOBraO+hAjyQ8rg3Pp5n+gmPAcygZ2LDDMM6LtYMrsHLicUiaHDzA9AJdiGLr2R K5/W0WMVGadv6S9yH7QGP/TgdcQs8plpJNcxB/0ykb9aCKTWQKCoQmOSp/RHBBzh/VBI ICrNKqxDz4phtPj8hS2YDJlQ59YFbzV3njEYtvxw6jd4HXwMWU8BSH4TdxtvTkX90Wmc JTVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CrYRTJ3Z; 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 p21-20020a170906785500b0072b6ef5fff3si2093767ejm.605.2022.08.03.09.03.44; Wed, 03 Aug 2022 09:03:45 -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=CrYRTJ3Z; 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 265C968B6B0; Wed, 3 Aug 2022 19:03:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f51.google.com (mail-vs1-f51.google.com [209.85.217.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AEDA68B7AE for ; Wed, 3 Aug 2022 19:03:34 +0300 (EEST) Received: by mail-vs1-f51.google.com with SMTP id k129so18331409vsk.2 for ; Wed, 03 Aug 2022 09:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=ZqHobjePmRagtBXpQZUNsEJDV9jnSnQDwH6B3iIDsiY=; b=CrYRTJ3ZlWWYHiU96KYkTfRYIrKOQtteOSQAqMFVdx2G70rx3E3QNWO5uP7nBi2tJP XJaB1+7BdeJnFyT8YKcg/6+n5sfFyOFPn0TFQFbEZBFBF762ueOYt6+kHo3U92TRDxAy xhhtvpQgMO1PlIBFdkTc9SK5TnIpZFfSnnODRjU2UBwLeHH1gBdtzeL7nusZ3DFyTiot R5uvMa2y4B/arquurQUgL434uFNeIMADUiahuP6gPjt1OvXBWf590kQuPFjeJWaLS0ad jU9dF9c8NHpznwYpev4zaBNbU/Vf+A6Uoj32aczVxxXwVUIpObOmM4+Yv5PvnBQD+45v O15Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=ZqHobjePmRagtBXpQZUNsEJDV9jnSnQDwH6B3iIDsiY=; b=gD3kbKDUmxPO7gT4widOcdiczsaLgvSBLQ46cd289yrOaBjPbli/iWPtG5tWknorGU ATIl2lOjOsy5bO0Q73A3GoZzrdWR75Yyk8apjzIqAfRbZoHAnyHto1sfcgRYmcTj1qBD sSxT1lJKCmC5SwXy2e/fMQgn9KNBFj5DPMhikRMqiUzo6Fo/9lX8vKL3zQ6dVemn73GM 2su5YetDO2X+tA6JfTd7wJPybMqMODm5cQsAOEKy7AI0JiHGZ3oF2tW899WZ+6ws9+a1 AKMOAw8ufSCAiZJJjchOcmWZgdU2Hw9ruAsWEfLouJ3JPmkc5tVRIljexnzdWY4IX7+v cW3g== X-Gm-Message-State: AJIora8unJkmDTz09ltePqJ6miqy+tvQlWBdfq+sgPekicgO/Wll6AS2 dxrd44fFv/zK2R03DOzAOtixIcyQnMw= X-Received: by 2002:a67:2486:0:b0:354:565c:62ec with SMTP id k128-20020a672486000000b00354565c62ecmr10016568vsk.26.1659542611507; Wed, 03 Aug 2022 09:03:31 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id p4-20020ab06244000000b00384641c2bd1sm10548418uao.26.2022.08.03.09.03.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 09:03:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 13:02:47 -0300 Message-Id: <20220803160248.4190-2-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220803160248.4190-1-jamrial@gmail.com> References: <20220803160248.4190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3 v2] avcodec/utils: add ff_thread_replace_frame() 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: Tl2vuSmV+cCp Signed-off-by: James Almer --- libavcodec/pthread_frame.c | 30 ++++++++++++++++++++++++++++++ libavcodec/threadframe.h | 3 +++ libavcodec/utils.c | 21 +++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index a54d16fee4..ef447ee699 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -1071,6 +1071,36 @@ int ff_thread_get_ext_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) return ret; } +int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst, + const ThreadFrame *src) +{ + int ret; +#if FF_API_THREAD_SAFE_CALLBACKS +FF_DISABLE_DEPRECATION_WARNINGS + int can_direct_free = !(avctx->active_thread_type & FF_THREAD_FRAME) || + THREAD_SAFE_CALLBACKS(avctx); +FF_ENABLE_DEPRECATION_WARNINGS + + if (!can_direct_free) + ff_thread_release_ext_buffer(avctx, dst); +#endif + + dst->owner[0] = src->owner[0]; + dst->owner[1] = src->owner[1]; + + ret = av_frame_replace(dst->f, src->f); + if (ret < 0) + return ret; + + ret = av_buffer_replace(&dst->progress, src->progress); + if (ret < 0) { + ff_thread_release_ext_buffer(dst->owner[0], dst); + return ret; + } + + return 0; +} + void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f) { #if FF_API_THREAD_SAFE_CALLBACKS diff --git a/libavcodec/threadframe.h b/libavcodec/threadframe.h index 100e068e06..a8403c8976 100644 --- a/libavcodec/threadframe.h +++ b/libavcodec/threadframe.h @@ -84,4 +84,7 @@ void ff_thread_release_ext_buffer(AVCodecContext *avctx, ThreadFrame *f); int ff_thread_ref_frame(ThreadFrame *dst, const ThreadFrame *src); +int ff_thread_replace_frame(AVCodecContext *avctx, ThreadFrame *dst, + const ThreadFrame *src); + #endif diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e73e3a7d08..44ed19458c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -928,6 +928,27 @@ int ff_thread_get_ext_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) return ff_get_buffer(avctx, f->f, flags); } +int ff_thread_replace_frame(AVCodecContext *avctx, , ThreadFrame *dst, + const ThreadFrame *src) +{ + int ret; + + dst->owner[0] = src->owner[0]; + dst->owner[1] = src->owner[1]; + + ret = av_frame_replace(dst->f, src->f); + if (ret < 0) + return ret; + + ret = av_buffer_replace(&dst->progress, src->progress); + if (ret < 0) { + ff_thread_release_ext_buffer(dst->owner[0], dst); + return ret; + } + + return 0; +} + void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f) { if (f) From patchwork Wed Aug 3 16:02:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37124 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp531188pzb; Wed, 3 Aug 2022 09:03:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR5HfsoNOlWYUQ3ouux4a3v5Epq0rd0uoFx5SssH28G6eFJC/ITygMsCpEOmFxTocuUw8ZB7 X-Received: by 2002:a17:907:94d6:b0:730:bfe6:8352 with SMTP id dn22-20020a17090794d600b00730bfe68352mr734503ejc.348.1659542634903; Wed, 03 Aug 2022 09:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659542634; cv=none; d=google.com; s=arc-20160816; b=KI1ClXOn9MWGTRkGn/LpUG9O9nYodn7vKenXJbAumE3NHVXG96+uptSE2ZSi39RTb5 Uh4CuWEB1mrPtiDhOfJeXuiPD/M/rIbGg4X5MjocHu3tx+Dtq2UQMqVEUIB+/0HFYvAL Xx4jdNWXp2WNO/mdxdNGdPvpt9BzuC+a/GnwEaX4Xp8Y/7GKXQ3AisuF/GNZMxX9cJsg 5aLudTvb5CVaeiiLs5IfwYrbwrHY1tEzx5Q4fToACpYRLc75fgg+6THTfQ6aa6YxbzgR +hPrH7EpQFXiiGOqrhjKlGTlenlaW4YR7rhKmFIa9KYZBOwYmhUHrKnrwQVhIpQnVI90 /LUQ== 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=+8E0im7Xs4iGMusg1T34ZBl/GGHj4t98xw51JJn5mN0=; b=VKDVCLtLUa3d5RjQretBSRdG276rHIoxKv3GLyeH40j0JJpGTmIg0OXRkfOBv+UcAB 4JbT+58wALofb8LUp91x8CrqmNarTpCZy1f5N4OIs+6vtw0uOchAH8oRCiy0qwLrplia pXidvP611w5Gqi3eGmZjdoZLEYB9QLCsv1Klb4WOY5GX3cNhXULh2dRFGDqetd3FmEFP ZYpOzZHuQEhTvJxtHg9KQue7P0IudI/XeeKsUf2xm4Rj8IF4E2l3ZSSnpY9hET1WbHqs ECfFEhv4ijYekx3AG3eViWt9KxKv3FKUGix4I8A938vlBqWqg23W9DnOvZbGYFx7xtKI yS4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YmLWo+YH; 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 hq11-20020a1709073f0b00b0073046f33772si10932057ejc.459.2022.08.03.09.03.54; Wed, 03 Aug 2022 09:03:54 -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=YmLWo+YH; 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 44B9168B925; Wed, 3 Aug 2022 19:03:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f42.google.com (mail-ua1-f42.google.com [209.85.222.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E35E68B7A0 for ; Wed, 3 Aug 2022 19:03:35 +0300 (EEST) Received: by mail-ua1-f42.google.com with SMTP id f10so7164627uap.2 for ; Wed, 03 Aug 2022 09:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=FIqIqR4rPlETdAd7owflBPgv50q4+5MhmmDzPx5RJfA=; b=YmLWo+YHi35Q40WT4fRFX/9kJQcymu6CQm9rTmiHemLpqcSn0qKdA2aF9zhzxuGR/L wgKBT1s5dkx7TVb1nWguCbyGXGzg9Sq1JPVa12ZVUROFCB6Do1Oz3LQx+tXN9f1vFMa+ o+GlJ05g+ao1KHFn0wpqq8fM5zt9wMNFpxNkvyZ6Amag7189wrRxdIDcsb+CZ2cS/PHx L2ConAD91YT8B8aCTuJEi7Y3qITHX4wiYBf+bHRKyzxeI9WXmeYG4K/7FwUtjPsYrW9+ /VNefptCMj/G702rfKolG+BBWT8u7Uogv0yd5C1yvrP4bA9WQA6nFIDqTIbzTlZaf7V4 BbFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=FIqIqR4rPlETdAd7owflBPgv50q4+5MhmmDzPx5RJfA=; b=CplYnzfKtU6v6EuK1rO6naqXYt5GAFgXXJaIXhObjw2yPcEPPn9o9tywjnHllTMk2K aE67U96QGCQvk6rVhm0n7EZQi088KnUij3H7LAUmEcqf4PW8uevL2Go5h7KlAju/x8TB h2xHjq1q/pdaumTssah0RYxrKPGhBWYWwhVrRJu594EPU91WUvsC7DsdiYzt3HYul5yD fgrWPwlf8urpcsWFL+8xqKKyoTVHFxZASMpbATTd85lCADeu6lBQQRfnozzbJolmKbzR TOXd99BlBJil0K8ci6SmghQzn7ZHKNJ93E51J5fNMwg8Qa8UXInAHxNF2I9hvcrHjOiT AKDA== X-Gm-Message-State: ACgBeo2jf2gmp39l88cQYPXvQ9TqqI+meNALYyyEXZFpZdJV1LIBxnnL FOWrRvpp7IHF7cBmYq0HnSg4blqvPnE= X-Received: by 2002:ab0:661a:0:b0:384:d0d7:7383 with SMTP id r26-20020ab0661a000000b00384d0d77383mr10515520uam.24.1659542613212; Wed, 03 Aug 2022 09:03:33 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id p4-20020ab06244000000b00384641c2bd1sm10548418uao.26.2022.08.03.09.03.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 09:03:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 13:02:48 -0300 Message-Id: <20220803160248.4190-3-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220803160248.4190-1-jamrial@gmail.com> References: <20220803160248.4190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] avcodec/h264_picture: use ff_thread_replace_frame() 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: C39kutn3cWHo Signed-off-by: James Almer --- libavcodec/h264_picture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 2661ff4698..dcaf0fdb0a 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -154,8 +154,7 @@ int ff_h264_replace_picture(H264Context *h, H264Picture *dst, const H264Picture av_assert0(src->tf.f == src->f); dst->tf.f = dst->f; - ff_thread_release_ext_buffer(h->avctx, &dst->tf); - ret = ff_thread_ref_frame(&dst->tf, &src->tf); + ret = ff_thread_replace_frame(h->avctx, &dst->tf, &src->tf); if (ret < 0) goto fail;