X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=2eeaf1c76fa4c1cba4718c8e627c05e1bb0e7afa;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hp=80ad64cdfebf90398213d801ef184f128cc7d4bd;hpb=f9101a91fc942a28515872ae6c7285973bd54b91;p=pulseview.git

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 80ad64c..2eeaf1c 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -25,6 +25,7 @@
 
 #include <list>
 
+#include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
@@ -36,8 +37,9 @@
 
 struct srd_decoder;
 struct srd_decoder_annotation_row;
-struct srd_probe;
+struct srd_channel;
 struct srd_proto_data;
+struct srd_session;
 
 namespace DecoderStackTest {
 class TwoDecoderStack;
@@ -45,12 +47,16 @@ class TwoDecoderStack;
 
 namespace pv {
 
+class SigSession;
+
 namespace view {
 class LogicSignal;
 }
 
 namespace data {
 
+class LogicSnapshot;
+
 namespace decode {
 class Annotation;
 class Decoder;
@@ -66,9 +72,11 @@ private:
 	static const double DecodeMargin;
 	static const double DecodeThreshold;
 	static const int64_t DecodeChunkLength;
+	static const unsigned int DecodeNotifyPeriod;
 
 public:
-	DecoderStack(const srd_decoder *const decoder);
+	DecoderStack(pv::SigSession &_session,
+		const srd_decoder *const decoder);
 
 	virtual ~DecoderStack();
 
@@ -78,7 +86,7 @@ public:
 
 	int64_t samples_decoded() const;
 
-	std::vector<decode::Row> get_rows() const;
+	std::vector<decode::Row> get_visible_rows() const;
 
 	/**
 	 * Extracts sorted annotations between two period into a vector.
@@ -97,15 +105,28 @@ public:
 	void begin_decode();
 
 private:
-	void decode_proc(boost::shared_ptr<data::Logic> data);
+	boost::optional<int64_t> wait_for_data() const;
+
+	void decode_data(const int64_t sample_count,
+		const unsigned int unit_size, srd_session *const session);
+
+	void decode_proc();
 
 	static void annotation_callback(srd_proto_data *pdata,
 		void *decoder);
 
+private slots:
+	void on_new_frame();
+
+	void on_data_received();
+
+	void on_frame_ended();
+
 signals:
 	void new_decode_data();
 
 private:
+	pv::SigSession &_session;
 
 	/**
 	 * This mutex prevents more than one decode operation occuring
@@ -117,7 +138,14 @@ private:
 
 	std::list< boost::shared_ptr<decode::Decoder> > _stack;
 
-	mutable boost::mutex _mutex;
+	boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+
+	mutable boost::mutex _input_mutex;
+	mutable boost::condition_variable _input_cond;
+	int64_t _sample_count;
+	bool _frame_complete;
+
+	mutable boost::mutex _output_mutex;
 	int64_t	_samples_decoded;
 
 	std::map<const decode::Row, decode::RowData> _rows;