Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 11/18] avradio/vissualize: rotate waterfall
Date: Sat,  8 Jul 2023 23:25:23 +0200
Message-ID: <20230708212530.109692-11-michael@niedermayer.cc> (raw)
In-Reply-To: <20230708212530.109692-1-michael@niedermayer.cc>

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

diff --git a/libavradio/sdr.h b/libavradio/sdr.h
index 2940ffa389..8a2ab1c78a 100644
--- a/libavradio/sdr.h
+++ b/libavradio/sdr.h
@@ -116,6 +116,7 @@ typedef struct SDRStream {
     int frame_size;
     int frame_buffer_line;
     uint8_t *frame_buffer;
+    int64_t last_block_center_freq;
 } SDRStream;
 
 typedef struct SDRContext {
diff --git a/libavradio/vissualize.c b/libavradio/vissualize.c
index c165e0fb63..b27f78f171 100644
--- a/libavradio/vissualize.c
+++ b/libavradio/vissualize.c
@@ -90,6 +90,14 @@ static void draw_string(uint8_t *frame_buffer, ptrdiff_t stride, char *str, int
     }
 }
 
+static void advance_waterfall(SDRStream *sst, int h) {
+    if (!sst->frame_buffer_line) {
+        memcpy(sst->frame_buffer + sst->frame_size, sst->frame_buffer, sst->frame_size);
+        sst->frame_buffer_line = h-1;
+    } else
+        sst->frame_buffer_line--;
+}
+
 int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt)
 {
     SDRStream *sst = st->priv_data;
@@ -101,6 +109,27 @@ int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt)
     int skip = frame_index == last_index || sdr->missing_streams;
     av_assert0(sdr->missing_streams >= 0);
 
+    if (sdr->block_center_freq) {
+        if (sst->last_block_center_freq) {
+            int last_center = lrint((F2INDEX(sst->last_block_center_freq) - sdr->block_size) * w / (2*sdr->block_size));
+
+            last_center %= w;
+            if (last_center < 0)
+                last_center += w;
+            av_assert0(last_center >= 0 && last_center < w);
+
+            for(int y= 0; y<h - 1; y++) {
+                uint8_t *dst = sst->frame_buffer + 4*w*(sst->frame_buffer_line + y);
+                uint8_t *src = dst + 4*w;
+
+                memcpy(dst + 4*last_center, src,                       4*(w - last_center));
+                memcpy(dst                , src + 4*(w - last_center), 4*     last_center );
+            }
+            advance_waterfall(sst, h);
+        }
+        sst->last_block_center_freq = sdr->block_center_freq;
+    }
+
     for(int x= 0; x<w; x++) {
         int color;
         int idx = 4*(x + sst->frame_buffer_line*w);
@@ -188,11 +217,7 @@ int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt)
         }
     }
 
-    if (!sst->frame_buffer_line) {
-        memcpy(sst->frame_buffer + sst->frame_size, sst->frame_buffer, sst->frame_size);
-        sst->frame_buffer_line = h-1;
-    } else
-        sst->frame_buffer_line--;
+    advance_waterfall(sst, h);
 
 //TODO
 //                 draw RDS*
-- 
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".

  parent reply	other threads:[~2023-07-08 21:27 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-08 21:25 [FFmpeg-devel] [PATCH 01/18] avradio/sdrdemux: Fix uninitialized access Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 02/18] avradio/sdrdemux: factor frequency tolerance constants out Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 03/18] avradio/sdr: Add fm multiple parameter Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 04/18] avradio/sdrinradio: Dont automatically select 2.56Mhz on the rtlsdr Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 05/18] avradio/sdrdemux: Do not timeout negative stations Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 06/18] avradio/sdrinradio: Factor print_and_free_list() out Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 07/18] avradio/sdrinradio: Print list of Time Sources Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 08/18] avradio: split out vissualization code Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 09/18] avradio/sdrdemux: The RTLSDR DC artifact is not consistent Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 10/18] avradio/sdr: eliminate avpriv_* Michael Niedermayer
2023-07-08 21:25 ` Michael Niedermayer [this message]
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 12/18] avradio/sdrdemux: Set AVFMTCTX_NOHEADER Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 13/18] avradio/sdrdemux: fix bug adding candidate stations and then crashing Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 14/18] avradio/sdrdemux: fm_probe: dont allow bandwidh=sample rate Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 15/18] doc: add sdr examples Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 16/18] avradio/sdr: rename fft_p2 Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 17/18] avradio/sdrdemux: more correct phase 2 bandwidth of FM demodulation Michael Niedermayer
2023-07-08 21:25 ` [FFmpeg-devel] [PATCH 18/18] avradio/sdrdemux: Fix DC offset issue in AM demodulation Michael Niedermayer
2023-07-09 23:43 ` [FFmpeg-devel] [PATCH 01/18] avradio/sdrdemux: Fix uninitialized access Michael Niedermayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230708212530.109692-11-michael@niedermayer.cc \
    --to=michael@niedermayer.cc \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git