}
}
- // TODO Currently we assume all channels have the same sample rate
- auto any_channel = find_if(channels_.begin(), channels_.end(),
- [](data::DecodeChannel ch) { return ch.assigned_signal; });
- shared_ptr<LogicSegment> first_segment =
- any_channel->assigned_signal->logic_data()->logic_segments().front();
- samplerate_ = first_segment->samplerate();
-
// Free the logic data and its segment(s) if it needs to be updated
if (logic_mux_data_invalid_)
logic_mux_data_.reset();
logic_mux_data_->push_segment(segment_);
}
- // Update the samplerate and start time
- start_time_ = segment_->start_time();
- samplerate_ = segment_->samplerate();
- if (samplerate_ == 0.0)
- samplerate_ = 1.0;
-
// 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);
if (ch.assigned_signal)
continue;
- for (shared_ptr<data::SignalBase> s : session_.signalbases())
- if (s->logic_data() && (ch.name.toLower().contains(s->name().toLower()))) {
+ for (shared_ptr<data::SignalBase> s : session_.signalbases()) {
+ const QString ch_name = ch.name.toLower();
+ const QString s_name = s->name().toLower();
+
+ if (s->logic_data() &&
+ ((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) {
ch.assigned_signal = s.get();
new_assignment = true;
}
+ }
}
if (new_assignment) {
} while (processed_samples < samples_to_process);
}
- if (session_.get_capture_state() != Session::Stopped) {
+ if (samples_to_process == 0) {
// Wait for more input
unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
logic_mux_cond_.wait(logic_mux_lock);
}
- } while ((session_.get_capture_state() != Session::Stopped) && !logic_mux_interrupt_);
+ } 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
decode_input_cond_.notify_one();
}
+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;
+
+ auto any_channel = find_if(channels_.begin(), channels_.end(),
+ [](data::DecodeChannel ch) { return ch.assigned_signal; });
+
+ shared_ptr<Logic> logic_data =
+ any_channel->assigned_signal->logic_data();
+
+ do {
+ if (!logic_data->logic_segments().empty()) {
+ shared_ptr<LogicSegment> first_segment =
+ any_channel->assigned_signal->logic_data()->logic_segments().front();
+ start_time_ = first_segment->start_time();
+ samplerate_ = first_segment->samplerate();
+ if (samplerate_ > 0)
+ samplerate_valid = true;
+ }
+
+ if (!samplerate_valid) {
+ // Wait until input data is available or an interrupt was requested
+ unique_lock<mutex> 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)
{
delete[] chunk;
break;
}
+
delete[] chunk;
{
void DecodeSignal::decode_proc()
{
+ query_input_metadata();
+
+ if (decode_interrupt_)
+ return;
+
start_srd_session();
uint64_t sample_count;
// Make sure all annotations are known to the frontend
new_annotations();
- // Wait for new input data or an interrupt request
+ // Wait for new input data or an interrupt was requested
unique_lock<mutex> input_wait_lock(input_mutex_);
decode_input_cond_.wait(input_wait_lock);
}
void DecodeSignal::start_srd_session()
{
- if (!srd_session_) {
- // Create the session
- srd_session_new(&srd_session_);
- assert(srd_session_);
+ if (srd_session_)
+ stop_srd_session();
- // Create the decoders
- srd_decoder_inst *prev_di = nullptr;
- for (const shared_ptr<decode::Decoder> &dec : stack_) {
- srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
+ // Create the session
+ srd_session_new(&srd_session_);
+ assert(srd_session_);
- if (!di) {
- error_message_ = tr("Failed to create decoder instance");
- srd_session_destroy(srd_session_);
- return;
- }
-
- if (prev_di)
- srd_inst_stack(srd_session_, prev_di, di);
+ // Create the decoders
+ srd_decoder_inst *prev_di = nullptr;
+ for (const shared_ptr<decode::Decoder> &dec : stack_) {
+ srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
- prev_di = di;
+ if (!di) {
+ error_message_ = tr("Failed to create decoder instance");
+ srd_session_destroy(srd_session_);
+ return;
}
- // Start the session
- srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
- g_variant_new_uint64(samplerate_));
+ if (prev_di)
+ srd_inst_stack(srd_session_, prev_di, di);
- srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
- DecodeSignal::annotation_callback, this);
-
- srd_session_start(srd_session_);
+ prev_di = di;
}
+
+ // Start the session
+ 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);
+
+ srd_session_start(srd_session_);
}
void DecodeSignal::stop_srd_session()