X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=67959b31ec17e402bca93466249355fd60cc5ea4;hb=0df28cd5a727c5e4ff2c46e3258b76936bc0c33d;hp=a18a59f2e154130de84f5b7c009c2f9f50199fff;hpb=b4bc9b55381ff22196785291d3862c8c8c131885;p=pulseview.git

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index a18a59f2..67959b31 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -48,12 +48,6 @@ namespace data {
 
 class Logic;
 
-typedef struct {
-	uint64_t sample_index, chunk_num, chunk_offs;
-	uint8_t* chunk;
-	uint8_t* value;
-} SegmentLogicDataIterator;
-
 class LogicSegment : public Segment
 {
 	Q_OBJECT
@@ -86,10 +80,6 @@ public:
 
 	void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest) const;
 
-	SegmentLogicDataIterator* begin_sample_iteration(uint64_t start);
-	void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase);
-	void end_sample_iteration(SegmentLogicDataIterator* it);
-
 	/**
 	 * Parses a logic data segment to generate a list of transitions
 	 * in a time interval to a given level of detail.
@@ -117,6 +107,10 @@ private:
 
 	uint64_t get_unpacked_sample(uint64_t index) const;
 
+	template <class T> void downsampleTmain(const T*&in, T &acc, T &prev);
+	template <class T> void downsampleT(const uint8_t *in, uint8_t *&out, uint64_t len);
+	void downsampleGeneric(const uint8_t *in, uint8_t *&out, uint64_t len);
+
 private:
 	uint64_t get_subsample(int level, uint64_t offset) const;
 
@@ -127,6 +121,8 @@ private:
 
 	struct MipMapLevel mip_map_[ScaleStepCount];
 	uint64_t last_append_sample_;
+	uint64_t last_append_accumulator_;
+	uint64_t last_append_extra_;
 
 	friend struct LogicSegmentTest::Pow2;
 	friend struct LogicSegmentTest::Basic;