Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / data / analogsnapshot.cpp

diff --git a/pv/data/analogsnapshot.cpp b/pv/data/analogsnapshot.cpp
index bec65065631aa19239a1f27f18f3b6287521f3a5..4d4f5d67b8866b4d29aa754c595cf15c2cdd235b 100644 (file)
--- a/pv/data/analogsnapshot.cpp
+++ b/pv/data/analogsnapshot.cpp
@@ -31,8 +31,12 @@
 
 #include "analogsnapshot.h"
 
-using namespace boost;
-using namespace std;
+using boost::lock_guard;
+using boost::recursive_mutex;
+using std::max;
+using std::max_element;
+using std::min;
+using std::min_element;
 
 namespace pv {
 namespace data {
@@ -43,12 +47,13 @@ const float AnalogSnapshot::LogEnvelopeScaleFactor =
        logf(EnvelopeScaleFactor);
 const uint64_t AnalogSnapshot::EnvelopeDataUnit = 64*1024;     // bytes
 
-AnalogSnapshot::AnalogSnapshot(const sr_datafeed_analog &analog) :
+AnalogSnapshot::AnalogSnapshot(const uint64_t expected_num_samples) :
        Snapshot(sizeof(float))
 {
+       set_capacity(expected_num_samples);
+
        lock_guard<recursive_mutex> lock(_mutex);
        memset(_envelope_levels, 0, sizeof(_envelope_levels));
-       append_payload(analog);
 }
 
 AnalogSnapshot::~AnalogSnapshot()
@@ -58,11 +63,24 @@ AnalogSnapshot::~AnalogSnapshot()
                free(e.samples);
 }
 
-void AnalogSnapshot::append_payload(
-       const sr_datafeed_analog &analog)
+void AnalogSnapshot::append_interleaved_samples(const float *data,
+       size_t sample_count, size_t stride)
 {
+       assert(_unit_size == sizeof(float));
+
        lock_guard<recursive_mutex> lock(_mutex);
-       append_data(analog.data, analog.num_samples);
+
+       _data = realloc(_data, (_sample_count + sample_count) * sizeof(float));
+
+       float *dst = (float*)_data + _sample_count;
+       const float *dst_end = dst + sample_count;
+       while (dst != dst_end)
+       {
+               *dst++ = *data;
+               data += stride;
+       }
+
+       _sample_count += sample_count;
 
        // Generate the first mip-map from the data
        append_payload_to_envelope_levels();