From patchwork Tue Nov 8 11:25:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2761791pzb; Tue, 8 Nov 2022 03:26:26 -0800 (PST) X-Google-Smtp-Source: AMsMyM7Flc8hx0w4YzPPj2HNyvB0vJXp8Y1LNdgDtWulfVLqcknZATHDv11CAPKp0l7ZmW7QjkTh X-Received: by 2002:a50:bb27:0:b0:461:a7f8:c8c7 with SMTP id y36-20020a50bb27000000b00461a7f8c8c7mr910092ede.325.1667906785930; Tue, 08 Nov 2022 03:26:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667906785; cv=none; d=google.com; s=arc-20160816; b=iEO6bxGtva19JnN6sdYGKiKEf6AeFpMvehcGz6zoOkxDlFq/XLWj3LBiUVLVmxVj0n xGjt0H4KSNX0P9y5kkxDCO1YiV1+kGSJTWnwOTb6ek3hPvA4aSvC9xkvV+4XpXCynjuy Rk51TV8TN8PiBPw+APg1KZ4Bn8uXdou5LLwjDkhI4SuIeWvkxihHcWzEKDUWuwgBtMky AvzlWjQpAJfeFlavnzFxtY9GHys3xCmZWLs6UnucEFEWZbYsoipuRd5KzjF/ySOoTMU1 kaFDdQvEor5F64DOckTg5cuyQFbG9+cWIJfSOMdAh8zQoxREltryX3xFE6BgKAxALXaY KWHA== 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 :delivered-to; bh=NGjtPhY9TNQN3toVbVvD2E5L7n9qeeFT3FsCbOvGNlg=; b=MsOQEe+MgJXegaTrQX+CLm3/nXGwzbmMXn+sZzjJQrV4orJ+a7yWlIUvz3kxKDX4VE IbPJRjwZMIsV+fqsRmjvKv9u53v0NJrv+/4t225xHUAeJPuigufqLO5xYUwno33Hrhmj 0kWfgm+3iYXNB41b0OsX8qQaIhXuIqpVGSeRbQf2pch09FfsSdfr2YGdiaQeGE/WwfhY oUr0RdcdA+xZeYEOAqrhS20JoxRn9vpsyjD3ssBtdtsmk8ksytTmeYMYCB2ASIyaRgb1 QDGv5CulRE6waLD2fJGeZdE2T14rVNNhn+kPIuPEvGRS5RA39QiEy/IWRdDDrA+8/Alb MtNw== 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 q5-20020a1709066b0500b00779e6c93108si9223932ejr.598.2022.11.08.03.26.25; Tue, 08 Nov 2022 03:26:25 -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 6231A68082D; Tue, 8 Nov 2022 13:26:11 +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 51CA968ABFD for ; Tue, 8 Nov 2022 13:26:03 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9512D2405EC for ; Tue, 8 Nov 2022 12:26:01 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id uiRIsF2dUacN 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 CE68E2400F5 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 698853A0212 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:46 +0100 Message-Id: <20221108112550.8375-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] lavf/rtpdec_asf: set AVFMT_FLAG_NONBLOCK 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: Vt+Swy+drJ23 Makes sure EAGAIN from the internal ASF demuxer is propagated to the RTP demuxer. Will be important in following commits. --- libavformat/rtpdec_asf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 72ead6975a..7824082d22 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -128,6 +128,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) return AVERROR(ENOMEM); } rt->asf_ctx->pb = &pb.pub; + rt->asf_ctx->flags |= AVFMT_FLAG_NONBLOCK; av_dict_set(&opts, "no_resync_search", "1", 0); if ((ret = ff_copy_whiteblacklists(rt->asf_ctx, s)) < 0) { 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; From patchwork Tue Nov 8 11:25:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2761921pzb; Tue, 8 Nov 2022 03:26:44 -0800 (PST) X-Google-Smtp-Source: AMsMyM5VjSC0Ly898tC44u2+6r9Ii4VntvPxoJNhthjFLNU+vtOILc1VVdxFf/8YPGxlJo75bKqw X-Received: by 2002:a17:907:6e9e:b0:78c:5533:4158 with SMTP id sh30-20020a1709076e9e00b0078c55334158mr49476994ejc.417.1667906804116; Tue, 08 Nov 2022 03:26:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667906804; cv=none; d=google.com; s=arc-20160816; b=g4zqMYZItWeSdP2dua2aKaKw1T6XLmJR8/MFTngt5XU9JHz3O8hQhtb/diStnZjBuR F3m8GunjRxS4zvk5C5U/EvDCx7r87ancPFIHHf0Kf4z85QcJfk3YYpQHJC5D13UhfnGy DVugnEd4gx6Wyd1R1S9qRKyQdBNy2zFCbJH+lm5WfmZiL3iiU+4q8OcdHOIKQKBaA3uW w3jIE2sd+Rk1HZl3fOhbnHiNN7PViHn1za7uoEeeeCagGHoHDSC+lw2YgdktI1NHF4sm iLnEfKQd9GQvrxdHop9F7GzE+PBNtKiSWLalgcaT7vqxCBycLbyJuImJNmWhAjS52hTJ HT1w== 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=/kWAHAtfZBvHBlft+SAdSbx4WGyPl4Ldd9z4Dp9tgZU=; b=r4etsJ1xT3gqO7DUQKF+sVhAJ3Bem/OwR9BPH9ct4UvqOhVdjRqGSYGV1cryD/zNob Jru5wZZtOzYkicGv+gHXqusPUSKwdlXBkaTv7rAb8a4t/jn91KOr5dqoRoy81dI4y2BO oYXeVxdC9sHXWS4tVMIIdcktJfxNzjYwscG/DwBwjuPGhReH0wPJWobRk0ez6vroCpCV vSDP+PBe8iwiQcnoyCgRg9RNdfnSxIm2HqzVIl/jONTZvUmqzKLysMkbgeacAPuedukK 1KDAlIzLDiSXQA6NfXURRGJohQPFS9/PRqSfGrMRgN3EQehAE2dNR9GqQ5hKoGV/QF+q z1LQ== 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 j27-20020a170906279b00b0078b41dcf4b8si9130618ejc.479.2022.11.08.03.26.43; Tue, 08 Nov 2022 03:26:44 -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 59C0F68BB59; Tue, 8 Nov 2022 13:26:13 +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 9E74B68B0FA for ; Tue, 8 Nov 2022 13:26:03 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5CC63240591 for ; Tue, 8 Nov 2022 12:26:03 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id D0i9gfplIMRm for ; Tue, 8 Nov 2022 12:26:02 +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 D6BD22404F7 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 80FB03A1955 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:48 +0100 Message-Id: <20221108112550.8375-3-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 3/5] lavf: replace FFERROR_REDO with AVERROR(EAGAIN) 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: NpO26Ohb3RRz There is no meaningful distinction between them, both mean "the demuxer did some work, but did not produce a packet - should be called again". --- libavformat/demux.c | 12 ++++-------- libavformat/demux.h | 6 ------ libavformat/flvdec.c | 14 +++++++------- libavformat/lxfdec.c | 2 +- libavformat/mlvdec.c | 2 +- libavformat/mpeg.c | 2 +- libavformat/smacker.c | 2 +- 7 files changed, 15 insertions(+), 25 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 5cd9522367..8c81a58274 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -572,14 +572,10 @@ FF_ENABLE_DEPRECATION_WARNINGS if (err < 0) { av_packet_unref(pkt); - /* 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. - - 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))) + /* Some demuxers return AVERROR(EAGAIN) when they consume + data and discard it (ignored streams, junk, extradata). Call the + demuxer again unless the user requested non-blocking behavior. */ + if (err == AVERROR(EAGAIN) && !(s->flags & AVFMT_FLAG_NONBLOCK)) continue; if (!pktl || err == AVERROR(EAGAIN)) return err; diff --git a/libavformat/demux.h b/libavformat/demux.h index 1f57e062f6..a008c3dba1 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -55,12 +55,6 @@ typedef struct FFStreamInfo { int fps_last_dts_idx; } FFStreamInfo; -/** - * Returned by demuxers to indicate that data was consumed but discarded - * (ignored streams or junk data). The framework will re-call the demuxer. - */ -#define FFERROR_REDO FFERRTAG('R','E','D','O') - #define RELATIVE_TS_BASE (INT64_MAX - (1LL << 48)) static av_always_inline int is_relative(int64_t ts) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index d83edff727..d320a431db 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1058,7 +1058,7 @@ retry: } if (size == 0) { - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } @@ -1110,13 +1110,13 @@ skip: av_log(s, AV_LOG_ERROR, "Unable to seek to the next packet\n"); return AVERROR_INVALIDDATA; } - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } /* skip empty data packets */ if (!size) { - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } @@ -1160,7 +1160,7 @@ skip: (st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && stream_type == FLV_STREAM_TYPE_VIDEO)) || st->discard >= AVDISCARD_ALL) { avio_seek(s->pb, next, SEEK_SET); - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } @@ -1273,7 +1273,7 @@ retry_duration: if (st->codecpar->extradata) { if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0) return ret; - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } if ((ret = flv_get_extradata(s, st, size)) < 0) @@ -1284,14 +1284,14 @@ retry_duration: if (st->codecpar->codec_id == AV_CODEC_ID_AAC && t && !strcmp(t->value, "Omnia A/XE")) st->codecpar->extradata_size = 2; - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } } /* skip empty data packets */ if (!size) { - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto leave; } diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index 8003ae98b7..bd28dfe270 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -307,7 +307,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt) if (stream > 1) { av_log(s, AV_LOG_WARNING, "got packet with illegal stream index %"PRIu32"\n", stream); - return FFERROR_REDO; + return AVERROR(EAGAIN); } if (stream == 1 && s->nb_streams < 2) { diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index db3b77bb9b..d510787fcd 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -422,7 +422,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt) pb = mlv->pb[sti->index_entries[index].size]; if (!pb) { - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto next_packet; } avio_seek(pb, sti->index_entries[index].pos, SEEK_SET); diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 864b08d8f8..f566ff74bd 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -251,7 +251,7 @@ redo: if (avio_feof(s->pb)) return AVERROR_EOF; // FIXME we should remember header_state - return FFERROR_REDO; + return AVERROR(EAGAIN); } if (startcode == PACK_START_CODE) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 1d54e8e917..052b6d28d4 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -332,7 +332,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } if (s->streams[smk->videoindex]->discard >= AVDISCARD_ALL) { - ret = FFERROR_REDO; + ret = AVERROR(EAGAIN); goto next_frame; } if (smk->frame_size >= INT_MAX/2) { From patchwork Tue Nov 8 11:25:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2761838pzb; Tue, 8 Nov 2022 03:26:34 -0800 (PST) X-Google-Smtp-Source: AMsMyM6vtdRwzU0AWD8/wO1FJy30LH/C0f98yY0oSFZe+67P8h7q4izn5ML3RiTaLdX06nrOlnob X-Received: by 2002:a17:907:6d82:b0:7ae:2964:72bb with SMTP id sb2-20020a1709076d8200b007ae296472bbmr24627723ejc.404.1667906794794; Tue, 08 Nov 2022 03:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667906794; cv=none; d=google.com; s=arc-20160816; b=kl72xOQY4CvrsAnm/LoNq5USjdfB+x3FXMrYG1yctnP0YPdNx63k6SnmRsth54XaIr GADfMXKkLASzHVjKGRWyBabDh7ho7kOtR+cbyd8858DQZyyy4APDx3r2wJAD3tZF5Oku ++FexbVK9rEEjO8DZiupE1467ZgaQYuA733nM8hkJ3C8TVpydWrLRmxdWW8Gy448MxXe noWNcIbRVgAMYZVm4hiYZOORh0RZG8UjKLG+V+8BF+vhTdWaSHDpsCB5kh7aRB90LHun eGxtVYXpjvMM9QihnOHjKK3dxIbArQiJ3/qMhkG7IKeqMS2fjE+Dh2HxWpMtK6n1HIgW edgw== 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=eZh3Zmqkffxy0+LM7lI9pZPCboIjfCiRokP+zS5w9wc=; b=1FFmnFaobjN9ynxKlVLgcjezb7hKJqOZQ5rCiYlX0mBFY94fkwXBiVUt8HmU3iVmi7 S2oHZaS7IQ8DlHWwvuSW8lh7+bE94hKAlK84rrAng0bGWXZXzSY8Sisg0XVm5Fe1nqEL kqOhi4pJU2xorR+0uEDR2xkQMVJZrVP27IzXrI/IVoC/Wv1PuAy9q8e5e3vGamFxJitR i/CH2ZNedHYiqR+gFmdIGoX3E/16k5GEj0SDT5SVu2F3HS38KwkfEsxy1cqZdH+pDYHh ARwnrWEXj9XOoZC249qFBthmDbv1/6fG7vqjJLnX/5Gtgj3L7gx8nS/xuiHVej9/8C5Q jkJQ== 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 z15-20020a17090655cf00b0078dad5e8d65si8592802ejp.68.2022.11.08.03.26.34; Tue, 08 Nov 2022 03:26:34 -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 6831068BB47; Tue, 8 Nov 2022 13:26:12 +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 549AB68B0FA for ; Tue, 8 Nov 2022 13:26:03 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 98F782404F8 for ; Tue, 8 Nov 2022 12:26:02 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id lns6YC6T2xBI for ; Tue, 8 Nov 2022 12:26:02 +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 DB600240591 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 8BA143A196E 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:49 +0100 Message-Id: <20221108112550.8375-4-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 4/5] fftools/ffmpeg_demux: do not set AVFMT_FLAG_NONBLOCK 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: rKUQQGCv1/0r This is pointless now that demuxing always runs in a separate thread. Remove special handling for AVERROR(EAGAIN), which should never be returned now. --- fftools/ffmpeg_demux.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index ee867cc15c..8ea5318148 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -254,11 +254,6 @@ static void *input_thread(void *arg) DemuxMsg msg = { NULL }; ret = av_read_frame(f->ctx, pkt); - - if (ret == AVERROR(EAGAIN)) { - av_usleep(10000); - continue; - } if (ret < 0) { if (d->loop) { /* signal looping to the consumer thread */ @@ -917,7 +912,6 @@ int ifile_open(OptionsContext *o, const char *filename) ic->subtitle_codec_id = subtitle_codec_name ? ic->subtitle_codec->id : AV_CODEC_ID_NONE; ic->data_codec_id = data_codec_name ? ic->data_codec->id : AV_CODEC_ID_NONE; - ic->flags |= AVFMT_FLAG_NONBLOCK; if (o->bitexact) ic->flags |= AVFMT_FLAG_BITEXACT; ic->interrupt_callback = int_cb; From patchwork Tue Nov 8 11:25:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2761722pzb; Tue, 8 Nov 2022 03:26:15 -0800 (PST) X-Google-Smtp-Source: AMsMyM7qS7U+/Ws3/gr1WMPfCNlrYllQw9D7ZeZVGXQRJzYxXs/2PSkLnIZBXLMdukNswhyoihSY X-Received: by 2002:a17:907:7fa9:b0:791:a5c2:e25 with SMTP id qk41-20020a1709077fa900b00791a5c20e25mr53472035ejc.444.1667906775205; Tue, 08 Nov 2022 03:26:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667906775; cv=none; d=google.com; s=arc-20160816; b=wHrvCYeBgnjFP6dZMKe+p4KPROhIaFqkNBZNaripioT798mcauKSZtWXtARI5Zr9z1 qh6G4kv4d3NLqyCc/vuH90viMwPS1CynJ/Gi/xag48mJ7jfWncYSLFM326LtkJyWlGic lj3mQLLFczsZbaBtzUF5SKZyN2K7shmvIXl+5DvP8KGEyHU5W5UBlXegwrJh2wgANo2R HfiSMaWVS3r2vJPZYz1khapc8SoUfzYkgcRuBsvR655J2fnFfhwyrBzJD1r5dwf1uO0M nlWsk6Q41w1oM9sLs3xninntFHE3fnncplYaiXv3AwOawovsaOnZ3CNZw70+oQ9vT7n1 s0ZA== 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=Z1Y8wAod0N8IGtMKf/AXEDv08+52shl9OQVeH38eP5U=; b=OHGZEqynr4Bump5rupHVScqYcegiNxJn77LrEBERZ4Rso3JUyZNWBtGzhM5oZFVUkO qAAEJyfIdwsoJVashyNuXp5vUb61ze5v67vxN9y1DXtPGMaG6affhzDjXy6Ye5MXzYIV L5YdK9oPLSu/D4vKOJP1iFNMdVaI04KJHZlPRyVJcsUaT/CqrvYJuuKcagfqvIONqqJ8 wXUEDDW2k909u2610k9BViHZhIcdfxyUPCDkef1Ldwsg5wp2aBIsXUjL/Mfz/FQ4jZIG JQ5cFeWTcbHrd8N0hxp4w/kOAgpPfqxu6qTA27RgejgIBHZBRuSlPDbsks86PNKNUfaH dExQ== 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 h1-20020a0564020e8100b00463525e8776si10770480eda.491.2022.11.08.03.26.14; Tue, 08 Nov 2022 03:26:15 -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 469C468BA7C; Tue, 8 Nov 2022 13:26:10 +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 4CEBA68082D for ; Tue, 8 Nov 2022 13:26:03 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 1C8232400F5 for ; Tue, 8 Nov 2022 12:26:02 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 0Ok_0pGMrcHM for ; Tue, 8 Nov 2022 12:26:01 +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 DA0452404F8 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 969033A1977 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:50 +0100 Message-Id: <20221108112550.8375-5-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 5/5] fftools/ffmpeg: make demuxing with one file always blocking 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: spuEV1U3oFbT --- fftools/ffmpeg_demux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 8ea5318148..b32bac217d 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -363,8 +363,9 @@ static int thread_start(Demuxer *d) if (d->thread_queue_size <= 0) d->thread_queue_size = (nb_input_files > 1 ? 8 : 1); - if (f->ctx->pb ? !f->ctx->pb->seekable : - strcmp(f->ctx->iformat->name, "lavfi")) + if (nb_input_files > 1 && + (f->ctx->pb ? !f->ctx->pb->seekable : + strcmp(f->ctx->iformat->name, "lavfi"))) d->non_blocking = 1; ret = av_thread_message_queue_alloc(&d->in_thread_queue, d->thread_queue_size, sizeof(DemuxMsg));