Implemented threaded decode

[pulseview.git] / pv / data / decoderstack.h

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 308dce6edde0ad8b480bf65beba7cc6b6ca7cac9..073f2692565da5db9f0024d74ae4f5cb9581c48e 100644 (file)
--- 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>
 
@@ -103,9 +104,10 @@ 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_data(const int64_t sample_count,
+               const unsigned int unit_size, srd_session *const session);
 
        void decode_proc(boost::shared_ptr<data::Logic> data);
 
@@ -115,6 +117,10 @@ private:
 private slots:
        void on_new_frame();
 
+       void on_data_received();
+
+       void on_frame_ended();
+
 signals:
        void new_decode_data();
 
@@ -131,6 +137,13 @@ private:
 
        std::list< boost::shared_ptr<decode::Decoder> > _stack;
 
+       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;