From patchwork Tue Nov 8 11:25:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2761971pzb; Tue, 8 Nov 2022 03:26:53 -0800 (PST) X-Google-Smtp-Source: AMsMyM63ljx89YbHHFsf9trxfFUagsGzuRyC9i47ZFNdmvhYIboFxiTNIyqLQZBJv9ZjtZNVLkZk X-Received: by 2002:a17:906:3054:b0:7ad:e82b:ac23 with SMTP id d20-20020a170906305400b007ade82bac23mr39411945ejd.235.1667906813376; Tue, 08 Nov 2022 03:26:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667906813; cv=none; d=google.com; s=arc-20160816; b=g5NbRmXOFyurWZYgUkJUpOZTjCqnBrlx5eGy1J1K0BDil6FN27xKjoBIMUZOLTgZGm turU94NfB6fgNklWgEzDR+DlWimWiJittYgkh1wEkQ0D5nDOAyHi+Mzn9g0/WoPeUyJI qzsfl4SRxCogajJEVPef6/oQLl75LjAGb9Z11ttqCKp39ehd7H2I8U071woGa7iDmp+5 B1suwC0pMrtInvMciJ1KvlFfT6QoeSROE5WUOzgqI2YqhmtpG7G1lGJyrDudvHKqmP1G DXLEVknTl1g3QNNjYAlM3hwi7yMBlr5iBDnTSh20xuTIApQxe3p0obPamasKTBRkknUR KmBA== 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=A8EKin5mbu9VvbI9QyA1oXCgiU9E3tuQvIO/oeHgJCw=; b=Rw6kAKneSCTIevRn4UCX2P4CofbjAZ3aYo80hFjkycKbZ5RAAfeSHP7O+cQo4zQjnC 6T8919KFTMceDQD35yIqkPszl62A4c4A2h5LbRo7VjLS9kfiUEFFHUOU+B2Oe4BVCO+P mjycFY4gti2PCtqvgLnc2YpfNcfPpSoznDs1MghnH0T2srgh/Q6WreoX43iZLdvOdSFA C/lVpAe0Rq/qiffxYLvNYCUW3EtYmUMMEvGuIKBTnBZJHz966O5RnvN9NTbcB2uj2eu1 8rPHo0y6pgtHmc8GbZVfAevM6Ix+AAzoT6zWMaxCm9o0mNjw3wAnFEKDOTQpOLxvNwNI gpRw== 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 hp23-20020a1709073e1700b007a7424836d5si1816868ejc.234.2022.11.08.03.26.53; Tue, 08 Nov 2022 03:26:53 -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; 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 6BEAF68BB66; Tue, 8 Nov 2022 13:26:14 +0200 (EET) 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 712F068BA5B for ; Tue, 8 Nov 2022 13:26:04 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3B4842404F7 for ; Tue, 8 Nov 2022 12:26:04 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id dU95lyVjZ6uP for ; Tue, 8 Nov 2022 12:26:00 +0100 (CET) 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 D5E2E240499 for ; Tue, 8 Nov 2022 12:26:00 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 75E673A1954 for ; Tue, 8 Nov 2022 12:25:54 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2022 12:25:47 +0100 Message-Id: <20221108112550.8375-2-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221108112550.8375-1-anton@khirnov.net> References: <20221108112550.8375-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] lavf/demux: treat EAGAIN as REDO unless AVFMT_FLAG_NONBLOCK is set 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: FDN9CH+EArp3 Lavf only supports a very limited approximation of non-blocking behavior, so we should not return random EAGAINs to callers unless they specifically requested it. --- libavformat/demux.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 2dfd82a63c..5cd9522367 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -574,8 +574,12 @@ FF_ENABLE_DEPRECATION_WARNINGS /* Some demuxers return FFERROR_REDO when they consume data and discard it (ignored streams, junk, extradata). - We must re-call the demuxer to get the real packet. */ - if (err == FFERROR_REDO) + We must re-call the demuxer to get the real packet. + + Treat EAGAIN the same as FFERROR_REDO, unless the user + requested non-blocking behavior. */ + if (err == FFERROR_REDO || + (err == AVERROR(EAGAIN) && !(s->flags & AVFMT_FLAG_NONBLOCK))) continue; if (!pktl || err == AVERROR(EAGAIN)) return err;