mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-10-14 11:41:51 +00:00
Code Issues Releases Wiki Activity

gnss_synchro_monitor: fix decimation

Browse Source 
Consuming input samples only when the decimation counter reaches it's
limit prevents decimation from working correctly. It just changes one-by-one
output to batch output and attempts to decimate batches instead of
individual synchos.
Consume unconditionally in every outer loop iteration and change loop
nesting to make sure, that all channels will be decimated equally and no
batches will be formed.
Add some safty checks against read beyond the end of the buffer and empty
array submission to Gnss_Synchro_Udp_Sink.

Signed-off-by: Vladslav P <vladisslav2011@gmail.com>
This commit is contained in:
Vladslav P
2026-09-04 18:10:08 +03:00
committed by Vladislav P
parent 89a2004d26
commit 431f788a76
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/monitor/gnss_synchro_monitor.cc
+30 -12
View File
@@ -68,27 +68,45 @@ int gnss_synchro_monitor::general_work(int noutput_items __attribute__((unused))
{
// Get the input buffer pointer
const auto** in = reinterpret_cast<const Gnss_Synchro**>(&input_items[0]);
// Convert to a vector and write to the UDP sink
std::vector<Gnss_Synchro> stocks;
// Loop through each input stream channel
// Find maximum number of items across of all inputs
int n_items_max = 0;
for (int channel_index = 0; channel_index < d_nchannels; channel_index++)
{
// Loop through each item in each input stream channel
for (int item_index = 0; item_index < ninput_items[channel_index]; item_index++)
n_items_max = std::max(n_items_max, ninput_items[channel_index]);
}
// Loop through each item in each input stream channel
for (int item_index = 0; item_index < n_items_max; item_index++)
{
// Use the count variable to limit how many items are sent per channel
count++;
// Loop through each input stream channel
for (int channel_index = 0; channel_index < d_nchannels; channel_index++)
{
// Use the count variable to limit how many items are sent per channel
count++;
if (item_index >= ninput_items[channel_index])
{
continue;
}
if (count >= d_decimation_factor)
{
// Convert to a vector and write to the UDP sink
std::vector<Gnss_Synchro> stocks;
stocks.push_back(in[channel_index][item_index]);
udp_sink_ptr->write_gnss_synchro(stocks);
// Reset count variable
count = 0;
// Consume the number of items for the input stream channel
consume(channel_index, ninput_items[channel_index]);
}
// Consume the number of items for the input stream channel
consume(channel_index, 1);
}
if (count >= d_decimation_factor)
{
// Reset count variable
count = 0;
}
}
// Do not send empty datagrams
if (!stocks.empty())
{
udp_sink_ptr->write_gnss_synchro(stocks);
}
// Not producing any outputs