X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=c0dbb20d8c9aca5f86921459d650ae52b53b906a;hp=6ac66a1ab2af6cbd9e25e5e5f1bac00bf98f2389;hb=8a603e135f0eee0b2665c8ec9caa5f19ae6ee5e4;hpb=767bf4e705c4b977301a956cb8d0c777f7e8c8d4 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 6ac66a1a..c0dbb20d 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -36,6 +36,7 @@ using std::lock_guard; using std::make_pair; using std::make_shared; using std::min; +using std::out_of_range; using std::shared_ptr; using std::unique_lock; using pv::data::decode::Annotation; @@ -55,15 +56,10 @@ DecodeSignal::DecodeSignal(pv::Session &session) : 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) { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); - - set_name(tr("Empty decoder signal")); } DecodeSignal::~DecodeSignal() @@ -79,7 +75,9 @@ const vector< shared_ptr >& DecodeSignal::decoder_stack() const void DecodeSignal::stack_decoder(const srd_decoder *decoder) { assert(decoder); - stack_.push_back(make_shared(decoder)); + const shared_ptr dec = make_shared(decoder); + + stack_.push_back(dec); // Set name if this decoder is the first in the list if (stack_.size() == 1) @@ -88,7 +86,7 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder) // Include the newly created decode channels in the channel lists update_channel_list(); - auto_assign_signals(); + auto_assign_signals(dec); commit_decoder_channels(); begin_decode(); } @@ -145,15 +143,16 @@ void DecodeSignal::reset_decode() stop_srd_session(); - frame_complete_ = false; - samples_decoded_ = 0; - error_message_ = QString(); - - rows_.clear(); class_rows_.clear(); + current_segment_id_ = 0; + segments_.clear(); logic_mux_data_.reset(); logic_mux_data_invalid_ = true; + + error_message_ = QString(); + + decode_reset(); } void DecodeSignal::begin_decode() @@ -199,17 +198,12 @@ void DecodeSignal::begin_decode() return; } - // Add annotation classes + // Map out all the annotation classes for (const shared_ptr &dec : stack_) { assert(dec); const srd_decoder *const decc = dec->decoder(); assert(dec->decoder()); - // Add a row for the decoder if it doesn't have a row list - if (!decc->annotation_rows) - rows_[Row(decc)] = decode::RowData(); - - // Add the decoder rows for (const GSList *l = decc->annotation_rows; l; l = l->next) { const srd_decoder_annotation_row *const ann_row = (srd_decoder_annotation_row *)l->data; @@ -217,10 +211,6 @@ void DecodeSignal::begin_decode() const Row row(decc, ann_row); - // Add a new empty row data object - rows_[row] = decode::RowData(); - - // Map out all the classes for (const GSList *ll = ann_row->ann_classes; ll; ll = ll->next) class_rows_[make_pair(decc, @@ -233,13 +223,21 @@ void DecodeSignal::begin_decode() 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(ch_count); - segment_ = make_shared(*logic_mux_data_, unit_size, samplerate_); - logic_mux_data_->push_segment(segment_); } + // Receive notifications when new sample data is available + connect_input_notifiers(); + + if (get_input_segment_count() == 0) { + error_message_ = tr("No input data"); + return; + } + + create_segments(); + // 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); @@ -247,9 +245,6 @@ void DecodeSignal::begin_decode() // 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 @@ -263,12 +258,16 @@ const vector DecodeSignal::get_channels() const return channels_; } -void DecodeSignal::auto_assign_signals() +void DecodeSignal::auto_assign_signals(const shared_ptr dec) { bool new_assignment = false; // Try to auto-select channels that don't have signals assigned yet for (data::DecodeChannel &ch : channels_) { + // If a decoder is given, auto-assign only its channels + if (dec && (ch.decoder_ != dec)) + continue; + if (ch.assigned_signal) continue; @@ -324,22 +323,31 @@ void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int in double DecodeSignal::samplerate() const { - return samplerate_; + double result = 0; + + // TODO For now, we simply return the first samplerate that we have + if (segments_.size() > 0) + result = segments_.front().samplerate; + + return result; } -const pv::util::Timestamp& DecodeSignal::start_time() const +const pv::util::Timestamp DecodeSignal::start_time() const { - return start_time_; + pv::util::Timestamp result; + + // TODO For now, we simply return the first start time that we have + if (segments_.size() > 0) + result = segments_.front().start_time; + + return result; } -int64_t DecodeSignal::get_working_sample_count() const +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 - - // TODO Currently, we assume only a single segment exists + // 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::max(); bool no_signals_assigned = true; @@ -352,17 +360,31 @@ int64_t DecodeSignal::get_working_sample_count() const if (!logic_data || logic_data->logic_segments().empty()) return 0; - const shared_ptr segment = logic_data->logic_segments().front(); - count = min(count, (int64_t)segment->get_sample_count()); + try { + const shared_ptr segment = logic_data->logic_segments().at(segment_id); + count = min(count, (int64_t)segment->get_sample_count()); + } catch (out_of_range) { + return 0; + } } return (no_signals_assigned ? 0 : count); } -int64_t DecodeSignal::get_decoded_sample_count() const +int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const { lock_guard decode_lock(output_mutex_); - return samples_decoded_; + + int64_t result = 0; + + try { + const DecodeSegment *segment = &(segments_.at(segment_id)); + result = segment->samples_decoded; + } catch (out_of_range) { + // Do nothing + } + + return result; } vector DecodeSignal::visible_rows() const @@ -397,15 +419,23 @@ vector DecodeSignal::visible_rows() const void DecodeSignal::get_annotation_subset( vector &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 lock(output_mutex_); - const auto iter = rows_.find(row); - if (iter != rows_.end()) - (*iter).second.get_annotation_subset(dest, - start_sample, end_sample); + try { + const DecodeSegment *segment = &(segments_.at(segment_id)); + const map *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 @@ -507,6 +537,7 @@ void DecodeSignal::restore_settings(QSettings &settings) } settings.endGroup(); + channels_updated(); } // Restore channel mapping @@ -537,9 +568,56 @@ void DecodeSignal::restore_settings(QSettings &settings) settings.endGroup(); } + // Update the internal structures + update_channel_list(); + commit_decoder_channels(); + begin_decode(); } +uint32_t DecodeSignal::get_input_segment_count() const +{ + uint64_t count = std::numeric_limits::max(); + bool no_signals_assigned = true; + + for (const data::DecodeChannel &ch : channels_) + if (ch.assigned_signal) { + no_signals_assigned = false; + + const shared_ptr 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); +} + +uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const +{ + double samplerate = 0; + + for (const data::DecodeChannel &ch : channels_) + if (ch.assigned_signal) { + const shared_ptr logic_data = ch.assigned_signal->logic_data(); + if (!logic_data || logic_data->logic_segments().empty()) + continue; + + try { + const shared_ptr segment = logic_data->logic_segments().at(segment_id); + samplerate = segment->samplerate(); + } catch (out_of_range) { + // Do nothing + } + break; + } + + return samplerate; +} + void DecodeSignal::update_channel_list() { vector prev_channels = channels_; @@ -568,7 +646,7 @@ void DecodeSignal::update_channel_list() if (!ch_added) { // Create new entry without a mapped signal - data::DecodeChannel ch = {id++, false, nullptr, + data::DecodeChannel ch = {id++, 0, false, nullptr, QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc), SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch}; channels_.push_back(ch); @@ -591,7 +669,7 @@ void DecodeSignal::update_channel_list() if (!ch_added) { // Create new entry without a mapped signal - data::DecodeChannel ch = {id++, true, nullptr, + data::DecodeChannel ch = {id++, 0, true, nullptr, QString::fromUtf8(pdch->name), QString::fromUtf8(pdch->desc), SRD_INITIAL_PIN_SAME_AS_SAMPLE0, decoder, pdch}; channels_.push_back(ch); @@ -633,16 +711,21 @@ void DecodeSignal::commit_decoder_channels() dec->set_channels(channel_list); } + + // Channel bit IDs must be in sync with the channel's apperance in channels_ + int id = 0; + for (data::DecodeChannel &ch : channels_) + if (ch.assigned_signal) + 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 > segments; vector signal_data; vector signal_in_bytepos; @@ -651,25 +734,47 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) for (data::DecodeChannel &ch : channels_) if (ch.assigned_signal) { const shared_ptr logic_data = ch.assigned_signal->logic_data(); - const shared_ptr segment = logic_data->logic_segments().front(); + + shared_ptr 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); - signal_data.push_back(segment->get_samples(start, end)); + + uint8_t* data = new uint8_t[(end - start) * segment->unit_size()]; + segment->get_samples(start, end, data); + signal_data.push_back(data); const int bitpos = ch.assigned_signal->logic_bit_index(); signal_in_bytepos.push_back(bitpos / 8); signal_in_bitpos.push_back(bitpos % 8); } + + shared_ptr 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) * segment_->unit_size()]; + uint8_t* output = new uint8_t[(end - start) * output_segment->unit_size()]; unsigned int signal_count = signal_data.size(); for (int64_t sample_cnt = 0; sample_cnt < (end - start); sample_cnt++) { int bitpos = 0; uint8_t bytepos = 0; - const int out_sample_pos = sample_cnt * segment_->unit_size(); - for (unsigned int i = 0; i < segment_->unit_size(); i++) + const int out_sample_pos = sample_cnt * output_segment->unit_size(); + for (unsigned int i = 0; i < output_segment->unit_size(); i++) output[out_sample_pos + i] = 0; for (unsigned int i = 0; i < signal_count; i++) { @@ -689,7 +794,7 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) } } - segment_->append_payload(output, (end - start) * segment_->unit_size()); + output_segment->append_payload(output, (end - start) * output_segment->unit_size()); delete[] output; for (const uint8_t* data : signal_data) @@ -698,9 +803,18 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) void DecodeSignal::logic_mux_proc() { + uint32_t segment_id = 0; + + assert(logic_mux_data_); + + shared_ptr output_segment = logic_mux_data_->logic_segments().front(); + assert(output_segment); + + output_segment->set_samplerate(get_input_samplerate(0)); + do { - const uint64_t input_sample_count = get_working_sample_count(); - const uint64_t output_sample_count = segment_->get_sample_count(); + const uint64_t input_sample_count = get_working_sample_count(segment_id); + const uint64_t output_sample_count = output_segment->get_sample_count(); const uint64_t samples_to_process = (input_sample_count > output_sample_count) ? @@ -708,7 +822,7 @@ void DecodeSignal::logic_mux_proc() // Process the samples if necessary... if (samples_to_process > 0) { - const uint64_t unit_size = segment_->unit_size(); + const uint64_t unit_size = output_segment->unit_size(); const uint64_t chunk_sample_count = DecodeChunkLength / unit_size; uint64_t processed_samples = 0; @@ -717,7 +831,7 @@ void DecodeSignal::logic_mux_proc() 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 @@ -726,16 +840,33 @@ void DecodeSignal::logic_mux_proc() } if (samples_to_process == 0) { - // Wait for more input - unique_lock 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 { + 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 logic_mux_proc(), mux segments size is" \ + << logic_mux_data_->logic_segments().size(); + return; + } + + output_segment->set_samplerate(get_input_samplerate(segment_id)); + + } else { + // All segments have been processed + logic_mux_data_invalid_ = false; + + // Wait for more input + unique_lock logic_mux_lock(logic_mux_mutex_); + logic_mux_cond_.wait(logic_mux_lock); + } } } while (!logic_mux_interrupt_); - - // No more input data and session is stopped, let the decode thread - // process any pending data, terminate and release the global SRD mutex - // in order to let other decoders run - decode_input_cond_.notify_one(); } void DecodeSignal::query_input_metadata() @@ -746,20 +877,36 @@ void DecodeSignal::query_input_metadata() // TODO Currently we assume all channels have the same sample rate // and start time bool samplerate_valid = false; + data::DecodeChannel *any_channel; + shared_ptr logic_data; - auto any_channel = find_if(channels_.begin(), channels_.end(), - [](data::DecodeChannel ch) { return ch.assigned_signal; }); + do { + any_channel = &(*find_if(channels_.begin(), channels_.end(), + [](data::DecodeChannel ch) { return ch.assigned_signal; })); - shared_ptr logic_data = - any_channel->assigned_signal->logic_data(); + logic_data = any_channel->assigned_signal->logic_data(); + + if (!logic_data) { + // Wait until input data is available or an interrupt was requested + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); + } + } while (!logic_data && !decode_interrupt_); + + if (decode_interrupt_) + return; do { if (!logic_data->logic_segments().empty()) { shared_ptr first_segment = any_channel->assigned_signal->logic_data()->logic_segments().front(); - start_time_ = first_segment->start_time(); - samplerate_ = first_segment->samplerate(); - if (samplerate_ > 0) + + // We only need valid metadata in the first decode segment + // so that start_srd_session() can use it + segments_.at(current_segment_id_).start_time = first_segment->start_time(); + segments_.at(current_segment_id_).samplerate = first_segment->samplerate(); + + if (segments_.at(current_segment_id_).samplerate > 0) samplerate_valid = true; } @@ -772,9 +919,10 @@ void DecodeSignal::query_input_metadata() } void DecodeSignal::decode_data( - const int64_t abs_start_samplenum, const int64_t sample_count) + const int64_t abs_start_samplenum, const int64_t sample_count, + const shared_ptr input_segment) { - const int64_t unit_size = segment_->unit_size(); + const int64_t unit_size = input_segment->unit_size(); const int64_t chunk_sample_count = DecodeChunkLength / unit_size; for (int64_t i = abs_start_samplenum; @@ -784,10 +932,12 @@ void DecodeSignal::decode_data( const int64_t chunk_end = min(i + chunk_sample_count, abs_start_samplenum + sample_count); - const uint8_t* chunk = segment_->get_samples(i, chunk_end); + int64_t data_size = (chunk_end - i) * unit_size; + uint8_t* chunk = new uint8_t[data_size]; + input_segment->get_samples(i, chunk_end, chunk); if (srd_session_send(srd_session_, i, chunk_end, chunk, - (chunk_end - i) * unit_size, unit_size) != SRD_OK) { + data_size, unit_size) != SRD_OK) { error_message_ = tr("Decoder reported an error"); delete[] chunk; break; @@ -797,7 +947,7 @@ void DecodeSignal::decode_data( { lock_guard lock(output_mutex_); - samples_decoded_ = chunk_end; + segments_.at(current_segment_id_).samples_decoded = chunk_end; } // Notify the frontend that we processed some data and @@ -815,27 +965,54 @@ void DecodeSignal::decode_proc() start_srd_session(); + current_segment_id_ = 0; + shared_ptr input_segment = logic_mux_data_->logic_segments().front(); + + assert(input_segment); + segments_.at(current_segment_id_).samplerate = input_segment->samplerate(); + uint64_t sample_count; uint64_t abs_start_samplenum = 0; do { // Keep processing new samples until we exhaust the input data do { lock_guard input_lock(input_mutex_); - sample_count = segment_->get_sample_count() - abs_start_samplenum; + sample_count = input_segment->get_sample_count() - abs_start_samplenum; if (sample_count > 0) { - decode_data(abs_start_samplenum, sample_count); + decode_data(abs_start_samplenum, sample_count, input_segment); abs_start_samplenum += sample_count; } } while (error_message_.isEmpty() && (sample_count > 0) && !decode_interrupt_); - if (error_message_.isEmpty() && !decode_interrupt_) { - if (sample_count == 0) + if (error_message_.isEmpty() && !decode_interrupt_ && sample_count == 0) { + if (current_segment_id_ < logic_mux_data_->logic_segments().size() - 1) { + // Process next segment + current_segment_id_++; + + try { + input_segment = logic_mux_data_->logic_segments().at(current_segment_id_); + } catch (out_of_range) { + qDebug() << "Decode error for" << name() << ": no logic mux segment" \ + << current_segment_id_ << "in decode_proc(), mux segments size is" \ + << logic_mux_data_->logic_segments().size(); + return; + } + abs_start_samplenum = 0; + + segments_.at(current_segment_id_).samplerate = input_segment->samplerate(); + + // Reset decoder state + stop_srd_session(); + start_srd_session(); + } else { + // All segments have been processed decode_finished(); - // Wait for new input data or an interrupt was requested - unique_lock input_wait_lock(input_mutex_); - decode_input_cond_.wait(input_wait_lock); + // Wait for new input data or an interrupt was requested + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); + } } } while (error_message_.isEmpty() && !decode_interrupt_); } @@ -868,7 +1045,7 @@ void DecodeSignal::start_srd_session() // Start the session srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, - g_variant_new_uint64(samplerate_)); + g_variant_new_uint64(segments_.at(current_segment_id_).samplerate)); srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, DecodeSignal::annotation_callback, this); @@ -904,52 +1081,98 @@ void DecodeSignal::connect_input_notifiers() } } +void DecodeSignal::create_segments() +{ + // Make sure we have as many segments as we need + const uint32_t input_segment_count = get_input_segment_count(); + + for (uint32_t i = logic_mux_data_->logic_segments().size(); i < input_segment_count; i++) { + shared_ptr segment = + make_shared(*logic_mux_data_, logic_mux_unit_size_, 0); + logic_mux_data_->push_segment(segment); + } + + for (uint32_t i = segments_.size(); i < input_segment_count; i++) { + // Create annotation segment + segments_.emplace_back(DecodeSegment()); + + // Add annotation classes + for (const shared_ptr &dec : stack_) { + assert(dec); + const srd_decoder *const decc = dec->decoder(); + assert(dec->decoder()); + + // Add a row for the decoder if it doesn't have a row list + if (!decc->annotation_rows) + (segments_.back().annotation_rows)[Row(decc)] = + decode::RowData(); + + // Add the decoder rows + for (const GSList *l = decc->annotation_rows; l; l = l->next) { + const srd_decoder_annotation_row *const ann_row = + (srd_decoder_annotation_row *)l->data; + assert(ann_row); + + const Row row(decc, ann_row); + + // Add a new empty row data object + (segments_.back().annotation_rows)[row] = + decode::RowData(); + } + } + } +} + void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal) { assert(pdata); - assert(decoder); + assert(decode_signal); DecodeSignal *const ds = (DecodeSignal*)decode_signal; assert(ds); lock_guard lock(ds->output_mutex_); - const decode::Annotation a(pdata); - // Find the row assert(pdata->pdo); assert(pdata->pdo->di); const srd_decoder *const decc = pdata->pdo->di->decoder; assert(decc); - auto row_iter = ds->rows_.end(); + const srd_proto_data_annotation *const pda = + (const srd_proto_data_annotation*)pdata->data; + assert(pda); + + auto row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.end(); // Try looking up the sub-row of this class - const auto r = ds->class_rows_.find(make_pair(decc, a.format())); + 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->rows_.find((*r).second); + row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find((*r).second); else { // Failing that, use the decoder as a key - row_iter = ds->rows_.find(Row(decc)); + row_iter = ds->segments_.at(ds->current_segment_id_).annotation_rows.find(Row(decc)); } - assert(row_iter != ds->rows_.end()); - if (row_iter == ds->rows_.end()) { + if (row_iter == ds->segments_.at(ds->current_segment_id_).annotation_rows.end()) { qDebug() << "Unexpected annotation: decoder = " << decc << - ", format = " << a.format(); + ", format = " << format; assert(false); return; } // Add the annotation - (*row_iter).second.push_annotation(a); + (*row_iter).second.emplace_annotation(pdata); } 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() @@ -959,6 +1182,8 @@ void DecodeSignal::on_data_cleared() void DecodeSignal::on_data_received() { + create_segments(); + if (!logic_mux_thread_.joinable()) begin_decode(); else