mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-11 04:20:03 +00:00
Code Issues Releases Wiki Activity

Fix wrong buffer size

Browse Source
This commit is contained in:
Victor Castillo 2024-08-17 20:22:39 +02:00
parent 33067d631d
commit b368942463
No known key found for this signature in database
GPG Key ID: 8EF1FC8B7182F608
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/signal_source/libs/ion_gsms.cc
View File

@ -41,6 +41,7 @@ IONGSMSFileSource::IONGSMSFileSource(
file_metadata_(file), file_metadata_(file),
block_metadata_(block), block_metadata_(block),
io_buffer_offset_(0), io_buffer_offset_(0),
maximum_item_rate_(0),
chunk_cycle_length_(0) chunk_cycle_length_(0)
{ {
std::filesystem::path data_filepath = metadata_filepath.parent_path() / file.Url().Value(); std::filesystem::path data_filepath = metadata_filepath.parent_path() / file.Url().Value();
@ -58,11 +59,10 @@ IONGSMSFileSource::IONGSMSFileSource(
for (std::size_t i = 0; i < out_count; ++i) for (std::size_t i = 0; i < out_count; ++i)
{ {
output_stream_item_sizes_.push_back(chunk_data_.back()->output_stream_item_size(i)); output_stream_item_sizes_.push_back(chunk_data_.back()->output_stream_item_size(i));
maximum_item_rate_ = std::max(chunk_data_.back()->output_stream_item_rate(i), maximum_item_rate_);
} }
} }
output_stream_count_ = output_stream_offset; output_stream_count_ = output_stream_offset;
io_buffer_.resize((16*1024 - 1) * chunk_cycle_length_);
} }
IONGSMSFileSource::~IONGSMSFileSource() IONGSMSFileSource::~IONGSMSFileSource()
@ -75,6 +75,8 @@ int IONGSMSFileSource::work(
gr_vector_const_void_star& input_items, gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) gr_vector_void_star& output_items)
{ {
const std::size_t max_sample_output = std::floor((noutput_items-1.0) / maximum_item_rate_);
io_buffer_.resize(max_sample_output * chunk_cycle_length_);
io_buffer_offset_ = 0; io_buffer_offset_ = 0;
std::fread(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type), io_buffer_.size(), fd_); std::fread(io_buffer_.data(), sizeof(decltype(io_buffer_)::value_type), io_buffer_.size(), fd_);

1
src/algorithms/signal_source/libs/ion_gsms.h
View File

@ -62,6 +62,7 @@ private:
std::vector<int> items_produced_; std::vector<int> items_produced_;
std::size_t output_stream_count_; std::size_t output_stream_count_;
std::vector<std::size_t> output_stream_item_sizes_; std::vector<std::size_t> output_stream_item_sizes_;
std::size_t maximum_item_rate_;
std::vector<std::shared_ptr<IONGSMSChunkData>> chunk_data_; std::vector<std::shared_ptr<IONGSMSChunkData>> chunk_data_;
std::size_t chunk_cycle_length_; std::size_t chunk_cycle_length_;
}; };

8
src/algorithms/signal_source/libs/ion_gsms_chunk_data.cc
View File

@ -49,12 +49,15 @@ IONGSMSChunkData::IONGSMSChunkData(const GnssMetadata::Chunk& chunk, const std::
streams_.emplace_back(lump, stream, GnssMetadata::encoding_from_string(stream.Encoding()),output_streams + output_stream_offset); streams_.emplace_back(lump, stream, GnssMetadata::encoding_from_string(stream.Encoding()),output_streams + output_stream_offset);
++output_streams; ++output_streams;
std::size_t sample_bitsize = stream.Packedbits() / stream.RateFactor(); std::size_t sample_bitsize = stream.Packedbits() / stream.RateFactor();
std::size_t sample_rate = stream.RateFactor();
if (stream.Packedbits() >= 2 * stream.RateFactor() * stream.Quantization()) if (stream.Packedbits() >= 2 * stream.RateFactor() * stream.Quantization())
{ {
// Samples have 'Complex' format // Samples have 'Complex' format
sample_bitsize /= 2; sample_bitsize /= 2;
sample_rate *= 2;
} }
output_stream_item_size_.push_back(bits_to_item_size(sample_bitsize)); output_stream_item_size_.push_back(bits_to_item_size(sample_bitsize));
output_stream_item_rate_.push_back(sample_rate);
} }
else else
{ {
@ -116,6 +119,11 @@ std::size_t IONGSMSChunkData::output_stream_item_size(std::size_t stream_index)
return output_stream_item_size_[stream_index]; return output_stream_item_size_[stream_index];
} }
std::size_t IONGSMSChunkData::output_stream_item_rate(std::size_t stream_index) const
{
return output_stream_item_rate_[stream_index];
}
template <typename WT> template <typename WT>
void IONGSMSChunkData::unpack_words(gr_vector_void_star& outputs, std::vector<int>& output_items) void IONGSMSChunkData::unpack_words(gr_vector_void_star& outputs, std::vector<int>& output_items)

2
src/algorithms/signal_source/libs/ion_gsms_chunk_data.h
View File

@ -93,6 +93,7 @@ public:
std::size_t output_stream_count() const; std::size_t output_stream_count() const;
std::size_t output_stream_item_size(std::size_t stream_index) const; std::size_t output_stream_item_size(std::size_t stream_index) const;
std::size_t output_stream_item_rate(std::size_t stream_index) const;
private: private:
template <typename WT> template <typename WT>
@ -126,6 +127,7 @@ private:
uint8_t padding_bitsize_; uint8_t padding_bitsize_;
std::size_t output_stream_count_; std::size_t output_stream_count_;
std::vector<std::size_t> output_stream_item_size_; std::vector<std::size_t> output_stream_item_size_;
std::vector<std::size_t> output_stream_item_rate_;
struct stream_metadata_t struct stream_metadata_t
{ {