X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.h;h=35f76874bc77bfbc40230aa51d956b7380bed7a5;hb=e9213170687cf4afd14e20acdc690ff9381d94ae;hp=308dce6edde0ad8b480bf65beba7cc6b6ca7cac9;hpb=28b9cc08aa62c02fd64dfb09eff4b9bfdb01f518;p=pulseview.git

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 308dce6..35f7687 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,12 +40,12 @@
 
 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;
+struct TwoDecoderStack;
 }
 
 namespace pv {
@@ -71,6 +75,7 @@ private:
 	static const double DecodeMargin;
 	static const double DecodeThreshold;
 	static const int64_t DecodeChunkLength;
+	static const unsigned int DecodeNotifyPeriod;
 
 public:
 	DecoderStack(pv::SigSession &_session,
@@ -78,8 +83,8 @@ public:
 
 	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;
@@ -103,19 +108,24 @@ public:
 	void begin_decode();
 
 private:
-	void decode_data(
-		const boost::shared_ptr<pv::data::LogicSnapshot> &snapshot,
-		srd_session *const session);
+	boost::optional<int64_t> wait_for_data() const;
 
-	void decode_proc(boost::shared_ptr<data::Logic> data);
+	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:
+private Q_SLOTS:
 	void on_new_frame();
 
-signals:
+	void on_data_received();
+
+	void on_frame_ended();
+
+Q_SIGNALS:
 	void new_decode_data();
 
 private:
@@ -127,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 _output_mutex;
+	mutable std::mutex _output_mutex;
 	int64_t	_samples_decoded;
 
 	std::map<const decode::Row, decode::RowData> _rows;
@@ -140,9 +157,10 @@ private:
 
 	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