X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.hpp;h=67959b31ec17e402bca93466249355fd60cc5ea4;hb=e23567ed84aa55e2a0c48252080058186f6b80e7;hp=c9e85593961d2bfbed83ed0797862ec594df0811;hpb=223d0c3748033130e9f11ff9af3dc29661f380e9;p=pulseview.git
diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index c9e8559..67959b3 100644
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_DATA_LOGICSEGMENT_HPP
@@ -26,6 +25,12 @@
#include
#include
+#include
+
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
namespace sigrok {
class Logic;
}
@@ -41,48 +46,40 @@ struct LongPulses;
namespace pv {
namespace data {
+class Logic;
+
class LogicSegment : public Segment
{
-private:
- struct MipMapLevel
- {
- uint64_t length;
- uint64_t data_length;
- void *data;
- };
+ Q_OBJECT
+
+public:
+ typedef pair 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 EdgePair;
+private:
+ struct MipMapLevel
+ {
+ uint64_t length;
+ uint64_t data_length;
+ void *data;
+ };
public:
- LogicSegment(std::shared_ptr logic,
- uint64_t samplerate, uint64_t expected_num_samples = 0);
+ LogicSegment(pv::data::Logic& owner, uint32_t segment_id,
+ unsigned int unit_size, uint64_t samplerate);
virtual ~LogicSegment();
- void append_payload(std::shared_ptr logic);
+ void append_payload(shared_ptr logic);
+ void append_payload(void *data, uint64_t data_size);
- void get_samples(uint8_t *const data,
- int64_t start_sample, int64_t end_sample) const;
+ void get_samples(int64_t start_sample, int64_t end_sample, uint8_t* dest) const;
-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_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.
@@ -93,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 &edges,
+ void get_subsampled_edges(vector &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 &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 void downsampleTmain(const T*&in, T &acc, T &prev);
+ template 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;
@@ -103,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;