[FFmpeg-devel] [PATCH 1/5] avradio/vissualize: support simple skiping of chars

[FFmpeg-devel] [PATCH 1/5] avradio/vissualize: support simple skiping of chars

[Michael Niedermayer]

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

diff --git a/libavradio/vissualize.c b/libavradio/vissualize.c
index a3dcf5801b..2d397546dc 100644
--- a/libavradio/vissualize.c
+++ b/libavradio/vissualize.c
@@ -81,8 +81,11 @@ static void draw_char(uint8_t *frame_buffer, ptrdiff_t stride, char ch, int x0,
     }
 }
 
-static void draw_string(uint8_t *frame_buffer, ptrdiff_t stride, char *str, int x0, int y0, int xd, int yd, int r, int g, int b, int w, int h)
+static void draw_string(uint8_t *frame_buffer, ptrdiff_t stride, char *str, int x0, int y0, int xd, int yd, int r, int g, int b, int w, int h, int skipx)
 {
+    x0 += xd*9*skipx;
+    y0 += yd*9*skipx;
+
     while(*str) {
         draw_char(frame_buffer, stride, *str++, x0, y0, xd, yd, r, g, b, w, h);
         x0 += xd*9;
@@ -206,6 +209,7 @@ int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt)
             int color = s->stream ? 64 : 32;
             int size = s->stream ? 181 : 128;
             int xd = size, yd = size;
+            int pos;
 
             if (!s->in_station_list)
                 continue;
@@ -217,14 +221,14 @@ int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt)
             }
             av_strlcatf(text, sizeof(text), "%f Mhz %d %d %d",
                      f/1000000, (int)s->score, ff_sdr_histogram_score(s), s->timeout);
-            draw_string(pkt->data, 4*w, text, xmid + 8*yd, 320*h2, xd, yd, color, color, color, w, h);
+            draw_string(pkt->data, 4*w, text, xmid + 8*yd, 320*h2, xd, yd, color, color, color, w, h, 0);
             if (s->radiotext[0]) {
-                draw_string(pkt->data, 4*w, s->radiotext, xmid + 8*yd, 320*h2 + 24*yd, xd, yd, color, color, color, w, h);
+                draw_string(pkt->data, 4*w, s->radiotext, xmid + 8*yd, 320*h2 + 24*yd, xd, yd, color, color, color, w, h, 0);
             }
             if (s->title[0] || s->artist[0]) {
                 int len = strlen(s->title) + 1;
-                draw_string(pkt->data, 4*w, s->title , xmid + 8*yd, 320*h2 + 2*24*yd, xd, yd, color, color*1.5, color, w, h);
-                draw_string(pkt->data, 4*w, s->artist, xmid + 8*yd + 9*xd*len, 320*h2 + 2*24*yd + 9*yd*len, xd, yd, color, color*2, color, w, h);
+                draw_string(pkt->data, 4*w, s->title , xmid + 8*yd, 320*h2 + 2*24*yd, xd, yd, color, color*1.5, color, w, h, 0);
+                draw_string(pkt->data, 4*w, s->artist, xmid + 8*yd, 320*h2 + 2*24*yd, xd, yd, color, color*2, color, w, h, len);
             }
         }
     }
-- 
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/5] avradio/vissualize: change color of the active station

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/vissualize.c | 6 ++++--
 tests/ref/fate/sdr-am   | 2 +-
 tests/ref/fate/sdr-fm   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libavradio/vissualize.c b/libavradio/vissualize.c
index 2d397546dc..15d7f9e95f 100644
--- a/libavradio/vissualize.c
+++ b/libavradio/vissualize.c
@@ -219,9 +219,11 @@ int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt)
             } else {
                 snprintf(text, sizeof(text), "%s ", ff_sdr_modulation_descs[s->modulation].shortname);
             }
