Prepare multi-segment protocol decoding ability

[pulseview.git] / pv / data / decodesignal.hpp

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 29e8441a83785ee62628959d4676791f90456b27..90c06de4972ebc2268ad943ac5ec87b07fdeb3fc 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -71,6 +71,14 @@ struct DecodeChannel
        const srd_channel *pdch_;
 };
 
        const srd_channel *pdch_;
 };
 

+struct DecodeSegment
+{
+       map<const decode::Row, decode::RowData> annotation_rows;
+       pv::util::Timestamp start_time;
+       double samplerate;
+       int64_t samples_decoded;
+};
+

 class DecodeSignal : public SignalBase
 {
        Q_OBJECT
 class DecodeSignal : public SignalBase
 {
        Q_OBJECT


@@ -103,7 +111,7 @@ public:
        void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
        double samplerate() const;
        void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
        double samplerate() const;

-       const pv::util::Timestamp& start_time() const;
+       const pv::util::Timestamp start_time() const;

 
        /**
         * Returns the number of samples that can be worked on,
 
        /**
         * Returns the number of samples that can be worked on,


@@ -121,7 +129,7 @@ public:
         */
        void get_annotation_subset(
                vector<pv::data::decode::Annotation> &dest,
         */
        void get_annotation_subset(
                vector<pv::data::decode::Annotation> &dest,

-               const decode::Row &row, uint64_t start_sample,
+               const decode::Row &row, uint32_t segment_id, uint64_t start_sample,

                uint64_t end_sample) const;
 
        virtual void save_settings(QSettings &settings) const;
                uint64_t end_sample) const;
 
        virtual void save_settings(QSettings &settings) const;


@@ -148,7 +156,8 @@ private:
 
        void connect_input_notifiers();
 
 
        void connect_input_notifiers();
 

-       void create_new_annotation_segment();
+       void create_new_segment();
+

        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:


@@ -171,26 +180,20 @@ private:
 
        shared_ptr<Logic> logic_mux_data_;
        shared_ptr<LogicSegment> logic_mux_segment_;
 
        shared_ptr<Logic> logic_mux_data_;
        shared_ptr<LogicSegment> logic_mux_segment_;

+       uint32_t logic_unit_size_;

        bool logic_mux_data_invalid_;
 
        bool logic_mux_data_invalid_;
 

-       pv::util::Timestamp start_time_;
-       double samplerate_;
-
-       int64_t samples_decoded_;

        uint32_t currently_processed_segment_;
 
        vector< shared_ptr<decode::Decoder> > stack_;
        map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 
        uint32_t currently_processed_segment_;
 
        vector< shared_ptr<decode::Decoder> > stack_;
        map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
 

-       /// Annotations for all segments
-       vector< map<const decode::Row, decode::RowData>> segmented_rows_;
-
-       /// Set of annotations for current segment
-       map<const decode::Row, decode::RowData> *current_rows_;
+       vector<DecodeSegment> segments_;
+       uint32_t current_segment_id_;
+       DecodeSegment *current_segment_;

 
        mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
        mutable condition_variable decode_input_cond_, logic_mux_cond_;
 
        mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
        mutable condition_variable decode_input_cond_, logic_mux_cond_;

-       bool frame_complete_;

 
        std::thread decode_thread_, logic_mux_thread_;
        atomic<bool> decode_interrupt_, logic_mux_interrupt_;
 
        std::thread decode_thread_, logic_mux_thread_;
        atomic<bool> decode_interrupt_, logic_mux_interrupt_;