From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4745846BD2 for ; Tue, 4 Jul 2023 22:23:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6928168C645; Wed, 5 Jul 2023 01:23:11 +0300 (EEST) Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDFB068C21C for ; Wed, 5 Jul 2023 01:23:04 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id BA5D7C0002 for ; Tue, 4 Jul 2023 22:23:03 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 5 Jul 2023 00:22:57 +0200 Message-Id: <20230704222302.1129450-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avradio/sdrdemux: end on EOF dont wraparound 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is more usefull for testing Signed-off-by: Michael Niedermayer --- libavradio/sdrdemux.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index d24e09ede2..cb5e7afb2f 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -1045,9 +1045,11 @@ static int sdrfile_read_callback(SDRContext *sdr, FIFOElement *fifo_element, int size = FFMIN(remaining, sdr->remaining_file_block_size) * sdr->sample_size; ret = avio_read(avfmt->pb, buffer, size); if (ret == AVERROR_EOF || (ret > 0 && ret % sdr->sample_size)) { + fifo_element->center_frequency = AVERROR_EOF; + ret = remaining * sdr->sample_size; + sdr->remaining_file_block_size = remaining; avio_seek(avfmt->pb, SEEK_SET, 0); - av_log(avfmt, AV_LOG_INFO, "EOF, will wraparound\n"); - return AVERROR(EAGAIN); + av_log(avfmt, AV_LOG_INFO, "EOF\n"); } else if (ret == AVERROR(EAGAIN)) { av_log(avfmt, AV_LOG_DEBUG, "read EAGAIN\n"); return AVERROR(EAGAIN); @@ -1621,6 +1623,8 @@ process_next_block: av_log(s, AV_LOG_DEBUG, "EAGAIN on not enough data\n"); return AVERROR(EAGAIN); } + if (fifo_element[0].center_frequency == AVERROR_EOF || fifo_element[1].center_frequency == AVERROR_EOF) + return AVERROR_EOF; if (fifo_element[0].center_frequency != fifo_element[1].center_frequency) { av_log(s, AV_LOG_DEBUG, "Mismatching frequency blocks\n"); // fifo_element[0].center_frequency = 0; -- 2.31.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".