DecodeSignal: Add and use inclusive/exclusive sample count variant

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

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index 21d14b810d558d757f919dbc68932fbcc5dc6d6f..9bbdd2c4e2c9d68e21d69782f5d2e78ecc0e7000 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -76,7 +76,7 @@ struct DecodeSegment
        map<const decode::Row, decode::RowData> annotation_rows;
        pv::util::Timestamp start_time;
        double samplerate;
-       int64_t samples_decoded;
+       int64_t samples_decoded_incl, samples_decoded_excl;
 };
 
 class DecodeSignal : public SignalBase
@@ -99,7 +99,7 @@ public:
        void remove_decoder(int index);
        bool toggle_decoder_visibility(int index);
 
-       void reset_decode();
+       void reset_decode(bool shutting_down = false);
        void begin_decode();
        QString error_message() const;
 
@@ -113,8 +113,6 @@ public:
        double samplerate() const;
        const pv::util::Timestamp start_time() const;
 
-       uint32_t get_input_segment_count() const;
-
        /**
         * Returns the number of samples that can be worked on,
         * i.e. the number of samples where samples are available
@@ -122,12 +120,23 @@ public:
         */
        int64_t get_working_sample_count(uint32_t segment_id) const;
 
-       int64_t get_decoded_sample_count(uint32_t segment_id) const;
+       /**
+        * Returns the number of processed samples. Newly generated annotations will
+        * have sample numbers greater than this.
+        *
+        * If include_processing is true, this number will include the ones being
+        * currently processed (in case the decoder stack is running). In this case,
+        * newly generated annotations will have sample numbers smaller than this.
+        */
+       int64_t get_decoded_sample_count(uint32_t segment_id,
+               bool include_processing) const;
 
        vector<decode::Row> visible_rows() const;
 
        /**
-        * Extracts sorted annotations between two period into a vector.
+        * Extracts annotations between the given sample range into a vector.
+        * Note: The annotations are unsorted and only annotations that fully
+        * fit into the sample range are considered.
         */
        void get_annotation_subset(
                vector<pv::data::decode::Annotation> &dest,
@@ -139,6 +148,12 @@ public:
        virtual void restore_settings(QSettings &settings);
 
 private:
+       void set_error_message(QString msg);
+
+       uint32_t get_input_segment_count() const;
+
+       uint32_t get_input_samplerate(uint32_t segment_id) const;
+
        void update_channel_list();
 
        void commit_decoder_channels();
@@ -147,18 +162,18 @@ private:
 
        void logic_mux_proc();
 
-       void query_input_metadata();
-
-       void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count);
+       void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
+               const shared_ptr<LogicSegment> input_segment);
 
        void decode_proc();
 
        void start_srd_session();
+       void terminate_srd_session();
        void stop_srd_session();
 
        void connect_input_notifiers();
 
-       void create_new_segment();
+       void create_decode_segment();
 
        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
@@ -181,18 +196,15 @@ private:
        struct srd_session *srd_session_;
 
        shared_ptr<Logic> logic_mux_data_;
-       shared_ptr<LogicSegment> logic_mux_segment_;
        uint32_t logic_mux_unit_size_;
        bool logic_mux_data_invalid_;
 
-       uint32_t currently_processed_segment_;
-
        vector< shared_ptr<decode::Decoder> > stack_;
+       bool stack_config_changed_;
        map<pair<const srd_decoder*, int>, decode::Row> class_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_;