session_(session),
srd_session_(nullptr),
logic_mux_data_invalid_(false),
- start_time_(0),
- samplerate_(0),
- samples_decoded_(0),
- frame_complete_(false)
+ current_segment_id_(0),
+ current_segment_(nullptr)
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
stop_srd_session();
- frame_complete_ = false;
- samples_decoded_ = 0;
- currently_processed_segment_ = 0;
- error_message_ = QString();
-
- rows_.clear();
- current_rows_= nullptr;
class_rows_.clear();
+ currently_processed_segment_ = 0;
+ current_segment_ = nullptr;
+ segments_.clear();
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
+ error_message_ = QString();
+
decode_reset();
}
}
}
- prepare_annotation_segment();
-
// Free the logic data and its segment(s) if it needs to be updated
if (logic_mux_data_invalid_)
logic_mux_data_.reset();
if (!logic_mux_data_) {
- const int64_t ch_count = get_assigned_signal_count();
- const int64_t unit_size = (ch_count + 7) / 8;
+ const uint32_t ch_count = get_assigned_signal_count();
+ logic_mux_unit_size_ = (ch_count + 7) / 8;
logic_mux_data_ = make_shared<Logic>(ch_count);
- logic_mux_segment_ = make_shared<LogicSegment>(*logic_mux_data_, unit_size, samplerate_);
- logic_mux_data_->push_segment(logic_mux_segment_);
}
+ // Receive notifications when new sample data is available
+ connect_input_notifiers();
+
+ const uint32_t segment_count = get_input_segment_count();
+
+ if (segment_count == 0) {
+ error_message_ = tr("No input data");
+ return;
+ }
+
+ for (uint32_t i = 0; i < segment_count; i++)
+ create_new_segment();
+
// Make sure the logic output data is complete and up-to-date
logic_mux_interrupt_ = false;
logic_mux_thread_ = std::thread(&DecodeSignal::logic_mux_proc, this);
// Decode the muxed logic data
decode_interrupt_ = false;
decode_thread_ = std::thread(&DecodeSignal::decode_proc, this);
-
- // Receive notifications when new sample data is available
- connect_input_notifiers();
}
QString DecodeSignal::error_message() const
double DecodeSignal::samplerate() const
{
- return samplerate_;
+ double result = 0;
+
+ // TODO For now, we simply return the first samplerate that we have
+ try {
+ const DecodeSegment *segment = &(segments_.at(0));
+ result = segment->samplerate;
+ } catch (out_of_range) {
+ // Do nothing
+ }
+
+ return result;
+}
+
+const pv::util::Timestamp DecodeSignal::start_time() const
+{
+ pv::util::Timestamp result;
+
+ // TODO For now, we simply return the first start time that we have
+ try {
+ const DecodeSegment *segment = &(segments_.at(0));
+ result = segment->start_time;
+ } catch (out_of_range) {
+ // Do nothing
+ }
+
+ return result;
}
-const pv::util::Timestamp& DecodeSignal::start_time() const
+uint32_t DecodeSignal::get_input_segment_count() const
{
- return start_time_;
+ uint64_t count = std::numeric_limits<uint64_t>::max();
+ bool no_signals_assigned = true;
+
+ for (const data::DecodeChannel &ch : channels_)
+ if (ch.assigned_signal) {
+ no_signals_assigned = false;
+
+ const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
+ if (!logic_data || logic_data->logic_segments().empty())
+ return 0;
+
+ // Find the min value of all segment counts
+ if ((uint64_t)(logic_data->logic_segments().size()) < count)
+ count = logic_data->logic_segments().size();
+ }
+
+ return (no_signals_assigned ? 0 : count);
}
int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const
{
// The working sample count is the highest sample number for
- // which all used signals have data available, so go through
- // all channels and use the lowest overall sample count of the
- // current segment
+ // which all used signals have data available, so go through all
+ // channels and use the lowest overall sample count of the segment
int64_t count = std::numeric_limits<int64_t>::max();
bool no_signals_assigned = true;
int64_t result = 0;
- if (segment_id == currently_processed_segment_)
- result = samples_decoded_;
- else
- if (segment_id < currently_processed_segment_)
- // Segment was already decoded fully
- result = get_working_sample_count(segment_id);
- else
- // Segment wasn't decoded at all yet
- result = 0;
+ try {
+ const DecodeSegment *segment = &(segments_.at(segment_id));
+ result = segment->samples_decoded;
+ } catch (out_of_range) {
+ // Do nothing
+ }
return result;
}
void DecodeSignal::get_annotation_subset(
vector<pv::data::decode::Annotation> &dest,
- const decode::Row &row, uint64_t start_sample,
+ const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
uint64_t end_sample) const
{
lock_guard<mutex> lock(output_mutex_);
- if (!current_rows_)
- return;
-
- // TODO Instead of current_rows_, use rows_ and the ID of the segment
-
- const auto iter = current_rows_->find(row);
- if (iter != current_rows_->end())
- (*iter).second.get_annotation_subset(dest,
- start_sample, end_sample);
+ try {
+ const DecodeSegment *segment = &(segments_.at(segment_id));
+ const map<const decode::Row, decode::RowData> *rows =
+ &(segment->annotation_rows);
+
+ const auto iter = rows->find(row);
+ if (iter != rows->end())
+ (*iter).second.get_annotation_subset(dest,
+ start_sample, end_sample);
+ } catch (out_of_range) {
+ // Do nothing
+ }
}
void DecodeSignal::save_settings(QSettings &settings) const
ch.bit_id = id++;
}
-void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
+void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, const int64_t end)
{
// Enforce end to be greater than start
if (end <= start)
return;
- // Fetch all segments and their data
- // TODO Currently, we assume only a single segment exists
+ // Fetch the channel segments and their data
vector<shared_ptr<LogicSegment> > segments;
vector<const uint8_t*> signal_data;
vector<uint8_t> signal_in_bytepos;
for (data::DecodeChannel &ch : channels_)
if (ch.assigned_signal) {
const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
- const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
+
+ shared_ptr<LogicSegment> segment;
+ try {
+ segment = logic_data->logic_segments().at(segment_id);
+ } catch (out_of_range) {
+ qDebug() << "Muxer error for" << name() << ":" << ch.assigned_signal->name() \
+ << "has no logic segment" << segment_id;
+ return;
+ }
segments.push_back(segment);
uint8_t* data = new uint8_t[(end - start) * segment->unit_size()];
signal_in_bitpos.push_back(bitpos % 8);
}
+
+ shared_ptr<LogicSegment> output_segment;
+ try {
+ output_segment = logic_mux_data_->logic_segments().at(segment_id);
+ } catch (out_of_range) {
+ qDebug() << "Muxer error for" << name() << ": no logic mux segment" \
+ << segment_id << "in mux_logic_samples(), mux segments size is" \
+ << logic_mux_data_->logic_segments().size();
+ return;
+ }
+
// Perform the muxing of signal data into the output data
uint8_t* output = new uint8_t[(end - start) * logic_mux_segment_->unit_size()];
unsigned int signal_count = signal_data.size();
void DecodeSignal::logic_mux_proc()
{
+ uint32_t segment_id = 0;
+
+ try {
+ logic_mux_segment_ = logic_mux_data_->logic_segments().front();
+ } catch (out_of_range) {
+ qDebug() << "Muxer error for" << name() << ": no logic mux segments";
+ return;
+ }
+
do {
- const uint64_t input_sample_count = get_working_sample_count(currently_processed_segment_);
+ const uint64_t input_sample_count = get_working_sample_count(segment_id);
const uint64_t output_sample_count = logic_mux_segment_->get_sample_count();
const uint64_t samples_to_process =
const uint64_t sample_count =
min(samples_to_process - processed_samples, chunk_sample_count);
- mux_logic_samples(start_sample, start_sample + sample_count);
+ mux_logic_samples(segment_id, start_sample, start_sample + sample_count);
processed_samples += sample_count;
// ...and process the newly muxed logic data
}
if (samples_to_process == 0) {
- // Wait for more input
- unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
- logic_mux_cond_.wait(logic_mux_lock);
+ // TODO Optimize this by caching the input segment count and only
+ // querying it when the cached value was reached
+ if (segment_id < get_input_segment_count() - 1) {
+ // Process next segment
+ segment_id++;
+
+ try {
+ logic_mux_segment_ = logic_mux_data_->logic_segments().at(segment_id);
+ } catch (out_of_range) {
+ qDebug() << "Muxer error for" << name() << ": no logic mux segment" \
+ << segment_id << "in logic_mux_proc(), mux segments size is" \
+ << logic_mux_data_->logic_segments().size();
+ return;
+ }
+
+ } else {
+ // All segments have been processed
+ logic_mux_data_invalid_ = false;
+
+ // Wait for more input
+ unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
+ logic_mux_cond_.wait(logic_mux_lock);
+ }
}
} while (!logic_mux_interrupt_);
}
data::DecodeChannel *any_channel;
shared_ptr<Logic> logic_data;
+ assert(current_segment_);
+
do {
any_channel = &(*find_if(channels_.begin(), channels_.end(),
[](data::DecodeChannel ch) { return ch.assigned_signal; }));
if (!logic_data->logic_segments().empty()) {
shared_ptr<LogicSegment> first_segment =
any_channel->assigned_signal->logic_data()->logic_segments().front();
- start_time_ = first_segment->start_time();
- samplerate_ = first_segment->samplerate();
- if (samplerate_ > 0)
+
+ current_segment_->start_time = first_segment->start_time();
+ current_segment_->samplerate = first_segment->samplerate();
+ if (current_segment_->samplerate > 0)
samplerate_valid = true;
}
void DecodeSignal::decode_data(
const int64_t abs_start_samplenum, const int64_t sample_count)
{
+ assert(current_segment_);
+
const int64_t unit_size = logic_mux_segment_->unit_size();
const int64_t chunk_sample_count = DecodeChunkLength / unit_size;
{
lock_guard<mutex> lock(output_mutex_);
- samples_decoded_ = chunk_end;
+ current_segment_->samples_decoded = chunk_end;
}
// Notify the frontend that we processed some data and
if (srd_session_)
stop_srd_session();
+ assert(current_segment_);
+
// Create the session
srd_session_new(&srd_session_);
assert(srd_session_);
// Start the session
srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
- g_variant_new_uint64(samplerate_));
+ g_variant_new_uint64(current_segment_->samplerate));
srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
DecodeSignal::annotation_callback, this);
}
}
-void DecodeSignal::prepare_annotation_segment()
+void DecodeSignal::create_new_segment()
{
- // TODO Won't work for multiple segments
- rows_.emplace_back(map<const decode::Row, decode::RowData>());
- current_rows_ = &(rows_.back());
+ // Create logic mux segment if we're recreating the muxed data
+ if (logic_mux_data_invalid_) {
+ const double samplerate =
+ (current_segment_) ? current_segment_->samplerate : 0;
+
+ logic_mux_segment_ = make_shared<LogicSegment>(*logic_mux_data_,
+ logic_mux_unit_size_, samplerate);
+ logic_mux_data_->push_segment(logic_mux_segment_);
+ }
+
+ // Create annotation segment
+ segments_.emplace_back(DecodeSegment());
+ current_segment_ = &(segments_.back());
+
+ // TODO Currently we assume there's only one sample rate
+ current_segment_->samplerate = segments_.front().samplerate;
// Add annotation classes
for (const shared_ptr<decode::Decoder> &dec : stack_) {
// Add a row for the decoder if it doesn't have a row list
if (!decc->annotation_rows)
- (*current_rows_)[Row(decc)] = decode::RowData();
+ (current_segment_->annotation_rows)[Row(decc)] = decode::RowData();
// Add the decoder rows
for (const GSList *l = decc->annotation_rows; l; l = l->next) {
const Row row(decc, ann_row);
// Add a new empty row data object
- (*current_rows_)[row] = decode::RowData();
+ (current_segment_->annotation_rows)[row] = decode::RowData();
}
}
}
assert(pdata->pdo->di);
const srd_decoder *const decc = pdata->pdo->di->decoder;
assert(decc);
- assert(ds->current_rows_);
+ assert(ds->current_segment_);
const srd_proto_data_annotation *const pda =
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
- auto row_iter = ds->current_rows_->end();
+ auto row_iter = ds->current_segment_->annotation_rows.end();
// Try looking up the sub-row of this class
const auto format = pda->ann_class;
const auto r = ds->class_rows_.find(make_pair(decc, format));
if (r != ds->class_rows_.end())
- row_iter = ds->current_rows_->find((*r).second);
+ row_iter = ds->current_segment_->annotation_rows.find((*r).second);
else {
// Failing that, use the decoder as a key
- row_iter = ds->current_rows_->find(Row(decc));
+ row_iter = ds->current_segment_->annotation_rows.find(Row(decc));
}
- if (row_iter == ds->current_rows_->end()) {
+ if (row_iter == ds->current_segment_->annotation_rows.end()) {
qDebug() << "Unexpected annotation: decoder = " << decc <<
", format = " << format;
assert(false);
void DecodeSignal::on_capture_state_changed(int state)
{
// If a new acquisition was started, we need to start decoding from scratch
- if (state == Session::Running)
+ if (state == Session::Running) {
+ logic_mux_data_invalid_ = true;
begin_decode();
+ }
}
void DecodeSignal::on_data_cleared()