From patchwork Mon Mar 14 21:06:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 34737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2497428nkb; Mon, 14 Mar 2022 14:06:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyf27AmoLNJDC73rD9R0KrEf1KbPvY4OT8xk1GDMRy/Sq7VYacKDzIXSi51Ylf6ZCJAiMUp X-Received: by 2002:aa7:c7c4:0:b0:407:52cc:3b32 with SMTP id o4-20020aa7c7c4000000b0040752cc3b32mr22222606eds.397.1647291998568; Mon, 14 Mar 2022 14:06:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647291998; cv=none; d=google.com; s=arc-20160816; b=CW12hldOTfmIWwAlEobyqaUf2XDKCab9gzoq7OV3TohLgaXKi0hrD2/zedPDMmKy8p Jr8/zoHoWmYXN70mqBFulwjEsjL+dEQAuWSARr64MsXyuu5fxkqvASJt95lJSZXQ6aGV dMmRqm3C34UnbxD5QcG94lObjTu0YVQivpOY/aJTRn7jpjG/yjEctauYVeEm6SHTe0W/ Dcf/xkdbPzVQ/3nLxmNGp9oE/DstXG/dGqD2f3yTuZWKbIyuXge2reHkqrOExS0hyQvI Vad6a9oiG4hiUHTz/+qMHM3oraGBM2jad8hUiMvkfUoZ+CjhTLzP9zsicYLyzyYTYXGM eM+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:delivered-to; bh=KA3fIu3FvuZSC+HZOXWw1Moug/PMVO3AdrrsfJVy4Uc=; b=SpO9SO2x+wFrd2knUeUkt0fjirUgEjmwQWu/MikO1YMCZ1q9dgDRymvphmNErLPE1i vZ+sG2q/ExQwnsqDmbFFDjjmjgZm8/K6rs5SEp6ZetrsfocsLIyUlxS0as5iXHnVWf8b chukEX9lwAnOfbjjBNUVBKXPDp9A196OT8mPyqBmyFmlXy2pib8BOCVJczsuyDBa9Jic YNg+XfGjdRcV3TRlnKa3Qlmf7+SdhqMOmO7lA8KNQuhXcuV1+Ss8b9ff4662iVUveizR Az9tH2pEDmFGmHk2bWHFJ7xRHaMA7c45YRYzLSfIO06hH6MzDR6QzjWgV5BlPLBmSsXY wi6A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hk8-20020a170906c9c800b006d128a5b1e0si9414038ejb.144.2022.03.14.14.06.38; Mon, 14 Mar 2022 14:06:38 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6470268ADDE; Mon, 14 Mar 2022 23:06:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7F4068B0BE for ; Mon, 14 Mar 2022 23:06:13 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 15C24E67D9; Mon, 14 Mar 2022 22:06:14 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sSs4zAeRcJuB; Mon, 14 Mar 2022 22:06:12 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B59A1E67E4; Mon, 14 Mar 2022 22:06:12 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 Mar 2022 22:06:02 +0100 Message-Id: <20220314210603.23870-3-cus@passwd.hu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220314210603.23870-1-cus@passwd.hu> References: <20220314210603.23870-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_zscale: properly check return value of slice threads 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IPaOnNpxRD4P Signed-off-by: Marton Balint --- libavfilter/vf_zscale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index bab87b0c94..ceefc95224 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -117,6 +117,7 @@ typedef struct ZScaleContext { void *tmp[MAX_THREADS]; //separate for each thread; int nb_threads; + int jobs_ret[MAX_THREADS]; zimg_image_format src_format, dst_format; zimg_image_format alpha_src_format, alpha_dst_format; @@ -858,12 +859,14 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) td.desc = desc; td.odesc = odesc; - ret = ff_filter_execute(ctx, filter_slice, &td, NULL, s->nb_threads); - if (ret < 0 || !s->graph[0]) { + memset(s->jobs_ret, 0, s->nb_threads * sizeof(*s->jobs_ret)); + ret = ff_filter_execute(ctx, filter_slice, &td, s->jobs_ret, s->nb_threads); + for (int i = 0; ret >= 0 && i < s->nb_threads; i++) + if (s->jobs_ret[i] < 0) + ret = s->jobs_ret[i]; + if (ret < 0) { av_frame_free(&in); av_frame_free(&out); - if (ret >= 0) - ret = AVERROR(EINVAL); return ret; }