X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=47a0c8c7f846365fa5c325ff60d0fc34448d0e6a;hp=a57a9a1a9624556d5658dc3d6d3877f160194095;hb=72435789a077273d96260f0225f79171e679359e;hpb=762ab7a4b20928a784b2b3400ce748d901e32d2d diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index a57a9a1a..47a0c8c7 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,11 @@ 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), + current_segment_(nullptr) { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); - - set_name(tr("Empty decoder signal")); } DecodeSignal::~DecodeSignal() @@ -147,15 +144,17 @@ void DecodeSignal::reset_decode() stop_srd_session(); - frame_complete_ = false; - samples_decoded_ = 0; - error_message_ = QString(); - - rows_.clear(); 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(); } void DecodeSignal::begin_decode() @@ -201,17 +200,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; @@ -219,10 +213,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, @@ -235,13 +225,13 @@ 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_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_); } + 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); @@ -330,23 +320,41 @@ 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 + 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 +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 + try { + const DecodeSegment *segment = &(segments_.at(0)); + result = segment->start_time; + } catch (out_of_range) { + // Do nothing + } + + 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 - int64_t count = std::numeric_limits::max(); bool no_signals_assigned = true; @@ -358,17 +366,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 @@ -403,15 +425,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 @@ -513,6 +543,7 @@ void DecodeSignal::restore_settings(QSettings &settings) } settings.endGroup(); + channels_updated(); } // Restore channel mapping @@ -543,6 +574,10 @@ void DecodeSignal::restore_settings(QSettings &settings) settings.endGroup(); } + // Update the internal structures + update_channel_list(); + commit_decoder_channels(); + begin_decode(); } @@ -574,7 +609,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); @@ -597,7 +632,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); @@ -639,6 +674,12 @@ 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) @@ -670,15 +711,15 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) } // 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) * logic_mux_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 * logic_mux_segment_->unit_size(); + for (unsigned int i = 0; i < logic_mux_segment_->unit_size(); i++) output[out_sample_pos + i] = 0; for (unsigned int i = 0; i < signal_count; i++) { @@ -698,7 +739,7 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) } } - segment_->append_payload(output, (end - start) * segment_->unit_size()); + logic_mux_segment_->append_payload(output, (end - start) * logic_mux_segment_->unit_size()); delete[] output; for (const uint8_t* data : signal_data) @@ -708,8 +749,8 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) void DecodeSignal::logic_mux_proc() { 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(currently_processed_segment_); + const uint64_t output_sample_count = logic_mux_segment_->get_sample_count(); const uint64_t samples_to_process = (input_sample_count > output_sample_count) ? @@ -717,7 +758,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 = logic_mux_segment_->unit_size(); const uint64_t chunk_sample_count = DecodeChunkLength / unit_size; uint64_t processed_samples = 0; @@ -735,16 +776,13 @@ void DecodeSignal::logic_mux_proc() } if (samples_to_process == 0) { + 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() @@ -758,6 +796,8 @@ void DecodeSignal::query_input_metadata() data::DecodeChannel *any_channel; shared_ptr logic_data; + assert(current_segment_); + do { any_channel = &(*find_if(channels_.begin(), channels_.end(), [](data::DecodeChannel ch) { return ch.assigned_signal; })); @@ -778,9 +818,10 @@ 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) + + current_segment_->start_time = first_segment->start_time(); + current_segment_->samplerate = first_segment->samplerate(); + if (current_segment_->samplerate > 0) samplerate_valid = true; } @@ -795,7 +836,9 @@ void DecodeSignal::query_input_metadata() void DecodeSignal::decode_data( const int64_t abs_start_samplenum, const int64_t sample_count) { - const int64_t unit_size = segment_->unit_size(); + assert(current_segment_); + + const int64_t unit_size = logic_mux_segment_->unit_size(); const int64_t chunk_sample_count = DecodeChunkLength / unit_size; for (int64_t i = abs_start_samplenum; @@ -807,7 +850,7 @@ void DecodeSignal::decode_data( int64_t data_size = (chunk_end - i) * unit_size; uint8_t* chunk = new uint8_t[data_size]; - segment_->get_samples(i, chunk_end, chunk); + logic_mux_segment_->get_samples(i, chunk_end, chunk); if (srd_session_send(srd_session_, i, chunk_end, chunk, data_size, unit_size) != SRD_OK) { @@ -820,7 +863,7 @@ void DecodeSignal::decode_data( { lock_guard lock(output_mutex_); - samples_decoded_ = chunk_end; + current_segment_->samples_decoded = chunk_end; } // Notify the frontend that we processed some data and @@ -844,7 +887,7 @@ void DecodeSignal::decode_proc() // 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 = logic_mux_segment_->get_sample_count() - abs_start_samplenum; if (sample_count > 0) { decode_data(abs_start_samplenum, sample_count); @@ -868,6 +911,8 @@ void DecodeSignal::start_srd_session() if (srd_session_) stop_srd_session(); + assert(current_segment_); + // Create the session srd_session_new(&srd_session_); assert(srd_session_); @@ -891,7 +936,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(current_segment_->samplerate)); srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, DecodeSignal::annotation_callback, this); @@ -927,52 +972,100 @@ void DecodeSignal::connect_input_notifiers() } } +void DecodeSignal::create_new_segment() +{ + // 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(*logic_mux_data_, + logic_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 &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) + (current_segment_->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 + (current_segment_->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); + assert(ds->current_segment_); + + const srd_proto_data_annotation *const pda = + (const srd_proto_data_annotation*)pdata->data; + assert(pda); - auto row_iter = ds->rows_.end(); + auto row_iter = ds->current_segment_->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->current_segment_->annotation_rows.find((*r).second); else { // Failing that, use the decoder as a key - row_iter = ds->rows_.find(Row(decc)); + row_iter = ds->current_segment_->annotation_rows.find(Row(decc)); } - assert(row_iter != ds->rows_.end()); - if (row_iter == ds->rows_.end()) { + if (row_iter == ds->current_segment_->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()