X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=d85821c6ca58db1d20a74f0e71d1ec48129e989a;hp=8bdad1097af99c654779f5a8c48f0d05d77d4e4d;hb=5ecf957f9f58abc2372b0214333d3491477c1b4d;hpb=eee3eab96253315b2a3dc04ffa7051a8ec963c32

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 8bdad109..d85821c6 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -36,6 +36,7 @@ using std::lock_guard;
 using std::make_pair;
 using std::make_shared;
 using std::min;
+using std::out_of_range;
 using std::shared_ptr;
 using std::unique_lock;
 using pv::data::decode::Annotation;
@@ -147,6 +148,7 @@ void DecodeSignal::reset_decode()
 
 	frame_complete_ = false;
 	samples_decoded_ = 0;
+	currently_processed_segment_ = 0;
 	error_message_ = QString();
 
 	rows_.clear();
@@ -332,15 +334,13 @@ const pv::util::Timestamp& DecodeSignal::start_time() const
 	return start_time_;
 }
 
-int64_t DecodeSignal::get_working_sample_count() const
+int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const
 {
 	// The working sample count is the highest sample number for
 	// which all used signals have data available, so go through
 	// all channels and use the lowest overall sample count of the
 	// current segment
 
-	// TODO Currently, we assume only a single segment exists
-
 	int64_t count = std::numeric_limits<int64_t>::max();
 	bool no_signals_assigned = true;
 
@@ -352,17 +352,34 @@ int64_t DecodeSignal::get_working_sample_count() const
 			if (!logic_data || logic_data->logic_segments().empty())
 				return 0;
 
-			const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
-			count = min(count, (int64_t)segment->get_sample_count());
+			try {
+				const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
+				count = min(count, (int64_t)segment->get_sample_count());
+			} catch (out_of_range) {
+				return 0;
+			}
 		}
 
 	return (no_signals_assigned ? 0 : count);
 }
 
-int64_t DecodeSignal::get_decoded_sample_count() const
+int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const
 {
 	lock_guard<mutex> decode_lock(output_mutex_);
-	return samples_decoded_;
+
+	int64_t result = 0;
+
+	if (segment_id == currently_processed_segment_)
+		result = samples_decoded_;
+	else
+		if (segment_id < currently_processed_segment_)
+			// Segment was already decoded fully
+			result = get_working_sample_count(segment_id);
+		else
+			// Segment wasn't decoded at all yet
+			result = 0;
+
+	return result;
 }
 
 vector<Row> DecodeSignal::visible_rows() const
@@ -507,7 +524,6 @@ void DecodeSignal::restore_settings(QSettings &settings)
 
 				// Include the newly created decode channels in the channel lists
 				update_channel_list();
-				commit_decoder_channels();
 				break;
 			}
 		}
@@ -544,6 +560,10 @@ void DecodeSignal::restore_settings(QSettings &settings)
 		settings.endGroup();
 	}
 
+	// Update the internal structures
+	update_channel_list();
+	commit_decoder_channels();
+
 	begin_decode();
 }
 
@@ -640,6 +660,12 @@ void DecodeSignal::commit_decoder_channels()
 
 		dec->set_channels(channel_list);
 	}
+
+	// Channel bit IDs must be in sync with the channel's apperance in channels_
+	int id = 0;
+	for (data::DecodeChannel &ch : channels_)
+		if (ch.assigned_signal)
+			ch.bit_id = id++;
 }
 
 void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
@@ -655,11 +681,8 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
 	vector<uint8_t> signal_in_bytepos;
 	vector<uint8_t> signal_in_bitpos;
 
-	int id = 0;
 	for (data::DecodeChannel &ch : channels_)
 		if (ch.assigned_signal) {
-			ch.bit_id = id++;
-
 			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);
@@ -712,7 +735,7 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
 void DecodeSignal::logic_mux_proc()
 {
 	do {
-		const uint64_t input_sample_count = get_working_sample_count();
+		const uint64_t input_sample_count = get_working_sample_count(currently_processed_segment_);
 		const uint64_t output_sample_count = logic_mux_segment_->get_sample_count();
 
 		const uint64_t samples_to_process =
@@ -744,11 +767,6 @@ void DecodeSignal::logic_mux_proc()
 			logic_mux_cond_.wait(logic_mux_lock);
 		}
 	} 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
-	// in order to let other decoders run
-	decode_input_cond_.notify_one();
 }
 
 void DecodeSignal::query_input_metadata()