X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=2d41e5003e57c391d492e80430b380cb22df2fc7;hp=0e0911521b09973ed2d28fd1ca72efa1f139b0df;hb=8ce0e732cfe912e022eb96d06aaaa40390efcd6b;hpb=20f59e957e70250cfb876ac7a1743134d6b83339

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 0e091152..2d41e500 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -61,7 +61,8 @@ class SignalData;
 
 struct DecodeChannel
 {
-	uint16_t id;  // Also tells which bit within a sample represents this channel
+	uint16_t id;     ///< Global numerical ID for the decode channels in the stack
+	uint16_t bit_id; ///< Tells which bit within a sample represents this channel
 	const bool is_optional;
 	const pv::data::SignalBase *assigned_signal;
 	const QString name, desc;
@@ -70,6 +71,14 @@ struct DecodeChannel
 	const srd_channel *pdch_;
 };
 
+struct DecodeSegment
+{
+	map<const decode::Row, decode::RowData> annotation_rows;
+	pv::util::Timestamp start_time;
+	double samplerate;
+	int64_t samples_decoded;
+};
+
 class DecodeSignal : public SignalBase
 {
 	Q_OBJECT
@@ -90,7 +99,7 @@ public:
 	void remove_decoder(int index);
 	bool toggle_decoder_visibility(int index);
 
-	void reset_decode();
+	void reset_decode(bool shutting_down = false);
 	void begin_decode();
 	QString error_message() const;
 
@@ -102,16 +111,16 @@ public:
 	void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
 	double samplerate() const;
-	const pv::util::Timestamp& start_time() const;
+	const pv::util::Timestamp start_time() const;
 
 	/**
 	 * Returns the number of samples that can be worked on,
 	 * i.e. the number of samples where samples are available
 	 * for all connected channels.
 	 */
-	int64_t get_working_sample_count() const;
+	int64_t get_working_sample_count(uint32_t segment_id) const;
 
-	int64_t get_decoded_sample_count() const;
+	int64_t get_decoded_sample_count(uint32_t segment_id) const;
 
 	vector<decode::Row> visible_rows() const;
 
@@ -120,7 +129,7 @@ public:
 	 */
 	void get_annotation_subset(
 		vector<pv::data::decode::Annotation> &dest,
-		const decode::Row &row, uint64_t start_sample,
+		const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
 		uint64_t end_sample) const;
 
 	virtual void save_settings(QSettings &settings) const;
@@ -128,29 +137,38 @@ public:
 	virtual void restore_settings(QSettings &settings);
 
 private:
+	void set_error_message(QString msg);
+
+	uint32_t get_input_segment_count() const;
+
+	uint32_t get_input_samplerate(uint32_t segment_id) const;
+
 	void update_channel_list();
 
 	void commit_decoder_channels();
 
-	void mux_logic_samples(const int64_t start, const int64_t end);
+	void mux_logic_samples(uint32_t segment_id, const int64_t start, const int64_t end);
 
 	void logic_mux_proc();
 
-	void query_input_metadata();
-
-	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
+	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
+		const shared_ptr<LogicSegment> input_segment);
 
 	void decode_proc();
 
 	void start_srd_session();
+	void terminate_srd_session();
 	void stop_srd_session();
 
 	void connect_input_notifiers();
 
+	void create_decode_segment();
+
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
-	void new_annotations();
+	void new_annotations(); // TODO Supply segment for which they belong to
+	void decode_reset();
 	void decode_finished();
 	void channels_updated();
 
@@ -167,21 +185,18 @@ private:
 	struct srd_session *srd_session_;
 
 	shared_ptr<Logic> logic_mux_data_;
-	shared_ptr<LogicSegment> segment_;
+	uint32_t logic_mux_unit_size_;
 	bool logic_mux_data_invalid_;
 
-	pv::util::Timestamp start_time_;
-	double samplerate_;
-
-	int64_t samples_decoded_;
-
 	vector< shared_ptr<decode::Decoder> > stack_;
-	map<const decode::Row, decode::RowData> rows_;
+	bool stack_config_changed_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
+	vector<DecodeSegment> segments_;
+	uint32_t current_segment_id_;
+
 	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
 	mutable condition_variable decode_input_cond_, logic_mux_cond_;
-	bool frame_complete_;
 
 	std::thread decode_thread_, logic_mux_thread_;
 	atomic<bool> decode_interrupt_, logic_mux_interrupt_;