Make get_raw_samples() use provided mem instead of allocating

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

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index 1bd33876cc21ac99b455f356cf8993a2aedda42e..0860177e6d9f6139b1ad15053527feeff0ca877b 100644 (file)
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
+#include <memory>
 
 #include <algorithm>
 
@@ -37,6 +38,7 @@ using std::max_element;
 using std::min;
 using std::min_element;
 using std::pair;
+using std::unique_ptr;
 
 namespace pv {
 namespace data {
@@ -72,11 +74,17 @@ void AnalogSegment::append_interleaved_samples(const float *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++) {
-               append_single_sample((void*)data);
+               *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();
 
@@ -88,18 +96,19 @@ void AnalogSegment::append_interleaved_samples(const float *data,
                        prev_sample_count + 1);
 }
 
-const float* AnalogSegment::get_samples(
-       int64_t start_sample, int64_t end_sample) const
+void AnalogSegment::get_samples(int64_t start_sample, int64_t end_sample,
+       float* dest) const
 {
        assert(start_sample >= 0);
        assert(start_sample < (int64_t)sample_count_);
        assert(end_sample >= 0);
        assert(end_sample < (int64_t)sample_count_);
        assert(start_sample <= end_sample);
+       assert(dest != nullptr);
 
        lock_guard<recursive_mutex> lock(mutex_);
 
-       return (float*)get_raw_samples(start_sample, (end_sample - start_sample));
+       get_raw_samples(start_sample, (end_sample - start_sample), (uint8_t*)dest);
 }
 
 const pair<float, float> AnalogSegment::get_min_max() const