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

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 2d41e500..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
@@ -120,18 +120,38 @@ 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);