X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=logicdatasnapshot.h;h=974aff6cf1d3cd6f2199809d416f671176854aa6;hp=c49d05d58ca2d032f84c28f045238be4ef12d120;hb=3db297c4f9c6cf3023e68b1f9e37ac4ea1c7ef3c;hpb=4ceab49abb3c0160cfefdefa6a9c84284d30f850

diff --git a/logicdatasnapshot.h b/logicdatasnapshot.h
index c49d05d5..974aff6c 100644
--- a/logicdatasnapshot.h
+++ b/logicdatasnapshot.h
@@ -23,6 +23,13 @@
 #include <utility>
 #include <vector>
 
+namespace LogicDataSnapshotTest {
+	class Pow2;
+	class Basic;
+	class LargeData;
+	class Pulses;
+}
+
 class LogicDataSnapshot : public DataSnapshot
 {
 private:
@@ -37,6 +44,7 @@ private:
 	static const int ScaleStepCount = 10;
 	static const int MipMapScalePower;
 	static const int MipMapScaleFactor;
+	static const float LogMipMapScaleFactor;
 	static const uint64_t MipMapDataUnit;
 
 public:
@@ -63,17 +71,25 @@ public:
 	 * @param[out] edges The vector to place the edges into.
 	 * @param[in] start The start sample index.
 	 * @param[in] end The end sample index.
-	 * @param[in] quantization_length The minimum period of time that
+	 * @param[in] min_length The minimum number of samples that
 	 * 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,
 		int64_t start, int64_t end,
-		int64_t quantization_length, int sig_index);
+		float min_length, int sig_index);
+
+private:
+	uint64_t get_subsample(int level, uint64_t offset) const;
+
+	static int64_t pow2_ceil(int64_t x, unsigned int power);
 
 private:
 	struct MipMapLevel _mip_map[ScaleStepCount];
 	uint64_t _last_append_sample;
 
-	friend class LogicDataSnapshotTest;
+	friend class LogicDataSnapshotTest::Pow2;
+	friend class LogicDataSnapshotTest::Basic;
+	friend class LogicDataSnapshotTest::LargeData;
+	friend class LogicDataSnapshotTest::Pulses;
 };