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;