DecodeSignal::DecodeSignal(pv::Session &session) :
SignalBase(nullptr, SignalBase::DecodeChannel),
session_(session),
+ srd_session_(nullptr),
logic_mux_data_invalid_(false),
start_time_(0),
samplerate_(0),
{
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"));
}
logic_mux_cond_.notify_one();
logic_mux_thread_.join();
}
+
+ stop_srd_session();
}
const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
void DecodeSignal::reset_decode()
{
+ stop_srd_session();
+
annotation_count_ = 0;
frame_complete_ = false;
samples_decoded_ = 0;
}
}
- // 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
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();
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;
+ }
+
+ // 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,
- srd_session *const session)
+ const int64_t abs_start_samplenum, const int64_t sample_count)
{
const int64_t unit_size = segment_->unit_size();
const int64_t chunk_sample_count = DecodeChunkLength / unit_size;
const uint8_t* chunk = segment_->get_samples(i, chunk_end);
- if (srd_session_send(session, i, chunk_end, chunk,
+ if (srd_session_send(srd_session_, i, chunk_end, chunk,
(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
error_message_ = tr("Decoder reported an error");
delete[] chunk;
break;
}
+
delete[] chunk;
{
void DecodeSignal::decode_proc()
{
- srd_session *session;
- srd_decoder_inst *prev_di = nullptr;
+ query_input_metadata();
+
+ if (decode_interrupt_)
+ return;
+
+ start_srd_session();
+
+ uint64_t sample_count;
+ uint64_t abs_start_samplenum = 0;
+ do {
+ // Keep processing new samples until we exhaust the input data
+ do {
+ // Prevent any other decode threads from accessing libsigrokdecode
+ lock_guard<mutex> srd_lock(global_srd_mutex_);
+
+ {
+ lock_guard<mutex> input_lock(input_mutex_);
+ sample_count = segment_->get_sample_count() - abs_start_samplenum;
+ }
+
+ if (sample_count > 0) {
+ decode_data(abs_start_samplenum, sample_count);
+ abs_start_samplenum += sample_count;
+ }
+ } while (error_message_.isEmpty() && (sample_count > 0));
- // Prevent any other decode threads from accessing libsigrokdecode
- lock_guard<mutex> srd_lock(global_srd_mutex_);
+ if (error_message_.isEmpty()) {
+ // Make sure all annotations are known to the frontend
+ new_annotations();
+
+ // 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);
+ }
+ } while (error_message_.isEmpty() && !decode_interrupt_);
+}
+
+void DecodeSignal::start_srd_session()
+{
+ if (srd_session_)
+ stop_srd_session();
// Create the session
- srd_session_new(&session);
- assert(session);
+ srd_session_new(&srd_session_);
+ assert(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(session);
+ srd_decoder_inst *const di = dec->create_decoder_inst(srd_session_);
if (!di) {
error_message_ = tr("Failed to create decoder instance");
- srd_session_destroy(session);
+ srd_session_destroy(srd_session_);
return;
}
if (prev_di)
- srd_inst_stack(session, prev_di, di);
+ srd_inst_stack(srd_session_, prev_di, di);
prev_di = di;
}
// Start the session
- srd_session_metadata_set(session, SRD_CONF_SAMPLERATE,
+ srd_session_metadata_set(srd_session_, SRD_CONF_SAMPLERATE,
g_variant_new_uint64(samplerate_));
- srd_pd_output_callback_add(session, SRD_OUTPUT_ANN,
+ srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_ANN,
DecodeSignal::annotation_callback, this);
- srd_session_start(session);
-
- uint64_t sample_count;
- uint64_t abs_start_samplenum = 0;
- do {
- // Keep processing new samples until we exhaust the input data
- do {
- {
- lock_guard<mutex> input_lock(input_mutex_);
- sample_count = segment_->get_sample_count() - abs_start_samplenum;
- }
-
- if (sample_count > 0) {
- decode_data(abs_start_samplenum, sample_count, session);
- abs_start_samplenum += sample_count;
- }
- } while (error_message_.isEmpty() && (sample_count > 0));
+ srd_session_start(srd_session_);
+}
- // Terminate if we exhausted the input data
- if ((int64_t)segment_->get_sample_count() == get_working_sample_count())
- break;
+void DecodeSignal::stop_srd_session()
+{
+ if (srd_session_) {
+ // Destroy the session
+ srd_session_destroy(srd_session_);
+ srd_session_ = nullptr;
+ }
+}
- if (error_message_.isEmpty()) {
- // Wait for new input data or an interrupt request
- unique_lock<mutex> input_wait_lock(input_mutex_);
- decode_input_cond_.wait(input_wait_lock);
- }
- } while (error_message_.isEmpty() && !decode_interrupt_);
+void DecodeSignal::connect_input_notifiers()
+{
+ // Disconnect the notification slot from the previous set of signals
+ disconnect(this, SLOT(on_data_received()));
- // Make sure all annotations are known to the frontend
- new_annotations();
+ // Connect the currently used signals to our slot
+ for (data::DecodeChannel &ch : channels_) {
+ if (!ch.assigned_signal)
+ continue;
- // Destroy the session
- srd_session_destroy(session);
+ 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)
logic_mux_cond_.notify_one();
}
-void DecodeSignal::on_frame_ended()
-{
- logic_mux_cond_.notify_one();
-}
-
} // namespace data
} // namespace pv
projects / pulseview.git / blobdiff