Switch segment storage from single vector to vector of arrays

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

diff --git a/pv/data/analogsegment.hpp b/pv/data/analogsegment.hpp
index 520f7168247222015896ae3deea7256cdfa115f6..52d37a76c3e67fdfba671ae46030e390940e1355 100644 (file)
--- a/pv/data/analogsegment.hpp
+++ b/pv/data/analogsegment.hpp
@@ -32,6 +32,12 @@ struct Basic;
 namespace pv {
 namespace data {
 
+typedef struct {
+       uint64_t sample_index, chunk_num, chunk_offs;
+       uint8_t* chunk;
+       float* value;
+} SegmentAnalogDataIterator;
+
 class AnalogSegment : public Segment
 {
 public:
@@ -65,7 +71,7 @@ private:
        static const uint64_t EnvelopeDataUnit;
 
 public:
-       AnalogSegment(uint64_t samplerate, uint64_t expected_num_samples = 0);
+       AnalogSegment(uint64_t samplerate);
 
        virtual ~AnalogSegment();
 
@@ -75,6 +81,10 @@ public:
        const float* get_samples(int64_t start_sample,
                int64_t end_sample) const;
 
+       SegmentAnalogDataIterator* begin_sample_iteration(uint64_t start) const;
+       void continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const;
+       void end_sample_iteration(SegmentAnalogDataIterator* it) const;
+
        void get_envelope_section(EnvelopeSection &s,
                uint64_t start, uint64_t end, float min_length) const;