From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 2/5] avradio/vissualize: change color of the active station
Date: Sat, 22 Jul 2023 16:11:01 +0200
Message-ID: <20230722141104.3327415-2-michael@niedermayer.cc> (raw)
In-Reply-To: <20230722141104.3327415-1-michael@niedermayer.cc>
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".
next prev parent reply other threads:[~2023-07-22 14:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-22 14:11 [FFmpeg-devel] [PATCH 1/5] avradio/vissualize: support simple skiping of chars Michael Niedermayer
2023-07-22 14:11 ` Michael Niedermayer [this message]
2023-07-22 14:11 ` [FFmpeg-devel] [PATCH 3/5] avradio/sdr: Remove direct inclusion of pthread.h Michael Niedermayer
2023-07-22 14:11 ` [FFmpeg-devel] [PATCH 4/5] avradio/sdrdemux: avoid literal offsets in dump code Michael Niedermayer
2023-07-22 14:11 ` [FFmpeg-devel] [PATCH 5/5] avradio/sdrdemux: store min/max frequency, driver, label and tuner Michael Niedermayer
2023-07-24 17:07 ` [FFmpeg-devel] [PATCH 1/5] avradio/vissualize: support simple skiping of chars 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=20230722141104.3327415-2-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