From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7DFF3461DA for ; Sat, 8 Jul 2023 21:27:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6315B68C5EF; Sun, 9 Jul 2023 00:25:55 +0300 (EEST) Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03A7568C59B for ; Sun, 9 Jul 2023 00:25:42 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 41C4C1BF204 for ; Sat, 8 Jul 2023 21:25:41 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 8 Jul 2023 23:25:23 +0200 Message-Id: <20230708212530.109692-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230708212530.109692-1-michael@niedermayer.cc> References: <20230708212530.109692-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/18] avradio/vissualize: rotate waterfall X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Michael Niedermayer --- 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; yframe_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; xframe_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".