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

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index a18a59f2..2e37ed2d 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -22,11 +22,11 @@
 
 #include "segment.hpp"
 
-#include <utility>
 #include <vector>
 
 #include <QObject>
 
+using std::enable_shared_from_this;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
@@ -48,13 +48,7 @@ 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
+class LogicSegment : public Segment, public enable_shared_from_this<Segment>
 {
 	Q_OBJECT
 
@@ -81,15 +75,19 @@ public:
 
 	virtual ~LogicSegment();
 
+	/**
+	 * Using enable_shared_from_this prevents the normal use of shared_ptr
+	 * instances by users of LogicSegment instances. Instead, shared_ptrs may
+	 * only be created by the instance itself.
+	 * See https://en.cppreference.com/w/cpp/memory/enable_shared_from_this
+	 */
+	shared_ptr<const LogicSegment> get_shared_ptr() const;
+
 	void append_payload(shared_ptr<sigrok::Logic> logic);
 	void append_payload(void *data, uint64_t data_size);
 
 	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 +115,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 +129,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;