From patchwork Wed May 17 10:20:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1079783pzb; Wed, 17 May 2023 03:24:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6vsEUv22un+Swc1TpTXeB36b0aiMMKaHgUwDSJgF6npBF2waK7jqt/Czt6Q52LqSmAdsOA X-Received: by 2002:a17:907:3fa6:b0:966:6035:c81e with SMTP id hr38-20020a1709073fa600b009666035c81emr34893375ejc.52.1684319092880; Wed, 17 May 2023 03:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684319092; cv=none; d=google.com; s=arc-20160816; b=exiwtnjOyBIF1yL/SRS+fmoMd6HwveOrfqD+ZGlCROV0COfX65/6Dup4MZUNgc+S6F wVpkTbmP3dmhyC5vILqnEwj0cFm2l+0NYSKStsKBmC/1ZuaQj1k8su2Li9ORGWhVyzTL u5mWI/Rvc02VcRrytWOiUBQdVBp0yjfdx/Q5JWjTN+c+1xrH0JUq2CHzf5kcFbGYRIc2 n+EQQC99AcMrsOHWFZ/16/Xcctu4CdE7YuX5ikbvx1QH+iFnfnl2IM3zeNDEbm8CgiGV ugleZ+3ZsbmMioGJOk7t5bnmcVHxEBfe60A1/Q2TMmqdE7ZUeVV59hpsrVEmkCsj6S4i ZN5w== 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:delivered-to; bh=0aax72gHAFvHdvT+XoOhVAIMrO57vmDEwzXESv/FxnI=; b=Z1qcg7d7YNvHGHpscMvPqh4lcXqmSal1uV2XMm1AScKouu+MOCR2bz5Ja2Qcs2oglr 6mwsqxyg95ku2dBAPZJnVp+xnPOYt/gxx4uU3S7UoCoxXI2Mm4t1KBB4sWQAfbwlzt36 jTQhGd2a18G6uMloYuLxMT6IRnUVR9X+VJyK0AMYC05/ZeD2Kul7YBpmrfy5jp4Avfwz /1946DHSyC2Ig8292iJCcciND3D8yYqoOFqpGtAzIGolwf+zox1hLf8odtTqbLWnYifI bWPLukgDESrUlt+0YyV3lC1dgSpET8b1ghqmjMe3uX82JvB5MfTkQUpIui428S5m1qQN m1Ig== 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 fy25-20020a170906b7d900b00946c265cf23si15410756ejb.838.2023.05.17.03.24.51; Wed, 17 May 2023 03:24:52 -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 B2C0968C1E0; Wed, 17 May 2023 13:21:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A152068C157 for ; Wed, 17 May 2023 13:20:53 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1BF7F2406CC for ; Wed, 17 May 2023 12:20:52 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cWjdBkhNx77e for ; Wed, 17 May 2023 12:20:51 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id 2CD382406CE for ; Wed, 17 May 2023 12:20:46 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 60EA73A1EBB for ; Wed, 17 May 2023 12:20:40 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2023 12:20:15 +0200 Message-Id: <20230517102029.541-22-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517102029.541-1-anton@khirnov.net> References: <20230517102029.541-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/36] fftools/ffmpeg: drop an obsolete hack 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: +wGpxyRAmnQE This special handling for decoder flushing has not been needed since af1761f7b5, as the filtergraph actually is drained after that commit. --- fftools/ffmpeg.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9d554e2fb0..49313edebc 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1418,17 +1418,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo if (!got_output) break; - // During draining, we might get multiple output frames in this loop. - // ffmpeg.c does not drain the filter chain on configuration changes, - // which means if we send multiple frames at once to the filters, and - // one of those frames changes configuration, the buffered frames will - // be lost. This can upset certain FATE tests. - // Decode only 1 frame per call on EOF to appease these FATE tests. - // The ideal solution would be to rewrite decoding to use the new - // decoding API in a better way. - if (!pkt) - break; - repeating = 1; }