X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=f00a9f1cabaefc35de74ea66ede5544f15d99a56;hp=b4f9a2cb0eb3da2795a6299879466c01ac91a724;hb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2;hpb=65efd0258bc6a70806f7c832a32ac74ce489fa52

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index b4f9a2cb..f00a9f1c 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -76,7 +76,7 @@ struct DecodeSegment
 	map<const decode::Row, decode::RowData> annotation_rows;
 	pv::util::Timestamp start_time;
 	double samplerate;
-	int64_t samples_decoded;
+	int64_t samples_decoded_incl, samples_decoded_excl;
 };
 
 class DecodeSignal : public SignalBase
@@ -99,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;
 
@@ -120,23 +120,45 @@ public:
 	 */
 	int64_t get_working_sample_count(uint32_t segment_id) const;
 
-	int64_t get_decoded_sample_count(uint32_t segment_id) const;
+	/**
+	 * Returns the number of processed samples. Newly generated annotations will
+	 * have sample numbers greater than this.
+	 *
+	 * If include_processing is true, this number will include the ones being
+	 * currently processed (in case the decoder stack is running). In this case,
+	 * newly generated annotations will have sample numbers smaller than this.
+	 */
+	int64_t get_decoded_sample_count(uint32_t segment_id,
+		bool include_processing) const;
 
 	vector<decode::Row> visible_rows() const;
 
 	/**
-	 * Extracts sorted annotations between two period into a vector.
+	 * Extracts annotations from a single row into a vector.
+	 * Note: The annotations may be unsorted and only annotations that fully
+	 * fit into the sample range are considered.
 	 */
 	void get_annotation_subset(
 		vector<pv::data::decode::Annotation> &dest,
 		const decode::Row &row, uint32_t segment_id, uint64_t start_sample,
 		uint64_t end_sample) const;
 
+	/**
+	 * Extracts annotations from all rows into a vector.
+	 * Note: The annotations may be unsorted and only annotations that fully
+	 * fit into the sample range are considered.
+	 */
+	void get_annotation_subset(
+		vector<pv::data::decode::Annotation> &dest,
+		uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
+
 	virtual void save_settings(QSettings &settings) const;
 
 	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;
@@ -155,6 +177,7 @@ private:
 	void decode_proc();
 
 	void start_srd_session();
+	void terminate_srd_session();
 	void stop_srd_session();
 
 	void connect_input_notifiers();
@@ -186,6 +209,7 @@ private:
 	bool logic_mux_data_invalid_;
 
 	vector< shared_ptr<decode::Decoder> > stack_;
+	bool stack_config_changed_;
 	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
 	vector<DecodeSegment> segments_;