Rename 'probe' to 'channel' (libsigrokdecode change).

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

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 9d032ad9756080c19fc8a83d5bc6f407260b906e..2eeaf1c76fa4c1cba4718c8e627c05e1bb0e7afa 100644 (file)
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -25,15 +25,21 @@
 
 #include <list>
 
+#include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.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;
@@ -41,12 +47,16 @@ class TwoDecoderStack;
 
 namespace pv {
 
+class SigSession;
+
 namespace view {
 class LogicSignal;
 }
 
 namespace data {
 
+class LogicSnapshot;
+
 namespace decode {
 class Annotation;
 class Decoder;
@@ -62,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();
 
@@ -74,12 +86,15 @@ public:
 
        int64_t samples_decoded() 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,
-               uint64_t start_sample, uint64_t end_sample) const;
+               const decode::Row &row, uint64_t start_sample,
+               uint64_t end_sample) const;
 
        QString error_message();
 
@@ -90,29 +105,28 @@ public:
        void begin_decode();
 
 private:
-       void decode_proc(boost::shared_ptr<data::Logic> data);
-
-       bool index_entry_start_sample_gt(
-               const uint64_t sample, const size_t index) const;
-       bool index_entry_end_sample_lt(
-               const size_t index, const uint64_t sample) const;
-       bool index_entry_end_sample_gt(
-               const uint64_t sample, const size_t index) const;
-
-       void insert_annotation_into_start_index(
-               const pv::data::decode::Annotation &a,
-               const size_t storage_offset);
-       void insert_annotation_into_end_index(
-               const pv::data::decode::Annotation &a,
-               const size_t storage_offset);
+       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
@@ -124,16 +138,19 @@ 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::vector<pv::data::decode::Annotation> _annotations;
 
-       /**
-        * _ann_start_index and _ann_end_index contain lists of annotions
-        * (represented by offsets in the _annotations vector), sorted in
-        * ascending ordered by the start_sample and end_sample respectively.
-        */
-       std::vector<size_t> _ann_start_index, _ann_end_index;
+       std::map<const decode::Row, decode::RowData> _rows;
+
+       std::map<std::pair<const srd_decoder*, int>, decode::Row> _class_rows;
 
        QString _error_message;