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) {