X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=c0dbb20d8c9aca5f86921459d650ae52b53b906a;hp=5d0ca90acfe562ffa09014bc7fcbd018ad55344e;hb=8a603e135f0eee0b2665c8ec9caa5f19ae6ee5e4;hpb=f2f4845f15f5b5aa60cceb47c349201f44e1d14b diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 5d0ca90a..c0dbb20d 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -56,10 +56,7 @@ 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))); @@ -146,18 +143,15 @@ void DecodeSignal::reset_decode() stop_srd_session(); - frame_complete_ = false; - samples_decoded_ = 0; - currently_processed_segment_ = 0; - error_message_ = QString(); - - segmented_rows_.clear(); - current_rows_= nullptr; class_rows_.clear(); + current_segment_id_ = 0; + segments_.clear(); logic_mux_data_.reset(); logic_mux_data_invalid_ = true; + error_message_ = QString(); + decode_reset(); } @@ -224,22 +218,26 @@ void DecodeSignal::begin_decode() } } - create_new_annotation_segment(); - - // TODO Allow logic_mux_data and logic_mux_segment to work with multiple segments - // 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(ch_count); - logic_mux_segment_ = make_shared(*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(); + + 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 @@ -328,20 +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(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::max(); bool no_signals_assigned = true; @@ -371,15 +377,12 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const 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; } @@ -416,20 +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_); - if (!current_rows_) - return; - - // TODO Instead of current_rows_, use segmented_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 *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 @@ -569,6 +575,49 @@ void DecodeSignal::restore_settings(QSettings &settings) 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_; @@ -670,14 +719,13 @@ void DecodeSignal::commit_decoder_channels() 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; @@ -686,7 +734,15 @@ 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); uint8_t* data = new uint8_t[(end - start) * segment->unit_size()]; @@ -698,16 +754,27 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) 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) * logic_mux_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 * logic_mux_segment_->unit_size(); - for (unsigned int i = 0; i < logic_mux_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++) { @@ -727,7 +794,7 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) } } - logic_mux_segment_->append_payload(output, (end - start) * logic_mux_segment_->unit_size()); + output_segment->append_payload(output, (end - start) * output_segment->unit_size()); delete[] output; for (const uint8_t* data : signal_data) @@ -736,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(currently_processed_segment_); - const uint64_t output_sample_count = logic_mux_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) ? @@ -746,7 +822,7 @@ void DecodeSignal::logic_mux_proc() // Process the samples if necessary... if (samples_to_process > 0) { - const uint64_t unit_size = logic_mux_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; @@ -755,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 @@ -764,9 +840,31 @@ 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_); } @@ -802,9 +900,13 @@ void DecodeSignal::query_input_metadata() 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; } @@ -817,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 = logic_mux_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; @@ -831,7 +934,7 @@ void DecodeSignal::decode_data( int64_t data_size = (chunk_end - i) * unit_size; uint8_t* chunk = new uint8_t[data_size]; - logic_mux_segment_->get_samples(i, chunk_end, chunk); + input_segment->get_samples(i, chunk_end, chunk); if (srd_session_send(srd_session_, i, chunk_end, chunk, data_size, unit_size) != SRD_OK) { @@ -844,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 @@ -862,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 = logic_mux_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_); } @@ -915,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); @@ -951,31 +1081,44 @@ void DecodeSignal::connect_input_notifiers() } } -void DecodeSignal::create_new_annotation_segment() +void DecodeSignal::create_segments() { - segmented_rows_.emplace_back(map()); - current_rows_ = &(segmented_rows_.back()); + // Make sure we have as many segments as we need + const uint32_t input_segment_count = get_input_segment_count(); - // Add annotation classes - for (const shared_ptr &dec : stack_) { - assert(dec); - const srd_decoder *const decc = dec->decoder(); - assert(dec->decoder()); + 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); + } - // Add a row for the decoder if it doesn't have a row list - if (!decc->annotation_rows) - (*current_rows_)[Row(decc)] = decode::RowData(); + for (uint32_t i = segments_.size(); i < input_segment_count; i++) { + // Create annotation segment + segments_.emplace_back(DecodeSegment()); - // 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); + // Add annotation classes + for (const shared_ptr &dec : stack_) { + assert(dec); + const srd_decoder *const decc = dec->decoder(); + assert(dec->decoder()); - const Row row(decc, ann_row); + // 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 a new empty row data object - (*current_rows_)[row] = 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(); + } } } } @@ -995,25 +1138,24 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa assert(pdata->pdo->di); const srd_decoder *const decc = pdata->pdo->di->decoder; assert(decc); - assert(ds->current_rows_); 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->segments_.at(ds->current_segment_id_).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->segments_.at(ds->current_segment_id_).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->segments_.at(ds->current_segment_id_).annotation_rows.find(Row(decc)); } - if (row_iter == ds->current_rows_->end()) { + if (row_iter == ds->segments_.at(ds->current_segment_id_).annotation_rows.end()) { qDebug() << "Unexpected annotation: decoder = " << decc << ", format = " << format; assert(false); @@ -1027,8 +1169,10 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa 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() @@ -1038,6 +1182,8 @@ void DecodeSignal::on_data_cleared() void DecodeSignal::on_data_received() { + create_segments(); + if (!logic_mux_thread_.joinable()) begin_decode(); else