X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=21d14b810d558d757f919dbc68932fbcc5dc6d6f;hp=747a16dcd16b9865e94fd70162a218eddd784f99;hb=ed535cd705e18d30d230d69a84a52f22a85431c7;hpb=83b9c07b79b30c1a76a10234dc01d3a5d48eba56

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 747a16dc..21d14b81 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -71,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
@@ -103,16 +111,18 @@ 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;
+
+	uint32_t get_input_segment_count() 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;
 
@@ -121,7 +131,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;
@@ -133,7 +143,7 @@ private:
 
 	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();
 
@@ -148,10 +158,13 @@ private:
 
 	void connect_input_notifiers();
 
+	void create_new_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();
 
@@ -169,20 +182,20 @@ private:
 
 	shared_ptr<Logic> logic_mux_data_;
 	shared_ptr<LogicSegment> logic_mux_segment_;
+	uint32_t logic_mux_unit_size_;
 	bool logic_mux_data_invalid_;
 
-	pv::util::Timestamp start_time_;
-	double samplerate_;
-
-	int64_t samples_decoded_;
+	uint32_t currently_processed_segment_;
 
 	vector< shared_ptr<decode::Decoder> > stack_;
-	map<const decode::Row, decode::RowData> rows_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
+	vector<DecodeSegment> segments_;
+	uint32_t current_segment_id_;
+	DecodeSegment *current_segment_;
+
 	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_;