X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=c50f3859962d020847ce9166727c1066feaa0bff;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=e2139f5b5ca94969e4d704a6cc50ae8024af78c4;hpb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;p=pulseview.git

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index e2139f5..c50f385 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -23,30 +23,43 @@
 
 #include "signaldata.h"
 
+#include <atomic>
+#include <condition_variable>
 #include <list>
+#include <map>
+#include <memory>
+#include <thread>
 
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
+#include <boost/optional.hpp>
 
 #include <QObject>
 #include <QString>
 
+#include <pv/data/decode/row.h>
+#include <pv/data/decode/rowdata.h>
+
 struct srd_decoder;
-struct srd_probe;
+struct srd_decoder_annotation_row;
+struct srd_channel;
 struct srd_proto_data;
+struct srd_session;
 
 namespace DecoderStackTest {
-class TwoDecoderStack;
+struct TwoDecoderStack;
 }
 
 namespace pv {
 
+class SigSession;
+
 namespace view {
 class LogicSignal;
 }
 
 namespace data {
 
+class LogicSnapshot;
+
 namespace decode {
 class Annotation;
 class Decoder;
@@ -62,19 +75,29 @@ 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();
 
-	const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
-	void push(boost::shared_ptr<decode::Decoder> decoder);
+	const std::list< std::shared_ptr<decode::Decoder> >& stack() const;
+	void push(std::shared_ptr<decode::Decoder> decoder);
 	void remove(int index);
 
 	int64_t samples_decoded() const;
 
-	const std::vector<pv::data::decode::Annotation> annotations() const;
+	std::vector<decode::Row> get_visible_rows() const;
+
+	/**
+	 * Extracts sorted annotations between two period into a vector.
+	 */
+	void get_annotation_subset(
+		std::vector<pv::data::decode::Annotation> &dest,
+		const decode::Row &row, uint64_t start_sample,
+		uint64_t end_sample) const;
 
 	QString error_message();
 
@@ -85,15 +108,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);
 
-signals:
+private Q_SLOTS:
+	void on_new_frame();
+
+	void on_data_received();
+
+	void on_frame_ended();
+
+Q_SIGNALS:
 	void new_decode_data();
 
 private:
+	pv::SigSession &session_;
 
 	/**
 	 * This mutex prevents more than one decode operation occuring
@@ -101,18 +137,30 @@ private:
 	 * @todo A proper solution should be implemented to allow multiple
 	 * decode operations.
 	 */
-	static boost::mutex _global_decode_mutex;
+	static std::mutex global_decode_mutex_;
+
+	std::list< std::shared_ptr<decode::Decoder> > stack_;
+
+	std::shared_ptr<pv::data::LogicSnapshot> snapshot_;
+
+	mutable std::mutex input_mutex_;
+	mutable std::condition_variable input_cond_;
+	int64_t sample_count_;
+	bool frame_complete_;
+
+	mutable std::mutex output_mutex_;
+	int64_t	samples_decoded_;
+
+	std::map<const decode::Row, decode::RowData> rows_;
 
-	std::list< boost::shared_ptr<decode::Decoder> > _stack;
+	std::map<std::pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
-	mutable boost::mutex _mutex;
-	int64_t	_samples_decoded;
-	std::vector<pv::data::decode::Annotation> _annotations;
-	QString _error_message;
+	QString error_message_;
 
-	boost::thread _decode_thread;
+	std::thread decode_thread_;
+	std::atomic<bool> interrupt_;
 
-	friend class DecoderStackTest::TwoDecoderStack;
+	friend struct DecoderStackTest::TwoDecoderStack;
 };
 
 } // namespace data