-            av_strlcatf(text, sizeof(text), "%f Mhz %d %d %d",
+            draw_string(pkt->data, 4*w, text, xmid + 8*yd, 320*h2, xd, yd, color, color, color*(s->stream ? 2 : 1), w, h, 0);
+            pos = strlen(text);
+            snprintf(text, sizeof(text), "%f Mhz %d %d %d",
                      f/1000000, (int)s->score, ff_sdr_histogram_score(s), s->timeout);
-            draw_string(pkt->data, 4*w, text, xmid + 8*yd, 320*h2, xd, yd, color, color, color, w, h, 0);
+            draw_string(pkt->data, 4*w, text, xmid + 8*yd, 320*h2, xd, yd, color, color, color, w, h, pos);
             if (s->radiotext[0]) {
                 draw_string(pkt->data, 4*w, s->radiotext, xmid + 8*yd, 320*h2 + 24*yd, xd, yd, color, color, color, w, h, 0);
             }
diff --git a/tests/ref/fate/sdr-am b/tests/ref/fate/sdr-am
index d0fdc48cf5..b8a34ee488 100644
--- a/tests/ref/fate/sdr-am
+++ b/tests/ref/fate/sdr-am
@@ -52,4 +52,4 @@
 4,       4096,       4096,     1024,     2048, 0xdcd6ff8d
 5,       4096,       4096,     1024,     2048, 0xedac0493
 6,       4096,       4096,     1024,     2048, 0x970a0066
-0,          3,          3,        1,   320000, 0x73e13a75
+0,          3,          3,        1,   320000, 0x9fb0c309
diff --git a/tests/ref/fate/sdr-fm b/tests/ref/fate/sdr-fm
index 0a3aaa48d4..3ae5adc2c0 100644
--- a/tests/ref/fate/sdr-fm
+++ b/tests/ref/fate/sdr-fm
@@ -19,7 +19,7 @@
 2,       8196,       8196,     4096,     8192, 0xb966fb19
 1,      12292,      12292,     4096,     8192, 0x6d8ffe6e
 2,      12292,      12292,     4096,     8192, 0x51d1fb50
-0,          3,          3,        1,   320000, 0x1b178638
+0,          3,          3,        1,   320000, 0xf8b7b144
 1,      16388,      16388,     4096,     8192, 0x8c000600
 2,      16388,      16388,     4096,     8192, 0x335ff20c
-0,          4,          4,        1,   320000, 0x49dd90cc
+0,          4,          4,        1,   320000, 0xab42bbc7
-- 
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/5] avradio/sdr: Remove direct inclusion of pthread.h

[Michael Niedermayer]

Fate tests pass on mingw32 & 64 with this

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

diff --git a/libavradio/sdr.h b/libavradio/sdr.h
index c651ba0d99..4349763bd1 100644
--- a/libavradio/sdr.h
+++ b/libavradio/sdr.h
@@ -22,7 +22,6 @@
 #ifndef AVRADIO_SDR_H
 #define AVRADIO_SDR_H
 
-#include <pthread.h>
 #include <stdatomic.h>
 #include <float.h>
 
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 8967ff1ea9..66130d9662 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -35,7 +35,6 @@
 
 #include "sdr.h"
 
-#include <pthread.h>
 #include <stdatomic.h>
 #include <float.h>
 #include "libavutil/avassert.h"
-- 
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/5] avradio/sdrdemux: avoid literal offsets in dump code

[Michael Niedermayer]

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

diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 66130d9662..09d720de23 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -1842,20 +1842,27 @@ process_next_block:
         sdr->block_center_freq = fifo_element[0].center_frequency;
 
     if (sdr->dump_avio) {
-        uint8_t header[48] = "FFSDR001int16BE";
+        uint8_t header[16] = "FFSDR001int16BE";
         uint8_t *tmp = (void*)sdr->windowed_block; //We use an unused array as temporary here
+        int64_t sizepos, endpos;
 
         if (sdr->sample_size == 2)
             memcpy(header + 11, "08", 2);
 
-        AV_WB32(header+16, sdr->sdr_sample_rate);
-        AV_WB32(header+20, sdr->block_size);
-        AV_WB64(header+24, av_double2int(fifo_element[0].center_frequency));
-        AV_WB64(header+32, sdr->pts);
-        AV_WB32(header+40, sdr->bandwidth);
-        AV_WB32(header+44, sizeof(header));
-
         avio_write(sdr->dump_avio, header, sizeof(header));
+        avio_wb32(sdr->dump_avio, sdr->sdr_sample_rate);
+        avio_wb32(sdr->dump_avio, sdr->block_size);
+        avio_wb64(sdr->dump_avio, av_double2int(fifo_element[0].center_frequency));
+        avio_wb64(sdr->dump_avio, sdr->pts);
+        avio_wb32(sdr->dump_avio, sdr->bandwidth);
+        sizepos = avio_tell(sdr->dump_avio);
+        avio_wb32(sdr->dump_avio, 0);
+
+        endpos = avio_tell(sdr->dump_avio);
+
+        avio_seek(sdr->dump_avio, sizepos, SEEK_SET);
+        avio_wb32(sdr->dump_avio, endpos);
+        avio_seek(sdr->dump_avio, endpos, SEEK_SET);
 
         if (sdr->sample_size == 2) {
             avio_write(sdr->dump_avio, fifo_element[0].halfblock, sdr->block_size * sdr->sample_size);
-- 
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/5] avradio/sdrdemux: store min/max frequency, driver, label and tuner

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavradio/sdr.h        |  1 +
 libavradio/sdrdemux.c   | 35 ++++++++++++++++++++++++++++++++++-
 libavradio/sdrinradio.c | 14 ++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/libavradio/sdr.h b/libavradio/sdr.h
index 4349763bd1..de0a479d26 100644
--- a/libavradio/sdr.h
+++ b/libavradio/sdr.h
@@ -138,6 +138,7 @@ typedef struct SDRContext {
     Mode mode;
     AVRational fps;
     char *driver_name;
+    AVDictionary *driver_dict;
     char *dump_url;
     int fileheader_size;
     AVIOContext *dump_avio;
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index 09d720de23..bb33c69668 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -1723,6 +1723,9 @@ static int sdrfile_initial_setup(AVFormatContext *s)
     } else
         return AVERROR_INVALIDDATA;
 
+    sdr->min_freq = 0;
+    sdr->max_freq = 40 * 1000*1000*1000LL;
+
     avio_skip(s->pb, 3);        //BE
     sdr->sdr_sample_rate = avio_rb32(s->pb);
                            avio_rb32(s->pb); //block_size
@@ -1731,6 +1734,26 @@ static int sdrfile_initial_setup(AVFormatContext *s)
     if (version > AV_RB24("000")) {
         sdr->bandwidth       = avio_rb32(s->pb);
         sdr->fileheader_size = avio_rb32(s->pb);
+        if (sdr->fileheader_size < 48 || sdr->fileheader_size > 100000)
+            return AVERROR_INVALIDDATA;
+        if (version > AV_RB24("001")) {
+            char *tmp = av_malloc(sdr->fileheader_size);
+            if (!tmp)
+                return AVERROR(ENOMEM);
+
+            sdr->min_freq    = avio_rb64(s->pb);
+            sdr->max_freq    = avio_rb64(s->pb);
+            avio_get_str(s->pb, sdr->fileheader_size, tmp, sdr->fileheader_size);
+            sdr->driver_name = av_strdup(tmp);
+
+            avio_get_str(s->pb, sdr->fileheader_size, tmp, sdr->fileheader_size);
+            if (*tmp)
+                av_dict_set(&sdr->driver_dict, "label", tmp, 0);
+
+            avio_get_str(s->pb, sdr->fileheader_size, tmp, sdr->fileheader_size);
+            if (*tmp)
+                av_dict_set(&sdr->driver_dict, "tuner", tmp, 0);
+        }
     } else {
         sdr->bandwidth       = sdr->sdr_sample_rate;
         sdr->fileheader_size = 40;
@@ -1842,9 +1865,11 @@ process_next_block:
         sdr->block_center_freq = fifo_element[0].center_frequency;
 
     if (sdr->dump_avio) {
-        uint8_t header[16] = "FFSDR001int16BE";
+        uint8_t header[16] = "FFSDR002int16BE";
         uint8_t *tmp = (void*)sdr->windowed_block; //We use an unused array as temporary here
         int64_t sizepos, endpos;
+        AVDictionaryEntry *e_label = av_dict_get(sdr->driver_dict, "label", NULL, 0);
+        AVDictionaryEntry *e_tuner = av_dict_get(sdr->driver_dict, "tuner", NULL, 0);
 
         if (sdr->sample_size == 2)
             memcpy(header + 11, "08", 2);
@@ -1858,6 +1883,12 @@ process_next_block:
         sizepos = avio_tell(sdr->dump_avio);
         avio_wb32(sdr->dump_avio, 0);
 
+        avio_wb64(sdr->dump_avio, sdr->min_freq);
+        avio_wb64(sdr->dump_avio, sdr->max_freq);
+        avio_put_str(sdr->dump_avio, sdr->driver_name);
+        avio_put_str(sdr->dump_avio, e_label ? e_label->value : NULL);
+        avio_put_str(sdr->dump_avio, e_tuner ? e_tuner->value : NULL);
+
         endpos = avio_tell(sdr->dump_avio);
 
         avio_seek(sdr->dump_avio, sizepos, SEEK_SET);
@@ -2202,6 +2233,8 @@ int ff_sdr_read_close(AVFormatContext *s)
 
     avio_close(sdr->dump_avio);
 
+    av_dict_free(&sdr->driver_dict);
+
     return 0;
 }
 
diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c
index d12b0b73fe..c24a30d746 100644
--- a/libavradio/sdrinradio.c
+++ b/libavradio/sdrinradio.c
@@ -161,6 +161,7 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s)
     SoapySDRDevice *soapy = NULL;
     SoapySDRStream *soapyRxStream = NULL;
     const char * soapy_format;
+    AVDictionaryEntry *e_label, *e_serial;
 
     sdr->read_callback          = sdrindev_read_callback;
     sdr->set_frequency_callback = sdrindev_set_frequency_callback;
@@ -171,6 +172,7 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s)
     results = SoapySDRDevice_enumerate(NULL, &length);
     for (i = 0; i < length; i++) {
         int usable = 1;
+        int selected = 0;
         for (int j = 0; j < results[i].size; j++) {
             if (!strcmp("driver", results[i].keys[j])) {
                 if (!strcmp("audio", results[i].vals[j])) {
@@ -180,7 +182,11 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s)
                     if (!sdr->driver_name)
                         return AVERROR(ENOMEM);
                 }
+                if(usable)
+                    selected = !strcmp(sdr->driver_name, results[i].vals[j]);
             }
+            if (selected)
+                av_dict_set(&sdr->driver_dict, results[i].keys[j], results[i].vals[j], 0);
         }
         if (!usable)
             continue;
@@ -191,6 +197,14 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s)
     }
     SoapySDRKwargsList_clear(results, length);
 
+    e_serial = av_dict_get(sdr->driver_dict, "serial", NULL, 0);
+    e_label  = av_dict_get(sdr->driver_dict,  "label", NULL, 0);
+    if (e_serial && e_label) {
+        char *p = strstr(e_label->value, e_serial->value);
+        if (p)
+            *p = 0; // we store this in dump url, preserve users privacy
+    }
+
     av_log(s, AV_LOG_INFO, "Opening %s\n", sdr->driver_name);
     if (!sdr->driver_name)
         return AVERROR(EINVAL); //No driver specified and none found
-- 
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/5] avradio/vissualize: support simple skiping of chars

[Michael Niedermayer]

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

On Sat, Jul 22, 2023 at 04:11:00PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavradio/vissualize.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)

will apply patchset (to libavradio repository)

thx

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

No snowflake in an avalanche ever feels responsible. -- Voltaire

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