Restart min-max-based conversion if min or max change

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

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index 5e42556ca8c3f01341283f909f2ffc81ed2d394a..0610a4a800ca426a961950491b1fa05fea920ba4 100644 (file)
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -96,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(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
@@ -177,6 +178,7 @@ void AnalogSegment::append_payload_to_envelope_levels()
        e0.length = sample_count_ / EnvelopeScaleFactor;
 
        // Calculate min/max values in case we have too few samples for an envelope
+       const float old_min_value = min_value_, old_max_value = max_value_;
        if (sample_count_ < EnvelopeScaleFactor) {
                it = begin_raw_sample_iteration(0);
                for (uint64_t i = 0; i < sample_count_; i++) {
@@ -256,6 +258,10 @@ void AnalogSegment::append_payload_to_envelope_levels()
                        *dest_ptr = sub_sample;
                }
        }
+
+       // Notify if the min or max value changed
+       if ((old_min_value != min_value_) || (old_max_value != max_value_))
+               owner_.min_max_changed(min_value_, max_value_);
 }
 
 } // namespace data