X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=a7afe44e7408ecf6fac5bdb92f03300493155b46;hp=7e01dd8a3f1742c1dd5924709239efd3031d35f3;hb=aa71890d74df0a7d449138dd9dd3bd907740df51;hpb=83b9c07b79b30c1a76a10234dc01d3a5d48eba56 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 7e01dd8..a7afe44 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -150,10 +150,13 @@ void DecodeSignal::reset_decode() error_message_ = QString(); 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 +202,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 +215,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 +222,8 @@ void DecodeSignal::begin_decode() } } + 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(); @@ -406,8 +402,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 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 +507,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 +543,10 @@ void DecodeSignal::restore_settings(QSettings &settings) settings.endGroup(); } + // Update the internal structures + update_channel_list(); + commit_decoder_channels(); + begin_decode(); } @@ -639,6 +643,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 +664,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); @@ -743,11 +750,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() @@ -930,6 +932,36 @@ void DecodeSignal::connect_input_notifiers() } } +void DecodeSignal::prepare_annotation_segment() +{ + // TODO Won't work for multiple segments + rows_.emplace_back(map()); + current_rows_ = &(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 +972,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)