X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=9d032ad9756080c19fc8a83d5bc6f407260b906e;hb=9242129958c996f9ff71da7c7b74d7983b5c59f6;hp=58dd887145c62cc6bb98dfa18d43c316112b649b;hpb=db62bbfda512aeddca5b9d7b5960e9cf24b8859c;p=pulseview.git

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 58dd887..9d032ad 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -43,16 +43,12 @@ namespace pv {
 
 namespace view {
 class LogicSignal;
-
-namespace decode {
-class Annotation;
-}
-
 }
 
 namespace data {
 
 namespace decode {
+class Annotation;
 class Decoder;
 }
 
@@ -78,7 +74,12 @@ public:
 
 	int64_t samples_decoded() const;
 
-	const std::vector<pv::view::decode::Annotation> annotations() const;
+	/**
+	 * Extracts sorted annotations between two period into a vector.
+	 */
+	void get_annotation_subset(
+		std::vector<pv::data::decode::Annotation> &dest,
+		uint64_t start_sample, uint64_t end_sample) const;
 
 	QString error_message();
 
@@ -91,6 +92,20 @@ public:
 private:
 	void decode_proc(boost::shared_ptr<data::Logic> data);
 
+	bool index_entry_start_sample_gt(
+		const uint64_t sample, const size_t index) const;
+	bool index_entry_end_sample_lt(
+		const size_t index, const uint64_t sample) const;
+	bool index_entry_end_sample_gt(
+		const uint64_t sample, const size_t index) const;
+
+	void insert_annotation_into_start_index(
+		const pv::data::decode::Annotation &a,
+		const size_t storage_offset);
+	void insert_annotation_into_end_index(
+		const pv::data::decode::Annotation &a,
+		const size_t storage_offset);
+
 	static void annotation_callback(srd_proto_data *pdata,
 		void *decoder);
 
@@ -111,7 +126,15 @@ private:
 
 	mutable boost::mutex _mutex;
 	int64_t	_samples_decoded;
-	std::vector<pv::view::decode::Annotation> _annotations;
+	std::vector<pv::data::decode::Annotation> _annotations;
+
+	/**
+	 * _ann_start_index and _ann_end_index contain lists of annotions
+	 * (represented by offsets in the _annotations vector), sorted in
+	 * ascending ordered by the start_sample and end_sample respectively.
+	 */
+	std::vector<size_t> _ann_start_index, _ann_end_index;
+
 	QString _error_message;
 
 	boost::thread _decode_thread;