X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=e8206a088bac285077271d0d5f6db08cd442649b;hp=339c85dd01dd0305879bce1dc88d3fde6d8ec6e3;hb=04627946bb2377d8de2f4686a4ccef7eed6710cc;hpb=a3ebd5561086f4fef6570b3ab5be0a5592724731

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 339c85dd..e8206a08 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -46,8 +46,7 @@ namespace data {
 
 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_;
 
@@ -59,7 +58,6 @@ DecodeSignal::DecodeSignal(pv::Session &session) :
 	logic_mux_data_invalid_(false),
 	start_time_(0),
 	samplerate_(0),
-	annotation_count_(0),
 	samples_decoded_(0),
 	frame_complete_(false)
 {
@@ -148,7 +146,6 @@ void DecodeSignal::reset_decode()
 {
 	stop_srd_session();
 
-	annotation_count_ = 0;
 	frame_complete_ = false;
 	samples_decoded_ = 0;
 	error_message_ = QString();
@@ -184,6 +181,13 @@ void DecodeSignal::begin_decode()
 		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()) {
@@ -265,11 +269,16 @@ void DecodeSignal::auto_assign_signals()
 		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) {
@@ -410,11 +419,6 @@ void DecodeSignal::restore_settings(QSettings &settings)
 	// 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_;
@@ -600,12 +604,12 @@ void DecodeSignal::logic_mux_proc()
 			} 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
@@ -638,9 +642,11 @@ void DecodeSignal::query_input_metadata()
 				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);
+		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_);
 }
 
@@ -668,6 +674,10 @@ void DecodeSignal::decode_data(
 
 		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;
@@ -704,9 +714,6 @@ void DecodeSignal::decode_proc()
 		} 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 was requested
 			unique_lock<mutex> input_wait_lock(input_mutex_);
 			decode_input_cond_.wait(input_wait_lock);
@@ -814,10 +821,6 @@ void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signa
 
 	// 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)