diff mbox series

[FFmpeg-devel,1/6] avradio/sdrdemux: end on EOF dont wraparound

Message ID 20230704222302.1129450-1-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/6] avradio/sdrdemux: end on EOF dont wraparound | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Michael Niedermayer July 4, 2023, 10:22 p.m. UTC 
This is more usefull for testing

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/sdrdemux.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer July 5, 2023, 11:16 p.m. UTC | #1 
On Wed, Jul 05, 2023 at 12:22:57AM +0200, Michael Niedermayer wrote:
> This is more usefull for testing
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavradio/sdrdemux.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

will apply patchset

[...]
diff mbox series

Patch

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;