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)