X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fanalogsegment.cpp;h=5e42556ca8c3f01341283f909f2ffc81ed2d394a;hp=886bd4f58f9a531d5aff113e692352fa7460f742;hb=adb2a97bb18d0db0c936fa90b4164c8aac18e6fe;hpb=73e377feaaf01e790c87a4a0c918a36e87a9a6b9

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index 886bd4f5..5e42556c 100644
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -19,33 +19,38 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
 
 #include <algorithm>
 
+#include "analog.hpp"
 #include "analogsegment.hpp"
 
 using std::lock_guard;
 using std::recursive_mutex;
+using std::make_pair;
 using std::max;
 using std::max_element;
 using std::min;
 using std::min_element;
+using std::pair;
+using std::unique_ptr;
 
 namespace pv {
 namespace data {
 
 const int AnalogSegment::EnvelopeScalePower = 4;
 const int AnalogSegment::EnvelopeScaleFactor = 1 << EnvelopeScalePower;
-const float AnalogSegment::LogEnvelopeScaleFactor =
-	logf(EnvelopeScaleFactor);
-const uint64_t AnalogSegment::EnvelopeDataUnit = 64*1024;	// bytes
+const float AnalogSegment::LogEnvelopeScaleFactor = logf(EnvelopeScaleFactor);
+const uint64_t AnalogSegment::EnvelopeDataUnit = 64 * 1024;	// bytes
 
-AnalogSegment::AnalogSegment(uint64_t samplerate) :
+AnalogSegment::AnalogSegment(Analog& owner, uint64_t samplerate) :
 	Segment(samplerate, sizeof(float)),
+	owner_(owner),
 	min_value_(0),
 	max_value_(0)
 {
@@ -67,13 +72,28 @@ void AnalogSegment::append_interleaved_samples(const float *data,
 
 	lock_guard<recursive_mutex> lock(mutex_);
 
-	for (uint32_t i=0; i < sample_count; i++) {
-		append_single_sample((void*)data);
+	uint64_t prev_sample_count = sample_count_;
+
+	// Deinterleave the samples and add them
+	unique_ptr<float> deint_data(new float[sample_count]);
+	float *deint_data_ptr = deint_data.get();
+	for (uint32_t i = 0; i < sample_count; i++) {
+		*deint_data_ptr = (float)(*data);
+		deint_data_ptr++;
 		data += stride;
 	}
 
+	append_samples(deint_data.get(), sample_count);
+
 	// Generate the first mip-map from the data
 	append_payload_to_envelope_levels();
+
+	if (sample_count > 1)
+		owner_.notify_samples_added(this, prev_sample_count + 1,
+			prev_sample_count + 1 + sample_count);
+	else
+		owner_.notify_samples_added(this, prev_sample_count + 1,
+			prev_sample_count + 1);
 }
 
 const float* AnalogSegment::get_samples(
@@ -90,22 +110,22 @@ const float* AnalogSegment::get_samples(
 	return (float*)get_raw_samples(start_sample, (end_sample - start_sample));
 }
 
-const std::pair<float, float> AnalogSegment::get_min_max() const
+const pair<float, float> AnalogSegment::get_min_max() const
 {
-	return std::make_pair(min_value_, max_value_);
+	return make_pair(min_value_, max_value_);
 }
 
-SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start) const
+SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start)
 {
 	return (SegmentAnalogDataIterator*)begin_raw_sample_iteration(start);
 }
 
-void AnalogSegment::continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const
+void AnalogSegment::continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase)
 {
 	Segment::continue_raw_sample_iteration((SegmentRawDataIterator*)it, increase);
 }
 
-void AnalogSegment::end_sample_iteration(SegmentAnalogDataIterator* it) const
+void AnalogSegment::end_sample_iteration(SegmentAnalogDataIterator* it)
 {
 	Segment::end_raw_sample_iteration((SegmentRawDataIterator*)it);
 }
@@ -156,6 +176,20 @@ void AnalogSegment::append_payload_to_envelope_levels()
 	prev_length = e0.length;
 	e0.length = sample_count_ / EnvelopeScaleFactor;
 
+	// Calculate min/max values in case we have too few samples for an envelope
+	if (sample_count_ < EnvelopeScaleFactor) {
+		it = begin_raw_sample_iteration(0);
+		for (uint64_t i = 0; i < sample_count_; i++) {
+			const float sample = *((float*)it->value);
+			if (sample < min_value_)
+				min_value_ = sample;
+			if (sample > max_value_)
+				max_value_ = sample;
+			continue_raw_sample_iteration(it, 1);
+		}
+		end_raw_sample_iteration(it);
+	}
+
 	// Break off if there are no new samples to compute
 	if (e0.length == prev_length)
 		return;
@@ -166,7 +200,7 @@ void AnalogSegment::append_payload_to_envelope_levels()
 
 	// Iterate through the samples to populate the first level mipmap
 	uint64_t start_sample = prev_length * EnvelopeScaleFactor;
-	uint64_t end_sample   = e0.length * EnvelopeScaleFactor;
+	uint64_t end_sample = e0.length * EnvelopeScaleFactor;
 
 	it = begin_raw_sample_iteration(start_sample);
 	for (uint64_t i = start_sample; i < end_sample; i += EnvelopeScaleFactor) {
@@ -177,8 +211,10 @@ void AnalogSegment::append_payload_to_envelope_levels()
 			*max_element(samples, samples + EnvelopeScaleFactor),
 		};
 
-		if (sub_sample.min < min_value_) min_value_ = sub_sample.min;
-		if (sub_sample.max > max_value_) max_value_ = sub_sample.max;
+		if (sub_sample.min < min_value_)
+			min_value_ = sub_sample.min;
+		if (sub_sample.max > max_value_)
+			max_value_ = sub_sample.max;
 
 		continue_raw_sample_iteration(it, EnvelopeScaleFactor);
 		*dest_ptr++ = sub_sample;
@@ -188,7 +224,7 @@ void AnalogSegment::append_payload_to_envelope_levels()
 	// Compute higher level mipmaps
 	for (unsigned int level = 1; level < ScaleStepCount; level++) {
 		Envelope &e = envelope_levels_[level];
-		const Envelope &el = envelope_levels_[level-1];
+		const Envelope &el = envelope_levels_[level - 1];
 
 		// Expand the data buffer to fit the new samples
 		prev_length = e.length;