X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=ab700ae0404bfd85129f761ed3886f413c03100b;hp=339c1e0386daf3cd1b9421b67613956564444428;hb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;hpb=dd048a7ec035447c051c7937ce04aca5be065b4e

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 339c1e03..ab700ae0 100644
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -23,10 +23,14 @@
 
 #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>
@@ -36,8 +40,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 +50,16 @@ class TwoDecoderStack;
 
 namespace pv {
 
+class SigSession;
+
 namespace view {
 class LogicSignal;
 }
 
 namespace data {
 
+class LogicSnapshot;
+
 namespace decode {
 class Annotation;
 class Decoder;
@@ -66,14 +75,16 @@ 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;
@@ -97,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);
 
+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
@@ -113,11 +137,18 @@ 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;
 
-	std::list< boost::shared_ptr<decode::Decoder> > _stack;
+	mutable std::mutex _input_mutex;
+	mutable std::condition_variable _input_cond;
+	int64_t _sample_count;
+	bool _frame_complete;
 
-	mutable boost::mutex _mutex;
+	mutable std::mutex _output_mutex;
 	int64_t	_samples_decoded;
 
 	std::map<const decode::Row, decode::RowData> _rows;
@@ -126,7 +157,8 @@ private:
 
 	QString _error_message;
 
-	boost::thread _decode_thread;
+	std::thread _decode_thread;
+	std::atomic<bool> _interrupt;
 
 	friend class DecoderStackTest::TwoDecoderStack;
 };