X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=77b2061c6e3b793d554613158761d7707a7af127;hb=30677c1392b54604b01558cf29b44572731659fc;hp=c0dbb20d8c9aca5f86921459d650ae52b53b906a;hpb=8a603e135f0eee0b2665c8ec9caa5f19ae6ee5e4;p=pulseview.git diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index c0dbb20..77b2061 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -236,8 +236,6 @@ void DecodeSignal::begin_decode() 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); @@ -363,7 +361,7 @@ int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const 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) { + } catch (out_of_range&) { return 0; } } @@ -380,7 +378,7 @@ int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const try { const DecodeSegment *segment = &(segments_.at(segment_id)); result = segment->samples_decoded; - } catch (out_of_range) { + } catch (out_of_range&) { // Do nothing } @@ -433,7 +431,7 @@ void DecodeSignal::get_annotation_subset( if (iter != rows->end()) (*iter).second.get_annotation_subset(dest, start_sample, end_sample); - } catch (out_of_range) { + } catch (out_of_range&) { // Do nothing } } @@ -609,7 +607,7 @@ uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const try { const shared_ptr segment = logic_data->logic_segments().at(segment_id); samplerate = segment->samplerate(); - } catch (out_of_range) { + } catch (out_of_range&) { // Do nothing } break; @@ -738,7 +736,7 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c shared_ptr segment; try { segment = logic_data->logic_segments().at(segment_id); - } catch (out_of_range) { + } catch (out_of_range&) { qDebug() << "Muxer error for" << name() << ":" << ch.assigned_signal->name() \ << "has no logic segment" << segment_id; return; @@ -758,7 +756,7 @@ void DecodeSignal::mux_logic_samples(uint32_t segment_id, const int64_t start, c shared_ptr output_segment; try { output_segment = logic_mux_data_->logic_segments().at(segment_id); - } catch (out_of_range) { + } 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(); @@ -807,8 +805,11 @@ void DecodeSignal::logic_mux_proc() assert(logic_mux_data_); - shared_ptr output_segment = logic_mux_data_->logic_segments().front(); - assert(output_segment); + // Create initial logic mux segment + shared_ptr output_segment = + make_shared(*logic_mux_data_, segment_id, + logic_mux_unit_size_, 0); + logic_mux_data_->push_segment(output_segment); output_segment->set_samplerate(get_input_samplerate(0)); @@ -846,14 +847,10 @@ void DecodeSignal::logic_mux_proc() // 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 = + make_shared(*logic_mux_data_, segment_id, + logic_mux_unit_size_, 0); + logic_mux_data_->push_segment(output_segment); output_segment->set_samplerate(get_input_samplerate(segment_id)); @@ -869,55 +866,6 @@ void DecodeSignal::logic_mux_proc() } while (!logic_mux_interrupt_); } -void DecodeSignal::query_input_metadata() -{ - // Update the samplerate and start time because we cannot start - // the libsrd session without the current samplerate - - // 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; - - do { - any_channel = &(*find_if(channels_.begin(), channels_.end(), - [](data::DecodeChannel ch) { return ch.assigned_signal; })); - - 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(); - - // 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; - } - - if (!samplerate_valid) { - // 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 (!samplerate_valid && !decode_interrupt_); -} - void DecodeSignal::decode_data( const int64_t abs_start_samplenum, const int64_t sample_count, const shared_ptr input_segment) @@ -958,20 +906,28 @@ void DecodeSignal::decode_data( void DecodeSignal::decode_proc() { - query_input_metadata(); + current_segment_id_ = 0; + + // If there is no input data available yet, wait until it is or we're interrupted + if (logic_mux_data_->logic_segments().size() == 0) { + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); + } if (decode_interrupt_) return; - start_srd_session(); - - current_segment_id_ = 0; shared_ptr input_segment = logic_mux_data_->logic_segments().front(); - assert(input_segment); + + // Create the initial segment and set its sample rate so that we can pass it to SRD + create_decode_segment(); segments_.at(current_segment_id_).samplerate = input_segment->samplerate(); + segments_.at(current_segment_id_).start_time = input_segment->start_time(); - uint64_t sample_count; + start_srd_session(); + + uint64_t sample_count = 0; uint64_t abs_start_samplenum = 0; do { // Keep processing new samples until we exhaust the input data @@ -992,7 +948,7 @@ void DecodeSignal::decode_proc() try { input_segment = logic_mux_data_->logic_segments().at(current_segment_id_); - } catch (out_of_range) { + } 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(); @@ -1000,7 +956,10 @@ void DecodeSignal::decode_proc() } abs_start_samplenum = 0; + // Create the next segment and set its metadata + create_decode_segment(); segments_.at(current_segment_id_).samplerate = input_segment->samplerate(); + segments_.at(current_segment_id_).start_time = input_segment->start_time(); // Reset decoder state stop_srd_session(); @@ -1019,6 +978,8 @@ void DecodeSignal::decode_proc() void DecodeSignal::start_srd_session() { + uint64_t samplerate; + if (srd_session_) stop_srd_session(); @@ -1034,6 +995,7 @@ void DecodeSignal::start_srd_session() if (!di) { error_message_ = tr("Failed to create decoder instance"); srd_session_destroy(srd_session_); + srd_session_ = nullptr; return; } @@ -1044,8 +1006,10 @@ void DecodeSignal::start_srd_session() } // Start the session - srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, - g_variant_new_uint64(segments_.at(current_segment_id_).samplerate)); + samplerate = segments_.at(current_segment_id_).samplerate; + if (samplerate) + srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE, + g_variant_new_uint64(samplerate)); srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN, DecodeSignal::annotation_callback, this); @@ -1076,49 +1040,38 @@ void DecodeSignal::connect_input_notifiers() const data::SignalBase *signal = ch.assigned_signal; connect(signal, SIGNAL(samples_cleared()), this, SLOT(on_data_cleared())); - connect(signal, SIGNAL(samples_added(QObject*, uint64_t, uint64_t)), + connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)), this, SLOT(on_data_received())); } } -void DecodeSignal::create_segments() +void DecodeSignal::create_decode_segment() { - // 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()); + // 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 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 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); + // 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); + const Row row(decc, ann_row); - // Add a new empty row data object - (segments_.back().annotation_rows)[row] = - decode::RowData(); - } + // Add a new empty row data object + (segments_.back().annotation_rows)[row] = + decode::RowData(); } } } @@ -1182,8 +1135,6 @@ void DecodeSignal::on_data_cleared() void DecodeSignal::on_data_received() { - create_segments(); - if (!logic_mux_thread_.joinable()) begin_decode(); else