1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-02-06 22:20:09 +00:00

Merge pull request #55 from odrisci/fix_54

[WIP] fix for #54
This commit is contained in:
Carles Fernandez 2017-06-17 10:29:30 +02:00 committed by GitHub
commit 3cec11ed0e

View File

@ -174,6 +174,8 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
DLOG(INFO) << "file_source(" << file_source_->unique_id() << ")"; DLOG(INFO) << "file_source(" << file_source_->unique_id() << ")";
size_t output_item_size = ( is_complex_ ? sizeof( gr_complex ) : sizeof( float ) );
if (samples_ == 0) // read all file if (samples_ == 0) // read all file
{ {
/*! /*!
@ -211,19 +213,19 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
LOG(INFO) << "Total number samples to be processed= " << samples_ << " GNSS signal duration= " << signal_duration_s << " [s]"; LOG(INFO) << "Total number samples to be processed= " << samples_ << " GNSS signal duration= " << signal_duration_s << " [s]";
std::cout << "GNSS signal recorded time to be processed: " << signal_duration_s << " [s]" << std::endl; std::cout << "GNSS signal recorded time to be processed: " << signal_duration_s << " [s]" << std::endl;
valve_ = gnss_sdr_make_valve(sizeof(gr_complex), samples_, queue_); valve_ = gnss_sdr_make_valve(output_item_size, samples_, queue_);
DLOG(INFO) << "valve(" << valve_->unique_id() << ")"; DLOG(INFO) << "valve(" << valve_->unique_id() << ")";
if (dump_) if (dump_)
{ {
//sink_ = gr_make_file_sink(item_size_, dump_filename_.c_str()); //sink_ = gr_make_file_sink(item_size_, dump_filename_.c_str());
sink_ = gr::blocks::file_sink::make(sizeof(gr_complex), dump_filename_.c_str()); sink_ = gr::blocks::file_sink::make(output_item_size, dump_filename_.c_str());
DLOG(INFO) << "file_sink(" << sink_->unique_id() << ")"; DLOG(INFO) << "file_sink(" << sink_->unique_id() << ")";
} }
if (enable_throttle_control_) if (enable_throttle_control_)
{ {
throttle_ = gr::blocks::throttle::make(sizeof(gr_complex), sampling_frequency_); throttle_ = gr::blocks::throttle::make(output_item_size, sampling_frequency_);
} }
DLOG(INFO) << "File source filename " << filename_; DLOG(INFO) << "File source filename " << filename_;
DLOG(INFO) << "Samples " << samples_; DLOG(INFO) << "Samples " << samples_;