[FFmpeg-devel] [PATCH 1/6] avradio/sdrinradio: Check tuner before applying rtlsdr frequency correction

[FFmpeg-devel] [PATCH 1/6] avradio/sdrinradio: Check tuner before applying rtlsdr frequency correction

[Michael Niedermayer]

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

diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c
index c24a30d746..5c14250f8c 100644
--- a/libavradio/sdrinradio.c
+++ b/libavradio/sdrinradio.c
@@ -103,6 +103,7 @@ static int64_t sdrindev_set_frequency_callback(SDRContext *sdr, int64_t freq)
     SoapySDRDevice *soapy = sdr->soapy;
     if (soapy) {
         if (sdr->rtlsdr_fixes>0) {
+            AVDictionaryEntry *e = av_dict_get(sdr->driver_dict, "tuner", NULL, 0);
             // The official unmodified RTLSDR needs to be put in Direct sampling Q-ADC mode below 24Mhz and non direct sampling above
             const char *value = freq < 24000000 ? "2" : "0";
             if (!sdr->current_direct_samp || strcmp(value, sdr->current_direct_samp)) {
@@ -112,12 +113,14 @@ static int64_t sdrindev_set_frequency_callback(SDRContext *sdr, int64_t freq)
                 } else
                     sdr->current_direct_samp = value;
             }
-            //The R820T has a 16 bit fractional PLL which can do only multiplies of 439.45
-            //Its more complex but this approximation works
-            //It has to be noted that SOAPY does not tell us about this, instead saopy
-            //pretends whatever we ask for we get exactly, but we dont
-            //For more details see: michelebavaro.blogspot.com/2014/05/gnss-carrier-phase-rtlsdr-and.html
-            freq = lrint(freq / 439.45) * 439.45;
+            if (e && strstr(e->value, "R820T")) {
+                //The R820T has a 16 bit fractional PLL which can do only multiplies of 439.45
+                //Its more complex but this approximation works
+                //It has to be noted that SOAPY does not tell us about this, instead saopy
+                //pretends whatever we ask for we get exactly, but we dont
+                //For more details see: michelebavaro.blogspot.com/2014/05/gnss-carrier-phase-rtlsdr-and.html
+                freq = lrint(freq / 439.45) * 439.45;
+            }
         }
 
         if (SoapySDRDevice_setFrequency(soapy, SOAPY_SDR_RX, 0, freq, NULL) != 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".

[FFmpeg-devel] [PATCH 2/6] avradio/sdr: Factor bug workaround detection code out.

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/sdr.h        | 5 +++++
 libavradio/sdrdemux.c   | 8 ++++++++
 libavradio/sdrinradio.c | 5 +----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libavradio/sdr.h b/libavradio/sdr.h
index de0a479d26..7d7bfd6806 100644
--- a/libavradio/sdr.h
+++ b/libavradio/sdr.h
@@ -290,6 +290,11 @@ extern const AVOption ff_sdr_options[];
 
 extern ModulationDescriptor ff_sdr_modulation_descs[];
 
+/**
+ * Detect hw bug specific workarounds.
+ */
+void ff_sdr_autodetect_workarounds(SDRContext *sdr);
+
 /**
  * Set the center frequency of the hardware
  * this will check the argument and call set_frequency_callback()
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index bb33c69668..b0b63827eb 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -99,6 +99,14 @@ static void apply_deemphasis(SDRContext *sdr, AVComplexFloat *data, int len, int
     }
 }
 
+void ff_sdr_autodetect_workarounds(SDRContext *sdr)
+{
+    if (sdr->rtlsdr_fixes < 0)
+        sdr->rtlsdr_fixes = !strcmp(sdr->driver_name, "rtlsdr");
+    if (sdr->sdrplay_fixes < 0)
+        sdr->sdrplay_fixes = !strcmp(sdr->driver_name, "sdrplay");
+}
+
 static void free_station(Station *station)
 {
     if (station->stream)
diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c
index 5c14250f8c..2865b6a9a6 100644
--- a/libavradio/sdrinradio.c
+++ b/libavradio/sdrinradio.c
@@ -212,10 +212,7 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s)
     if (!sdr->driver_name)
         return AVERROR(EINVAL); //No driver specified and none found
 
-    if (sdr->rtlsdr_fixes < 0)
-        sdr->rtlsdr_fixes = !strcmp(sdr->driver_name, "rtlsdr");
-    if (sdr->sdrplay_fixes < 0)
-        sdr->sdrplay_fixes = !strcmp(sdr->driver_name, "sdrplay");
+    ff_sdr_autodetect_workarounds(sdr);
 
     SoapySDRKwargs_set(&args, "driver", sdr->driver_name);
     sdr->soapy = soapy = SoapySDRDevice_make(&args);
-- 
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".

[FFmpeg-devel] [PATCH 3/6] avradio/sdrdemux: Call ff_sdr_autodetect_workarounds() from common init

[Michael Niedermayer]

This way it is also available for file input from specific hw

Signed-off-by: Michael Niedermayer <michael@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");
 
-- 
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".

[FFmpeg-devel] [PATCH 4/6] avradio/sdrdemux: Skiping detection of AM stations at DC point

[Michael Niedermayer]

Also use this to detect a DC offset instead of the driver

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/sdr.h      |  1 +
 libavradio/sdrdemux.c | 11 ++++++++++-
 tests/ref/fate/sdr-am | 38 +++++++++++++++-----------------------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/libavradio/sdr.h b/libavradio/sdr.h
index 7d7bfd6806..a5a291ee37 100644
--- a/libavradio/sdr.h
+++ b/libavradio/sdr.h
@@ -260,6 +260,7 @@ typedef struct SDRContext {
 
     int rtlsdr_fixes;
     int sdrplay_fixes;
+    int dc_fix;
 } SDRContext;
 
 typedef struct ModulationDescriptor {
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 123a1a9d0f..25f0012777 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -596,6 +596,14 @@ static int probe_am(SDRContext *sdr)
                     continue;
                 }
 
+                if (i == sdr->block_size) {
+                    if (sdr->dc_fix < 0) {
+                        sdr->dc_fix = 1;
+                        av_log(sdr->avfmt, AV_LOG_INFO, "Skiping AM station detection at DC point and enabling DC correction\n");
+                        continue;
+                    }
+                }
+
                 create_candidate_station(sdr, AM, INDEX2F(peak_i), bandwidth_f, score);
             }
         }
@@ -1931,7 +1939,7 @@ process_next_block:
     if (sdr->sample_size == 2) {
         const int8_t *halfblock0 = fifo_element[0].halfblock;
         const int8_t *halfblock1 = fifo_element[1].halfblock;
-        if (sdr->rtlsdr_fixes>0) {
+        if (sdr->dc_fix>0) {
             int sum = 0;
             float offset;
             for (i = 0; i<2*sdr->block_size; i++)
@@ -2274,6 +2282,7 @@ const AVOption ff_sdr_options[] = {
     { "driver"  , "sdr driver name"  , OFFSET(driver_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC},
     { "rtlsdr_fixes" , "workaround rtlsdr issues", OFFSET(rtlsdr_fixes), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC},
     { "sdrplay_fixes" , "workaround sdrplay issues", OFFSET(sdrplay_fixes), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC},
+    { "dc_fix" , "Apply DC correction", OFFSET(dc_fix), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC},
     { "sdr_sr"  , "sdr sample rate"  , OFFSET(sdr_sample_rate ), AV_OPT_TYPE_INT , {.i64 = 0}, 0, INT_MAX, DEC},
     { "sdr_freq", "sdr frequency"    , OFFSET(user_wanted_freq), AV_OPT_TYPE_INT64 , {.i64 = 9000000}, 0, INT64_MAX, DEC},
     { "gain" , "sdr overall gain",  OFFSET(sdr_gain),  AV_OPT_TYPE_INT , {.i64 =  GAIN_SDR_AGC}, -3, INT_MAX, DEC, "gain"},
diff --git a/tests/ref/fate/sdr-am b/tests/ref/fate/sdr-am
index b8a34ee488..e2ae353902 100644
--- a/tests/ref/fate/sdr-am
+++ b/tests/ref/fate/sdr-am
@@ -28,28 +28,20 @@
 #codec_id 5: pcm_u8
 #sample_rate 5: 16000
 #channel_layout_name 5: stereo
-#tb 6: 1/16000
-#media_type 6: audio
-#codec_id 6: pcm_u8
-#sample_rate 6: 16000
-#channel_layout_name 6: stereo
 0,          0,          0,        1,   320000, 0x816a0964
 0,          1,          1,        1,   320000, 0x140ce2da
-1,       2048,       2048,     1024,     2048, 0x2276fdd1
-2,       2048,       2048,     1024,     2048, 0x4d31ff0f
-3,       2048,       2048,     1024,     2048, 0x3cd002ad
-4,       2048,       2048,     1024,     2048, 0x8bdd034d
-5,       2048,       2048,     1024,     2048, 0xc6430169
-1,       3072,       3072,     1024,     2048, 0xa0810031
-2,       3072,       3072,     1024,     2048, 0xb307000d
-3,       3072,       3072,     1024,     2048, 0x3f6d01d4
-4,       3072,       3072,     1024,     2048, 0x2de9fde9
-5,       3072,       3072,     1024,     2048, 0xad7efe6f
-6,       3072,       3072,     1024,     2048, 0x9c840168
-1,       4096,       4096,     1024,     2048, 0x61a50250
-2,       4096,       4096,     1024,     2048, 0x7e7cfe03
-3,       4096,       4096,     1024,     2048, 0x6561fc7b
-4,       4096,       4096,     1024,     2048, 0xdcd6ff8d
-5,       4096,       4096,     1024,     2048, 0xedac0493
-6,       4096,       4096,     1024,     2048, 0x970a0066
-0,          3,          3,        1,   320000, 0x9fb0c309
+1,       2048,       2048,     1024,     2048, 0x4d31ff0f
+2,       2048,       2048,     1024,     2048, 0x3cd002ad
+3,       2048,       2048,     1024,     2048, 0x8bdd034d
+4,       2048,       2048,     1024,     2048, 0xc6430169
+1,       3072,       3072,     1024,     2048, 0xb307000d
+2,       3072,       3072,     1024,     2048, 0x3f6d01d4
+3,       3072,       3072,     1024,     2048, 0x2de9fde9
+4,       3072,       3072,     1024,     2048, 0xad7efe6f
+5,       3072,       3072,     1024,     2048, 0x9c840168
+1,       4096,       4096,     1024,     2048, 0x7e7cfe03
+2,       4096,       4096,     1024,     2048, 0x6561fc7b
+3,       4096,       4096,     1024,     2048, 0xdcd6ff8d
+4,       4096,       4096,     1024,     2048, 0xedac0493
+5,       4096,       4096,     1024,     2048, 0x970a0066
+0,          3,          3,        1,   320000, 0x6ea8fa49
-- 
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".

[FFmpeg-devel] [PATCH 5/6] avradio/sdrinradio: apply R820T correction only for non direct mode

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/sdrinradio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c
index 2865b6a9a6..ab7e786744 100644
--- a/libavradio/sdrinradio.c
+++ b/libavradio/sdrinradio.c
@@ -113,7 +113,7 @@ static int64_t sdrindev_set_frequency_callback(SDRContext *sdr, int64_t freq)
                 } else
                     sdr->current_direct_samp = value;
             }
-            if (e && strstr(e->value, "R820T")) {
+            if (e && strstr(e->value, "R820T") && !strcmp(value, "0")) {
                 //The R820T has a 16 bit fractional PLL which can do only multiplies of 439.45
                 //Its more complex but this approximation works
                 //It has to be noted that SOAPY does not tell us about this, instead saopy
-- 
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".

[FFmpeg-devel] [PATCH 6/6] avradio/sdr: Add am_multiple parameter to allow restricting detected AM stations

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/sdr.h      |  2 ++
 libavradio/sdrdemux.c | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/libavradio/sdr.h b/libavradio/sdr.h
index a5a291ee37..6d11ef794f 100644
--- a/libavradio/sdr.h
+++ b/libavradio/sdr.h
@@ -212,7 +212,9 @@ typedef struct SDRContext {
 
     float am_threshold;
     float fm_threshold;
+    float am_multiple;
     float fm_multiple;
+    float am_multiple_tolerance;
 
     pthread_t hw_thread;
     int thread_started;
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 25f0012777..3b24cfedef 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -589,6 +589,7 @@ static int probe_am(SDRContext *sdr)
             if (max_in_range(sdr, i-half_bw_i, i-4) < mid*AM_MAX4 &&
                 max_in_range(sdr, i+4, i+half_bw_i) < mid*AM_MAX4) {
                 double peak_i = find_peak_macleod(sdr, sdr->block, i, 2*sdr->block_size, NULL);
+                double f = INDEX2F(peak_i);
                 if (peak_i < 0)
                     continue;
                 if (fabs(peak_i-i) > 1.0) {
@@ -604,7 +605,13 @@ static int probe_am(SDRContext *sdr)
                     }
                 }
 
-                create_candidate_station(sdr, AM, INDEX2F(peak_i), bandwidth_f, score);
+                if (sdr->am_multiple) {
+                    double f2 = lrint(f / sdr->am_multiple) * sdr->am_multiple;
+                    if (fabs(f2 - f) > sdr->am_multiple_tolerance)
+                        continue;
+                }
+
+                create_candidate_station(sdr, AM, f, bandwidth_f, score);
             }
         }
     }
@@ -2319,7 +2326,9 @@ const AVOption ff_sdr_options[] = {
 
     { "am_threshold"     , "AM detection threshold", OFFSET(am_threshold), AV_OPT_TYPE_FLOAT, {.dbl = 20}, 0, FLT_MAX, DEC},
     { "fm_threshold"     , "FM detection threshold", OFFSET(fm_threshold), AV_OPT_TYPE_FLOAT, {.dbl = 50}, 0, FLT_MAX, DEC},
+    { "am_multiple"      , "AM frequency mutiple",   OFFSET(am_multiple ), AV_OPT_TYPE_FLOAT, {.dbl =  0}, 0, FLT_MAX, DEC},
     { "fm_multiple"      , "FM frequency mutiple",   OFFSET(fm_multiple ), AV_OPT_TYPE_FLOAT, {.dbl =  0}, 0, FLT_MAX, DEC},
+    { "am_multiple_tolerance", "AM frequency mutiple tolerance", OFFSET(am_multiple_tolerance), AV_OPT_TYPE_FLOAT, {.dbl =  60}, 0, FLT_MAX, DEC},
 
     { NULL },
 };
-- 
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".

Re: [FFmpeg-devel] [PATCH 1/6] avradio/sdrinradio: Check tuner before applying rtlsdr frequency correction

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 429 bytes --]

On Mon, Jul 24, 2023 at 08:35:30PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavradio/sdrinradio.c | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)

will apply patchset to libavradio repository

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

You can kill me, but you cannot change the truth.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".