mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-09-24 09:58:54 +00:00
Code Issues Releases Wiki Activity

Fixes binary on ArchLinux (Fixes: #616)

Browse Source 
Replace some memcpy by std:::copy or std::copy_n
This commit is contained in:
Carles Fernandez
2022-06-13 21:05:29 +02:00
parent 5a32c6cf5e
commit e8fb655fad
28 changed files with 84 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
+3 -4
View File
@@ -20,7 +20,6 @@
#include <volk/volk.h>
#include <algorithm>
#include <cmath>
#include <cstring>
notch_sptr make_notch_filter(float pfa, float p_c_factor,
@@ -75,13 +74,13 @@ int Notch::general_work(int noutput_items, gr_vector_int &ninput_items __attribu
{
if ((n_segments_ < n_segments_est_) && (filter_state_ == false))
{
memcpy(d_fft_->get_inbuf(), in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, d_fft_->get_inbuf());
d_fft_->execute();
volk_32fc_s32f_power_spectrum_32f(power_spect_.data(), d_fft_->get_outbuf(), 1.0, length_);
volk_32f_s32f_calc_spectral_noise_floor_32f(&sig2dB, power_spect_.data(), 15.0, length_);
sig2lin = std::pow(10.0F, (sig2dB / 10.0F)) / (static_cast<float>(n_deg_fred_));
noise_pow_est_ = (static_cast<float>(n_segments_) * noise_pow_est_ + sig2lin) / (static_cast<float>(n_segments_ + 1));
memcpy(out, in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, out);
}
else
{
@@ -109,7 +108,7 @@ int Notch::general_work(int noutput_items, gr_vector_int &ninput_items __attribu
n_segments_ = 0;
}
filter_state_ = false;
memcpy(out, in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, out);
}
}
index_out += length_;
src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
+3 -4
View File
@@ -21,7 +21,6 @@
#include <volk/volk.h>
#include <algorithm>
#include <cmath>
#include <cstring>
notch_lite_sptr make_notch_filter_lite(float p_c_factor, float pfa, int32_t length, int32_t n_segments_est, int32_t n_segments_reset, int32_t n_segments_coeff)
@@ -83,13 +82,13 @@ int NotchLite::general_work(int noutput_items, gr_vector_int &ninput_items __att
{
if ((n_segments_ < n_segments_est_) && (filter_state_ == false))
{
memcpy(d_fft_->get_inbuf(), in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, d_fft_->get_inbuf());
d_fft_->execute();
volk_32fc_s32f_power_spectrum_32f(power_spect_.data(), d_fft_->get_outbuf(), 1.0, length_);
volk_32f_s32f_calc_spectral_noise_floor_32f(&sig2dB, power_spect_.data(), 15.0, length_);
sig2lin = std::pow(10.0F, (sig2dB / 10.0F)) / static_cast<float>(n_deg_fred_);
noise_pow_est_ = (static_cast<float>(n_segments_) * noise_pow_est_ + sig2lin) / static_cast<float>(n_segments_ + 1);
memcpy(out, in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, out);
}
else
{
@@ -126,7 +125,7 @@ int NotchLite::general_work(int noutput_items, gr_vector_int &ninput_items __att
n_segments_ = 0;
}
filter_state_ = false;
memcpy(out, in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, out);
}
}
index_out += length_;
src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
+3 -3
View File
@@ -69,18 +69,18 @@ int pulse_blanking_cc::general_work(int noutput_items, gr_vector_int &ninput_ite
if ((n_segments_ < n_segments_est_) && (last_filtered_ == false))
{
noise_power_estimation_ = (static_cast<float>(n_segments_) * noise_power_estimation_ + segment_energy / static_cast<float>(n_deg_fred_)) / static_cast<float>(n_segments_ + 1);
memcpy(out, in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, out);
}
else
{
if ((segment_energy / noise_power_estimation_) > thres_)
{
memcpy(out, zeros_.data(), sizeof(gr_complex) * length_);
std::copy_n(zeros_.data(), length_, out);
last_filtered_ = true;
}
else
{
memcpy(out, in, sizeof(gr_complex) * length_);
std::copy(in, in + length_, out);
last_filtered_ = false;
if (n_segments_ > n_segments_reset_)
{