From patchwork Thu Mar 7 14:34:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp314005pzb; Thu, 7 Mar 2024 06:34:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX7wPHmsfgQGy+4t2wYXsoeSLXYzehyDpWXsKZJV7bvDNEGx0RsU+xtjH6IvQjyIzX4NpQTMBP0AnQp3Zv0FxfYOKgC1tl68tJWuA== X-Google-Smtp-Source: AGHT+IFMRF0Lt6rjag/oVpaBrPAa0VM9SXUFvb/Jl2PlKieVRNEpQW9bPXrSumDg2RNILXkJpgC7 X-Received: by 2002:a05:6402:4485:b0:568:1dda:f971 with SMTP id er5-20020a056402448500b005681ddaf971mr689279edb.3.1709822081734; Thu, 07 Mar 2024 06:34:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709822081; cv=none; d=google.com; s=arc-20160816; b=s20JjqMrPVCDh2xYt/XUO5dJ6csec5OzxzM8ax5hyuBKNLvmDmTPmr1Yp12jxBTpiR 8mBRfVrZK7XGKdb3j+jdSnbgiZt4HYFMFejcD7Z/3qpZ/SWFFR06h8f0vZXqg67/Vuzn QUkUOcEwdKckiRNcj9HQDSR06tU74TW1O9AcSpsvUgbJTrvM9SDarILNW35Pi91jdMAH K07t10bEPQgiFVBj/LteUEUtJiHWANCVOp+eL6Kh+FQdxBbGc0CKQBzvZgeNkbD1YYiv oTLZSnCcCT/gCH8i08QmpOEz9AZeYAp8tmcGz7CivBILEGXg9Zm0EetIACtSPh5GrEQk JQcw== 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=AsPes7jPUpGHUwNWVsc0r4GCpMdKnsC0aqfdLPg7ZF4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Hw3m6DqxviCzj3rgtp4TH5461uIOk/4GAT1pMmTPW5AAmviiueexDs+qPR3ru0eAmy +GdlDHUF48vnrm1z2gyBWOyHunSXE4ALMj5p6Yn5GxUFgdUEX8JbY0HrNf+4NYF4n5Wk aMnQKH+e1pEfWxXEm+f7uR6ehcqTxo2wgljrLJR7J1ReDEr8ash4gnx/9m9TSaXyjEvg hJ9JlQy429ZswaQKvxBR6NxwTcReQ7rPH1qsLO4NZDVfJzfUeTbpVf2tjLWjlUj9n1Sc THW/tJf55i8HIQS7kjB0y6ZbJrtfCSWNDPY6r/2eKbkQz4Vn3atpGHynHf8b2UOTtirX tthA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="puJ/R/HN"; 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 f13-20020a0564021e8d00b0056766ca62efsi3550639edf.434.2024.03.07.06.34.41; Thu, 07 Mar 2024 06:34:41 -0800 (PST) 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=@khirnov.net header.s=mail header.b="puJ/R/HN"; 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 5823868CF92; Thu, 7 Mar 2024 16:34:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5562E68C455 for ; Thu, 7 Mar 2024 16:34:30 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=puJ/R/HN; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 8F5004D42 for ; Thu, 7 Mar 2024 15:34:29 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id B2wyXSdMCuyk for ; Thu, 7 Mar 2024 15:34:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709822066; bh=h6vbCf3J/5HufSddo8ngCThN/uhVZ0CtStHXYu9Rpj8=; h=From:To:Subject:Date:From; b=puJ/R/HNXQF7KQUlfQx6RakV0yN0h5kfHTAzeXkQ+FVAsuCwxTLxWizWOba0qzUsq HG+UrbIKBOzhstF73mHsf0EEGsnEevny1cUSk3pL7vOvYSJN9F2jnuFe/yKiIlONzz MEnAPX5UaaDAvSC8GltynI/tq/bK4A+VLmT21Eyp821AdNADjjOEhhc5szyk6KOyO2 GIb4wzywsSsKcK38O0zwnralThiEf2uKP2oNFuxT6wWyrbCOn28Rhj4QsfsS2+Rp1S ze+Rl3Oy1al+CDg1mLu0KB/zaUpZvueQITBEZa2buxGjrBO1ZyGOL1qnUUsMxWVqfN J3JAKd7yz0Uew== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id C720E10B9 for ; Thu, 7 Mar 2024 15:34:26 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id ACFFD3A03D8 for ; Thu, 7 Mar 2024 15:34:19 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 15:34:18 +0100 Message-ID: <20240307143418.17071-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_filter: do not assume av_buffersrc_get_nb_failed_requests()>0 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: ZL2ieS1OtM0t Apparently it can happen that avfilter_graph_request_oldest() returns EAGAIN, yet av_buffersrc_get_nb_failed_requests() returns 0 for every input. Fixes #10795 --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 13c5065191..dc7131c154 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1889,7 +1889,7 @@ static void send_command(FilterGraph *fg, AVFilterGraph *graph, static int choose_input(const FilterGraph *fg, const FilterGraphThread *fgt) { - int nb_requests, nb_requests_max = 0; + int nb_requests, nb_requests_max = -1; int best_input = -1; for (int i = 0; i < fg->nb_inputs; i++) {