mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-18 14:34:10 +00:00
Code Issues Releases Wiki Activity

Fixed arithmetic operations on pointers

Browse Source
This commit is contained in:
Victor Castillo 2024-08-17 23:06:24 +02:00
parent 61a9e179b0
commit a99ceafe85
No known key found for this signature in database
GPG Key ID: 8EF1FC8B7182F608
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ int IONGSMSFileSource::work(
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_);
items_produced_.resize(output_items.size()); items_produced_.resize(output_items.size());
for (int i = 0; i < items_produced_.size(); ++i) for (std::size_t i = 0; i < items_produced_.size(); ++i)
{ {
items_produced_[i] = 0; items_produced_[i] = 0;
} }
@ -99,7 +99,7 @@ int IONGSMSFileSource::work(
} }
} }
for (int i = 0; i < items_produced_.size(); ++i) for (std::size_t i = 0; i < items_produced_.size(); ++i)
{ {
produce(i, items_produced_[i]); produce(i, items_produced_[i]);
} }

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

@ -155,7 +155,7 @@ void IONGSMSChunkData::unpack_words(gr_vector_void_star& outputs, std::vector<in
} }
else else
{ {
output_items[output_index] += write_stream_samples(ctx, lump, stream, encoding, outputs[output_index]); output_items[output_index] += write_stream_samples(ctx, lump, stream, encoding, &outputs[output_index]);
} }
} }
} }
@ -166,7 +166,7 @@ std::size_t IONGSMSChunkData::write_stream_samples(
const GnssMetadata::Lump& lump, const GnssMetadata::Lump& lump,
const GnssMetadata::IonStream& stream, const GnssMetadata::IonStream& stream,
const GnssMetadata::StreamEncoding stream_encoding, const GnssMetadata::StreamEncoding stream_encoding,
void*& out) void** out)
{ {
std::size_t sample_bitsize = stream.Packedbits() / stream.RateFactor(); std::size_t sample_bitsize = stream.Packedbits() / stream.RateFactor();
std::size_t sample_count = stream.RateFactor(); std::size_t sample_count = stream.RateFactor();
@ -180,19 +180,19 @@ std::size_t IONGSMSChunkData::write_stream_samples(
if (sample_bitsize <= 8) if (sample_bitsize <= 8)
{ {
write_n_samples<WT, int8_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, out); write_n_samples<WT, int8_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, (int8_t**)(out));
} }
else if (sample_bitsize <= 16) else if (sample_bitsize <= 16)
{ {
write_n_samples<WT, int16_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, out); write_n_samples<WT, int16_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, (int16_t**)(out));
} }
else if (sample_bitsize <= 32) else if (sample_bitsize <= 32)
{ {
write_n_samples<WT, int32_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, out); write_n_samples<WT, int32_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, (int32_t**)(out));
} }
else if (sample_bitsize <= 64) else if (sample_bitsize <= 64)
{ {
write_n_samples<WT, int64_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, out); write_n_samples<WT, int64_t>(ctx, lump.Shift(), sample_bitsize, sample_count, stream_encoding, (int64_t**)(out));
} }
return sample_count; return sample_count;
@ -205,11 +205,11 @@ void IONGSMSChunkData::write_n_samples(
uint8_t sample_bitsize, uint8_t sample_bitsize,
std::size_t sample_count, std::size_t sample_count,
GnssMetadata::StreamEncoding stream_encoding, GnssMetadata::StreamEncoding stream_encoding,
void*& out) OT** out)
{ {
if (lump_shift == GnssMetadata::Lump::shiftRight) if (lump_shift == GnssMetadata::Lump::shiftRight)
{ {
auto* sample = static_cast<OT*>(out); auto* sample = static_cast<OT*>(*out);
sample += sample_count; sample += sample_count;
for (std::size_t i = 0; i < sample_count; ++i) for (std::size_t i = 0; i < sample_count; ++i)
{ {
@ -222,7 +222,7 @@ void IONGSMSChunkData::write_n_samples(
} }
else // if (lump_shift == GnssMetadata::Lump::shiftLeft || lump_shift == GnssMetadata::Lump::shiftUndefined) else // if (lump_shift == GnssMetadata::Lump::shiftLeft || lump_shift == GnssMetadata::Lump::shiftUndefined)
{ {
auto* sample = static_cast<OT*>(out); auto* sample = static_cast<OT*>(*out);
for (std::size_t i = 0; i < sample_count; ++i) for (std::size_t i = 0; i < sample_count; ++i)
{ {
*sample = 0; *sample = 0;
@ -233,7 +233,7 @@ void IONGSMSChunkData::write_n_samples(
} }
} }
out += sample_count * sizeof(OT); (*out) += sample_count;
} }

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

@ -107,7 +107,7 @@ private:
const GnssMetadata::Lump& lump, const GnssMetadata::Lump& lump,
const GnssMetadata::IonStream& stream, const GnssMetadata::IonStream& stream,
GnssMetadata::StreamEncoding stream_encoding, GnssMetadata::StreamEncoding stream_encoding,
void*& out); void** out);
template <typename WT, typename OT> template <typename WT, typename OT>
void write_n_samples( void write_n_samples(
@ -116,7 +116,7 @@ private:
uint8_t sample_bitsize, uint8_t sample_bitsize,
std::size_t sample_count, std::size_t sample_count,
GnssMetadata::StreamEncoding stream_encoding, GnssMetadata::StreamEncoding stream_encoding,
void*& out); OT** out);
static void decode_sample(uint8_t sample_bitsize, auto* sample, GnssMetadata::StreamEncoding encoding); static void decode_sample(uint8_t sample_bitsize, auto* sample, GnssMetadata::StreamEncoding encoding);

13
src/algorithms/signal_source/libs/ion_gsms_metadata_handler.cc
View File

@ -70,9 +70,16 @@ std::vector<IONGSMSFileSource::sptr> IONGSMSMetadataHandler::make_stream_sources
{ {
for (const auto& stream : lump.Streams()) for (const auto& stream : lump.Streams())
{ {
if (std::ranges::any_of(stream_ids.begin(), stream_ids.end(), [&](const std::string& it) { bool found = false;
return stream.Id() == it; for (const auto & stream_id : stream_ids)
})) {
if (stream_id == stream.Id())
{
found = true;
break;
}
}
if (found)
{ {
auto source = gnss_make_shared<IONGSMSFileSource>( auto source = gnss_make_shared<IONGSMSFileSource>(
configuration, configuration,