From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg_demux: do not set AVFMT_FLAG_NONBLOCK
Date: Tue, 8 Nov 2022 12:25:49 +0100
Message-ID: <20221108112550.8375-4-anton@khirnov.net> (raw)
In-Reply-To: <20221108112550.8375-1-anton@khirnov.net>
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;
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-11-08 11:26 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 11:25 [FFmpeg-devel] [PATCH 1/5] lavf/rtpdec_asf: " Anton Khirnov
2022-11-08 11:25 ` [FFmpeg-devel] [PATCH 2/5] lavf/demux: treat EAGAIN as REDO unless AVFMT_FLAG_NONBLOCK is set Anton Khirnov
2022-11-10 12:28 ` Michael Niedermayer
2022-11-10 12:31 ` Anton Khirnov
2022-11-10 12:52 ` Paul B Mahol
2022-11-10 13:33 ` Anton Khirnov
2022-11-10 19:52 ` Michael Niedermayer
2022-11-14 9:23 ` Anton Khirnov
2022-11-14 10:44 ` Nicolas George
2022-11-14 11:00 ` Anton Khirnov
2022-11-14 11:05 ` Nicolas George
2022-11-14 11:12 ` Anton Khirnov
2022-11-14 12:40 ` Nicolas George
2022-11-14 16:17 ` Anton Khirnov
2022-11-14 16:22 ` Nicolas George
2022-11-08 11:25 ` [FFmpeg-devel] [PATCH 3/5] lavf: replace FFERROR_REDO with AVERROR(EAGAIN) Anton Khirnov
2022-11-08 12:54 ` Nicolas George
2022-11-08 14:07 ` Anton Khirnov
2022-11-08 14:15 ` Nicolas George
2022-11-08 16:39 ` Anton Khirnov
2022-11-09 8:21 ` Nicolas George
2022-11-09 8:44 ` Paul B Mahol
2022-11-09 9:21 ` Nicolas George
2022-11-09 9:23 ` Paul B Mahol
2022-11-09 9:29 ` Nicolas George
2022-11-09 9:31 ` Anton Khirnov
2022-11-09 9:38 ` Nicolas George
2022-11-09 10:17 ` Anton Khirnov
2022-11-09 10:41 ` Nicolas George
2022-11-09 11:53 ` Anton Khirnov
2022-11-09 12:42 ` Nicolas George
2022-11-08 11:25 ` Anton Khirnov [this message]
2022-11-08 11:25 ` [FFmpeg-devel] [PATCH 5/5] fftools/ffmpeg: make demuxing with one file always blocking Anton Khirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221108112550.8375-4-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git