X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=ba9c9b5e4ecaa8021b712446e487ede10a54eb6b;hp=4f2253d1716091e8a231a8be702a9d5cf0c79cec;hb=f6b6c9bf50999dc99f9517318ffd3114cae4960f;hpb=ce0b6a40ca6f804fd6ae7dcce2bbe163848819aa

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 4f2253d1..ba9c9b5e 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,8 +99,11 @@ 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();
+	void pause_decode();
+	void resume_decode();
+	bool is_paused() const;
 	QString error_message() const;
 
 	const vector<data::DecodeChannel> get_channels() const;
@@ -120,23 +123,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;
@@ -187,17 +212,21 @@ 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_;
 	uint32_t current_segment_id_;
 
-	mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
-	mutable condition_variable decode_input_cond_, logic_mux_cond_;
+	mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;
+	mutable condition_variable decode_input_cond_, decode_pause_cond_,
+		logic_mux_cond_;
 
 	std::thread decode_thread_, logic_mux_thread_;
 	atomic<bool> decode_interrupt_, logic_mux_interrupt_;
 
+	bool decode_paused_;
+
 	QString error_message_;
 };