X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=f3ef9dfaad15a73fe5147c69dbae844647b4e67c;hb=cbb2e4da8042495531b406f745ee9d9e20448ef6;hp=1fe696ebe329003397a731bc1725598f94a187a2;hpb=ac9494eff3ebc74ae7a87746a4d8668c68f32b52;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 1fe696eb..f3ef9dfa 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -21,6 +21,7 @@
 #define PULSEVIEW_PV_DATA_DECODESIGNAL_HPP
 
 #include <atomic>
+#include <deque>
 #include <condition_variable>
 #include <unordered_set>
 #include <vector>
@@ -38,6 +39,7 @@
 
 using std::atomic;
 using std::condition_variable;
+using std::deque;
 using std::map;
 using std::mutex;
 using std::pair;
@@ -70,7 +72,7 @@ struct DecodeBinaryClass
 {
 	const decode::Decoder* decoder;
 	const decode::DecodeBinaryClassInfo* info;
-	vector<DecodeBinaryDataChunk> chunks;
+	deque<DecodeBinaryDataChunk> chunks;
 };
 
 struct DecodeSegment
@@ -98,7 +100,7 @@ public:
 	bool is_decode_signal() const;
 	const vector< shared_ptr<data::decode::Decoder> >& decoder_stack() const;
 
-	void stack_decoder(const srd_decoder *decoder);
+	void stack_decoder(const srd_decoder *decoder, bool restart_decode=true);
 	void remove_decoder(int index);
 	bool toggle_decoder_visibility(int index);
 
@@ -137,7 +139,9 @@ public:
 	int64_t get_decoded_sample_count(uint32_t segment_id,
 		bool include_processing) const;
 
-	vector<decode::Row> get_rows(bool visible_only) const;
+	vector<decode::Row> get_rows(bool visible_only=false) const;
+
+	uint64_t get_annotation_count(const decode::Row &row, uint32_t segment_id) const;
 
 	/**
 	 * Extracts annotations from a single row into a vector.
@@ -163,8 +167,13 @@ public:
 	void get_binary_data_chunk(uint32_t segment_id, const data::decode::Decoder* dec,
 		uint32_t bin_class_id, uint32_t chunk_id, const vector<uint8_t> **dest,
 		uint64_t *size);
-	void get_binary_data_chunks_merged(uint32_t segment_id, const data::decode::Decoder* dec,
-		uint32_t bin_class_id, uint64_t start_sample, uint64_t end_sample,
+	void get_merged_binary_data_chunks_by_sample(uint32_t segment_id,
+		const data::decode::Decoder* dec, uint32_t bin_class_id,
+		uint64_t start_sample, uint64_t end_sample,
+		vector<uint8_t> *dest) const;
+	void get_merged_binary_data_chunks_by_offset(uint32_t segment_id,
+		const data::decode::Decoder* dec, uint32_t bin_class_id,
+		uint64_t start, uint64_t end,
 		vector<uint8_t> *dest) const;
 	const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
 		const data::decode::Decoder* dec, uint32_t bin_class_id) const;