Make unit_size in Snapshot class unsigned.

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

diff --git a/pv/data/analogsnapshot.cpp b/pv/data/analogsnapshot.cpp
index c052782ed6cc6842f5029c80b6de3223ee76d50c..2a14d1ea0a0f37bf7687ca3f2f48f864e1849497 100644 (file)
--- a/pv/data/analogsnapshot.cpp
+++ b/pv/data/analogsnapshot.cpp
@@ -27,12 +27,14 @@
 
 #include <algorithm>
 
-#include <boost/foreach.hpp>
-
 #include "analogsnapshot.h"
 
-using namespace boost;
-using namespace std;
+using std::lock_guard;
+using std::recursive_mutex;
+using std::max;
+using std::max_element;
+using std::min;
+using std::min_element;
 
 namespace pv {
 namespace data {
@@ -43,26 +45,40 @@ 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()
 {
        lock_guard<recursive_mutex> lock(_mutex);
-       BOOST_FOREACH(Envelope &e, _envelope_levels)
+       for (Envelope &e : _envelope_levels)
                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.resize((_sample_count + sample_count) * sizeof(float));
+
+       float *dst = (float*)_data.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();
@@ -80,11 +96,35 @@ const float* AnalogSnapshot::get_samples(
        lock_guard<recursive_mutex> lock(_mutex);
 
        float *const data = new float[end_sample - start_sample];
-       memcpy(data, (float*)_data + start_sample, sizeof(float) *
+       memcpy(data, (float*)_data.data() + start_sample, sizeof(float) *
                (end_sample - start_sample));
        return data;
 }
 
+void AnalogSnapshot::get_envelope_section(EnvelopeSection &s,
+       uint64_t start, uint64_t end, float min_length) const
+{
+       assert(end <= get_sample_count());
+       assert(start <= end);
+       assert(min_length > 0);
+
+       lock_guard<recursive_mutex> lock(_mutex);
+
+       const unsigned int min_level = max((int)floorf(logf(min_length) /
+               LogEnvelopeScaleFactor) - 1, 0);
+       const unsigned int scale_power = (min_level + 1) *
+               EnvelopeScalePower;
+       start >>= scale_power;
+       end >>= scale_power;
+
+       s.start = start << scale_power;
+       s.scale = 1 << scale_power;
+       s.length = end - start;
+       s.samples = new EnvelopeSample[s.length];
+       memcpy(s.samples, _envelope_levels[min_level].samples + start,
+               s.length * sizeof(EnvelopeSample));
+}
+
 void AnalogSnapshot::reallocate_envelope(Envelope &e)
 {
        const uint64_t new_data_length = ((e.length + EnvelopeDataUnit - 1) /
@@ -116,9 +156,9 @@ void AnalogSnapshot::append_payload_to_envelope_levels()
        dest_ptr = e0.samples + prev_length;
 
        // Iterate through the samples to populate the first level mipmap
-       const float *const end_src_ptr = (float*)_data +
+       const float *const end_src_ptr = (float*)_data.data() +
                e0.length * EnvelopeScaleFactor;
-       for (const float *src_ptr = (float*)_data +
+       for (const float *src_ptr = (float*)_data.data() +
                prev_length * EnvelopeScaleFactor;
                src_ptr < end_src_ptr; src_ptr += EnvelopeScaleFactor)
        {