[FFmpeg-cvslog] [ffmpeg-radio] 03/06: avradio/sdrdemux: Call ff_sdr_autodetect_workarounds() from common init

Michael Niedermayer ffmpeg-git at ffmpeg.org
Thu Jul 27 23:29:26 EEST 2023


This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository libavradio.

commit c6f439a4fad1d80e20c7642610e6e4e091044784
Author:     Michael Niedermayer <michael at niedermayer.cc>
AuthorDate: Mon Jul 24 19:23:06 2023 +0200
Commit:     Michael Niedermayer <michael at niedermayer.cc>
CommitDate: Mon Jul 24 19:31:19 2023 +0200

    avradio/sdrdemux: Call ff_sdr_autodetect_workarounds() from common init
    
    This way it is also available for file input from specific hw
    
    Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavradio/sdrdemux.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index b0b63827eb..123a1a9d0f 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -101,9 +101,9 @@ static void apply_deemphasis(SDRContext *sdr, AVComplexFloat *data, int len, int
 
 void ff_sdr_autodetect_workarounds(SDRContext *sdr)
 {
-    if (sdr->rtlsdr_fixes < 0)
+    if (sdr-> rtlsdr_fixes < 0 && sdr->driver_name)
         sdr->rtlsdr_fixes = !strcmp(sdr->driver_name, "rtlsdr");
-    if (sdr->sdrplay_fixes < 0)
+    if (sdr->sdrplay_fixes < 0 && sdr->driver_name)
         sdr->sdrplay_fixes = !strcmp(sdr->driver_name, "sdrplay");
 }
 
@@ -1537,6 +1537,8 @@ int ff_sdr_common_init(AVFormatContext *s)
     sdr->avfmt = s;
     s->ctx_flags |= AVFMTCTX_NOHEADER;
 
+    ff_sdr_autodetect_workarounds(sdr);
+
     if (sdr->bandwidth > sdr->sdr_sample_rate * 7 / 8)
         av_log(s, AV_LOG_WARNING, "Bandwidth looks suspicious\n");
 



More information about the ffmpeg-cvslog mailing list