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

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 43fd4112..67959b31 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -25,6 +25,12 @@
 #include <utility>
 #include <vector>
 
+#include <QObject>
+
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 namespace sigrok {
 	class Logic;
 }
@@ -40,56 +46,40 @@ struct LongPulses;
 namespace pv {
 namespace data {
 
-typedef struct {
-	uint64_t sample_index, chunk_num, chunk_offs;
-	uint8_t* chunk;
-	uint8_t* value;
-} SegmentLogicDataIterator;
+class Logic;
 
 class LogicSegment : public Segment
 {
-private:
-	struct MipMapLevel
-	{
-		uint64_t length;
-		uint64_t data_length;
-		void *data;
-	};
+	Q_OBJECT
+
+public:
+	typedef pair<int64_t, bool> EdgePair;
 
-private:
 	static const unsigned int ScaleStepCount = 10;
 	static const int MipMapScalePower;
 	static const int MipMapScaleFactor;
 	static const float LogMipMapScaleFactor;
 	static const uint64_t MipMapDataUnit;
 
-public:
-	typedef std::pair<int64_t, bool> EdgePair;
+private:
+	struct MipMapLevel
+	{
+		uint64_t length;
+		uint64_t data_length;
+		void *data;
+	};
 
 public:
-	LogicSegment(std::shared_ptr<sigrok::Logic> logic, uint64_t samplerate);
+	LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
+		unsigned int unit_size, uint64_t samplerate);
 
 	virtual ~LogicSegment();
 
-	void append_payload(std::shared_ptr<sigrok::Logic> logic);
-
-	const uint8_t* get_samples(int64_t start_sample, int64_t end_sample) const;
-
-	SegmentLogicDataIterator* begin_sample_iteration(uint64_t start) const;
-	void continue_sample_iteration(SegmentLogicDataIterator* it, uint64_t increase) const;
-	void end_sample_iteration(SegmentLogicDataIterator* it) const;
+	void append_payload(shared_ptr<sigrok::Logic> logic);
+	void append_payload(void *data, uint64_t data_size);
 
-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();
+	void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest) const;
 
-	uint64_t get_unpacked_sample(uint64_t index) const;
-
-public:
 	/**
 	 * Parses a logic data segment to generate a list of transitions
 	 * in a time interval to a given level of detail.
@@ -100,9 +90,26 @@ public:
 	 * can be resolved at this level of detail.
 	 * @param[in] sig_index The index of the signal.
 	 */
-	void get_subsampled_edges(std::vector<EdgePair> &edges,
+	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;
@@ -110,8 +117,12 @@ private:
 	static uint64_t pow2_ceil(uint64_t x, unsigned int power);
 
 private:
+	Logic& owner_;
+
 	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;