X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=5d0ca90acfe562ffa09014bc7fcbd018ad55344e;hp=6aa3f42f13ac7c93c6e272c4f43115300e19034a;hb=f2f4845f15f5b5aa60cceb47c349201f44e1d14b;hpb=6e7a4a0066c15d99c891765bbc6797d339ac0ec8 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 6aa3f42f..5d0ca90a 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; @@ -147,13 +148,17 @@ void DecodeSignal::reset_decode() frame_complete_ = false; samples_decoded_ = 0; + currently_processed_segment_ = 0; error_message_ = QString(); - rows_.clear(); + segmented_rows_.clear(); + current_rows_= nullptr; class_rows_.clear(); logic_mux_data_.reset(); logic_mux_data_invalid_ = true; + + decode_reset(); } void DecodeSignal::begin_decode() @@ -199,17 +204,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 +217,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, @@ -228,6 +224,10 @@ 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(); @@ -236,8 +236,8 @@ void DecodeSignal::begin_decode() const int64_t ch_count = get_assigned_signal_count(); const int64_t 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_); + logic_mux_segment_ = make_shared(*logic_mux_data_, unit_size, samplerate_); + logic_mux_data_->push_segment(logic_mux_segment_); } // Make sure the logic output data is complete and up-to-date @@ -336,15 +336,13 @@ const pv::util::Timestamp& DecodeSignal::start_time() const return start_time_; } -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; @@ -356,17 +354,34 @@ 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; + + 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; + + return result; } vector DecodeSignal::visible_rows() const @@ -406,8 +421,13 @@ void DecodeSignal::get_annotation_subset( { lock_guard lock(output_mutex_); - const auto iter = rows_.find(row); - if (iter != rows_.end()) + 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); } @@ -506,7 +526,6 @@ void DecodeSignal::restore_settings(QSettings &settings) // Include the newly created decode channels in the channel lists update_channel_list(); - commit_decoder_channels(); break; } } @@ -543,6 +562,10 @@ void DecodeSignal::restore_settings(QSettings &settings) settings.endGroup(); } + // Update the internal structures + update_channel_list(); + commit_decoder_channels(); + begin_decode(); } @@ -639,6 +662,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) @@ -654,11 +683,8 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end) vector signal_in_bytepos; vector signal_in_bitpos; - int id = 0; for (data::DecodeChannel &ch : channels_) if (ch.assigned_signal) { - ch.bit_id = id++; - const shared_ptr logic_data = ch.assigned_signal->logic_data(); const shared_ptr segment = logic_data->logic_segments().front(); segments.push_back(segment); @@ -673,15 +699,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++) { @@ -701,7 +727,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) @@ -711,8 +737,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) ? @@ -720,7 +746,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; @@ -743,11 +769,6 @@ void DecodeSignal::logic_mux_proc() 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() @@ -798,7 +819,7 @@ 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(); + 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; @@ -810,7 +831,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) { @@ -847,7 +868,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); @@ -930,6 +951,35 @@ void DecodeSignal::connect_input_notifiers() } } +void DecodeSignal::create_new_annotation_segment() +{ + segmented_rows_.emplace_back(map()); + current_rows_ = &(segmented_rows_.back()); + + // 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_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_rows_)[row] = decode::RowData(); + } + } +} + void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal) { assert(pdata); @@ -940,35 +990,38 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa 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_rows_); + + 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_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_rows_->find((*r).second); else { // Failing that, use the decoder as a key - row_iter = ds->rows_.find(Row(decc)); + row_iter = ds->current_rows_->find(Row(decc)); } - assert(row_iter != ds->rows_.end()); - if (row_iter == ds->rows_.end()) { + if (row_iter == ds->current_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)