Begin PD multisegment support

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index a7afe44e7408ecf6fac5bdb92f03300493155b46..d85821c6ca58db1d20a74f0e71d1ec48129e989a 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -36,6 +36,7 @@ using std::lock_guard;
 using std::make_pair;
 using std::make_shared;
 using std::min;
+using std::out_of_range;
 using std::shared_ptr;
 using std::unique_lock;
 using pv::data::decode::Annotation;
@@ -147,6 +148,7 @@ void DecodeSignal::reset_decode()
 
        frame_complete_ = false;
        samples_decoded_ = 0;
+       currently_processed_segment_ = 0;
        error_message_ = QString();
 
        rows_.clear();
@@ -332,15 +334,13 @@ const pv::util::Timestamp& DecodeSignal::start_time() const
        return start_time_;
 }
 
-int64_t DecodeSignal::get_working_sample_count() const
+int64_t DecodeSignal::get_working_sample_count(uint32_t segment_id) const
 {
        // The working sample count is the highest sample number for
        // which all used signals have data available, so go through
        // all channels and use the lowest overall sample count of the
        // current segment
 
-       // TODO Currently, we assume only a single segment exists
-
        int64_t count = std::numeric_limits<int64_t>::max();
        bool no_signals_assigned = true;
 
@@ -352,17 +352,34 @@ int64_t DecodeSignal::get_working_sample_count() const
                        if (!logic_data || logic_data->logic_segments().empty())
                                return 0;
 
-                       const shared_ptr<LogicSegment> segment = logic_data->logic_segments().front();
-                       count = min(count, (int64_t)segment->get_sample_count());
+                       try {
+                               const shared_ptr<LogicSegment> segment = logic_data->logic_segments().at(segment_id);
+                               count = min(count, (int64_t)segment->get_sample_count());
+                       } catch (out_of_range) {
+                               return 0;
+                       }
                }
 
        return (no_signals_assigned ? 0 : count);
 }
 
-int64_t DecodeSignal::get_decoded_sample_count() const
+int64_t DecodeSignal::get_decoded_sample_count(uint32_t segment_id) const
 {
        lock_guard<mutex> decode_lock(output_mutex_);
-       return samples_decoded_;
+
+       int64_t result = 0;
+
+       if (segment_id == currently_processed_segment_)
+               result = samples_decoded_;
+       else
+               if (segment_id < currently_processed_segment_)
+                       // Segment was already decoded fully
+                       result = get_working_sample_count(segment_id);
+               else
+                       // Segment wasn't decoded at all yet
+                       result = 0;
+
+       return result;
 }
 
 vector<Row> DecodeSignal::visible_rows() const
@@ -718,7 +735,7 @@ void DecodeSignal::mux_logic_samples(const int64_t start, const int64_t end)
 void DecodeSignal::logic_mux_proc()
 {
        do {
-               const uint64_t input_sample_count = get_working_sample_count();
+               const uint64_t input_sample_count = get_working_sample_count(currently_processed_segment_);
                const uint64_t output_sample_count = logic_mux_segment_->get_sample_count();
 
                const uint64_t samples_to_process =

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index dd2ad79dbb790f0553220fe34fbb211ba710ca2f..0a28fe3c5324eba3fcaf230910a38071c06f578b 100644 (file)
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -110,9 +110,9 @@ public:
         * i.e. the number of samples where samples are available
         * for all connected channels.
         */
-       int64_t get_working_sample_count() const;
+       int64_t get_working_sample_count(uint32_t segment_id) const;
 
-       int64_t get_decoded_sample_count() const;
+       int64_t get_decoded_sample_count(uint32_t segment_id) const;
 
        vector<decode::Row> visible_rows() const;
 
@@ -152,7 +152,7 @@ private:
        static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
-       void new_annotations();
+       void new_annotations(); // TODO Supply segment for which they belong to
        void decode_reset();
        void decode_finished();
        void channels_updated();
@@ -177,6 +177,7 @@ private:
        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_;
@@ -185,7 +186,7 @@ private:
        vector< map<const decode::Row, decode::RowData>> rows_;
 
        /// Set of annotations for current segment
-       map<const decode::Row, decode::RowData> *current_rows_;
+       map<const decode::Row, decode::RowData> *current_rows_; // TODO Multiple segment support
 
        mutable mutex input_mutex_, output_mutex_, logic_mux_mutex_;
        mutable condition_variable decode_input_cond_, logic_mux_cond_;

diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
index 509e77f6224b5dacbd9514d47f48b245f47a6c08..bc309a738d8d82ee6f0341c3d301ec5a0119c0e9 100644 (file)
--- a/pv/views/trace/decodetrace.cpp
+++ b/pv/views/trace/decodetrace.cpp
@@ -607,11 +607,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left, int right
 
        double samples_per_pixel, pixels_offset;
 
-       const int64_t sample_count = decode_signal_->get_working_sample_count();
+       const int64_t sample_count = decode_signal_->get_working_sample_count(current_segment_);
        if (sample_count == 0)
                return;
 
-       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count();
+       const int64_t samples_decoded = decode_signal_->get_decoded_sample_count(current_segment_);
        if (sample_count == samples_decoded)
                return;