X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=2b67c0edb81ddad6165597499bf4d704d185a483;hp=88576118d06eb180b281d0d8ee9a9b2f1def1e2c;hb=04b0467582d8dfa989bb38fe18bfb1be20cea456;hpb=5b35d18ccf2e5a8949d1b4b37d06bf527480e547

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 88576118..2b67c0ed 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,26 +75,31 @@ 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);
-
-private:
-	uint64_t unpack_sample(const uint8_t *ptr) const;
-	void pack_sample(uint8_t *ptr, uint64_t value);
-
-	void reallocate_mipmap_level(MipMapLevel &m);
-
-	void append_payload_to_mipmap();
+	/**
+	 * Appends sample data for a single channel where each byte
+	 * represents one sample - if it's 0 the state is low, if 1 high.
+	 * Other values are not permitted.
+	 * Assumes that all channels are having samples added and in the
+	 * order of 0..n, not n..0.
+	 * Also assumes the the number of samples added for each channel
+	 * is constant for every invokation for 0..n. The number of samples
+	 * hence may only change when index is 0.
+	 */
+	void append_subsignal_payload(unsigned int index, void *data, uint64_t data_size);
 
-	uint64_t get_unpacked_sample(uint64_t index) const;
+	void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest) const;
 
-public:
 	/**
 	 * Parses a logic data segment to generate a list of transitions
 	 * in a time interval to a given level of detail.
@@ -113,7 +112,24 @@ public:
 	 */
 	void get_subsampled_edges(vector<EdgePair> &edges,
 		uint64_t start, uint64_t end,
-		float min_length, int sig_index);
+		float min_length, int sig_index, bool first_change_only = false);
+
+	void get_surrounding_edges(vector<EdgePair> &dest,
+		uint64_t origin_sample, float min_length, int sig_index);
+
+private:
+	uint64_t unpack_sample(const uint8_t *ptr) const;
+	void pack_sample(uint8_t *ptr, uint64_t value);
+
+	void reallocate_mipmap_level(MipMapLevel &m);
+
+	void append_payload_to_mipmap();
+
+	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;
@@ -125,6 +141,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;