X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=daa52ed62d67231821f4fee2647fd506853d96a7;hp=b1f3cea75a9d8d40a629df8d2f67ddb824cf2c0d;hb=289c1bdc7e113c56f4829550ae894458bfab10a3;hpb=d3feec232211b3acec6a323ca3b8008ed8b2faa0;ds=sidebyside

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index b1f3cea7..daa52ed6 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -49,8 +49,6 @@ const double DecodeSignal::DecodeMargin = 1.0;
 const double DecodeSignal::DecodeThreshold = 0.2;
 const int64_t DecodeSignal::DecodeChunkLength = 256 * 1024;
 
-mutex DecodeSignal::global_srd_mutex_;
-
 
 DecodeSignal::DecodeSignal(pv::Session &session) :
 	SignalBase(nullptr, SignalBase::DecodeChannel),
@@ -64,8 +62,6 @@ DecodeSignal::DecodeSignal(pv::Session &session) :
 {
 	connect(&session_, SIGNAL(capture_state_changed(int)),
 		this, SLOT(on_capture_state_changed(int)));
-
-	set_name(tr("Empty decoder signal"));
 }
 
 DecodeSignal::~DecodeSignal()
@@ -81,7 +77,9 @@ const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
 void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 {
 	assert(decoder);
-	stack_.push_back(make_shared<decode::Decoder>(decoder));
+	const shared_ptr<Decoder> dec = make_shared<decode::Decoder>(decoder);
+
+	stack_.push_back(dec);
 
 	// Set name if this decoder is the first in the list
 	if (stack_.size() == 1)
@@ -90,7 +88,7 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 	// Include the newly created decode channels in the channel lists
 	update_channel_list();
 
-	auto_assign_signals();
+	auto_assign_signals(dec);
 	commit_decoder_channels();
 	begin_decode();
 }
@@ -265,12 +263,16 @@ const vector<data::DecodeChannel> DecodeSignal::get_channels() const
 	return channels_;
 }
 
-void DecodeSignal::auto_assign_signals()
+void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 {
 	bool new_assignment = false;
 
 	// Try to auto-select channels that don't have signals assigned yet
 	for (data::DecodeChannel &ch : channels_) {
+		// If a decoder is given, auto-assign only its channels
+		if (dec && (ch.decoder_ != dec))
+			continue;
+
 		if (ch.assigned_signal)
 			continue;
 
@@ -504,11 +506,13 @@ void DecodeSignal::restore_settings(QSettings &settings)
 
 				// Include the newly created decode channels in the channel lists
 				update_channel_list();
+				commit_decoder_channels();
 				break;
 			}
 		}
 
 		settings.endGroup();
+		channels_updated();
 	}
 
 	// Restore channel mapping
@@ -655,7 +659,10 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
 			const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
 			const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
 			segments.push_back(segment);
-			signal_data.push_back(segment->get_samples(start, end));
+
+			uint8_t* data = new uint8_t[(end - start) * segment->unit_size()];
+			segment->get_samples(start, end, data);
+			signal_data.push_back(data);
 
 			const int bitpos = ch.assigned_signal->logic_bit_index();
 			signal_in_bytepos.push_back(bitpos / 8);
@@ -748,12 +755,24 @@ void DecodeSignal::query_input_metadata()
 	// 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> logic_data;
 
-	auto any_channel = find_if(channels_.begin(), channels_.end(),
-		[](data::DecodeChannel ch) { return ch.assigned_signal; });
+	do {
+		any_channel = &(*find_if(channels_.begin(), channels_.end(),
+			[](data::DecodeChannel ch) { return ch.assigned_signal; }));
+
+		logic_data = any_channel->assigned_signal->logic_data();
 
-	shared_ptr<Logic> logic_data =
-		any_channel->assigned_signal->logic_data();
+		if (!logic_data) {
+			// 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 (!logic_data && !decode_interrupt_);
+
+	if (decode_interrupt_)
+		return;
 
 	do {
 		if (!logic_data->logic_segments().empty()) {
@@ -786,10 +805,12 @@ void DecodeSignal::decode_data(
 		const int64_t chunk_end = min(i + chunk_sample_count,
 			abs_start_samplenum + sample_count);
 
-		const uint8_t* chunk = segment_->get_samples(i, chunk_end);
+		int64_t data_size = (chunk_end - i) * unit_size;
+		uint8_t* chunk = new uint8_t[data_size];
+		segment_->get_samples(i, chunk_end, chunk);
 
 		if (srd_session_send(srd_session_, i, chunk_end, chunk,
-				(chunk_end - i) * unit_size, unit_size) != SRD_OK) {
+				data_size, unit_size) != SRD_OK) {
 			error_message_ = tr("Decoder reported an error");
 			delete[] chunk;
 			break;
@@ -822,13 +843,8 @@ void DecodeSignal::decode_proc()
 	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;
-			}
+			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);
@@ -914,7 +930,7 @@ void DecodeSignal::connect_input_notifiers()
 void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
 {
 	assert(pdata);
-	assert(decoder);
+	assert(decode_signal);
 
 	DecodeSignal *const ds = (DecodeSignal*)decode_signal;
 	assert(ds);