const double DecodeSignal::DecodeMargin = 1.0;
const double DecodeSignal::DecodeThreshold = 0.2;
-const int64_t DecodeSignal::DecodeChunkLength = 10 * 1024 * 1024;
-const unsigned int DecodeSignal::DecodeNotifyPeriod = 1024;
+const int64_t DecodeSignal::DecodeChunkLength = 256 * 1024;
mutex DecodeSignal::global_srd_mutex_;
logic_mux_data_invalid_(false),
start_time_(0),
samplerate_(0),
- annotation_count_(0),
samples_decoded_(0),
frame_complete_(false)
{
connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(on_capture_state_changed(int)));
- connect(&session_, SIGNAL(data_received()),
- this, SLOT(on_data_received()));
- connect(&session_, SIGNAL(frame_ended()),
- this, SLOT(on_frame_ended()));
set_name(tr("Empty decoder signal"));
}
{
stop_srd_session();
- annotation_count_ = 0;
frame_complete_ = false;
samples_decoded_ = 0;
error_message_ = QString();
return;
}
+ // Make sure that all assigned channels still provide logic data
+ // (can happen when a converted signal was assigned but the
+ // conversion removed in the meanwhile)
+ for (data::DecodeChannel &ch : channels_)
+ if (ch.assigned_signal && !(ch.assigned_signal->logic_data() != nullptr))
+ ch.assigned_signal = nullptr;
+
// Check that all decoders have the required channels
for (const shared_ptr<decode::Decoder> &dec : stack_)
if (!dec->have_required_channels()) {
}
}
- // 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);
// Decode the muxed logic data
decode_interrupt_ = false;
decode_thread_ = std::thread(&DecodeSignal::decode_proc, this);
+
+ // Receive notifications when new sample data is available
+ connect_input_notifiers();
}
QString DecodeSignal::error_message() const
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) {
// TODO Restore decoder stack, channel mapping and decoder options
}
-uint64_t DecodeSignal::inc_annotation_count()
-{
- return (annotation_count_++);
-}
-
void DecodeSignal::update_channel_list()
{
vector<data::DecodeChannel> prev_channels = channels_;
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();
} 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;
+ // Notify the frontend that we processed some data and
+ // possibly have new annotations as well
+ new_annotations();
+
{
lock_guard<mutex> lock(output_mutex_);
samples_decoded_ = chunk_end;
void DecodeSignal::decode_proc()
{
+ query_input_metadata();
+
+ if (decode_interrupt_)
+ return;
+
start_srd_session();
uint64_t sample_count;
} while (error_message_.isEmpty() && (sample_count > 0));
if (error_message_.isEmpty()) {
- // 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()
}
}
+void DecodeSignal::connect_input_notifiers()
+{
+ // Disconnect the notification slot from the previous set of signals
+ disconnect(this, SLOT(on_data_received()));
+
+ // Connect the currently used signals to our slot
+ for (data::DecodeChannel &ch : channels_) {
+ if (!ch.assigned_signal)
+ continue;
+
+ shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
+ connect(logic_data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
+ this, SLOT(on_data_received()));
+ }
+}
+
void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
{
assert(pdata);
// Add the annotation
(*row_iter).second.push_annotation(a);
-
- // Notify the frontend every DecodeNotifyPeriod annotations
- if (ds->inc_annotation_count() % DecodeNotifyPeriod == 0)
- ds->new_annotations();
}
void DecodeSignal::on_capture_state_changed(int state)
logic_mux_cond_.notify_one();
}
-void DecodeSignal::on_frame_ended()
-{
- logic_mux_cond_.notify_one();
-}
-
} // namespace data
} // namespace pv