Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index cfc0f2bb60a9498d9561f10c27b5e22ae84ee896..45db047e179e3477de9ef5a09f91455e27f613e1 100644 (file)
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -19,9 +19,9 @@
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstring>
+#include <cstdlib>
 #include <cmath>
 
 #include <algorithm>
@@ -31,18 +31,19 @@
 
 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;
 
 namespace pv {
 namespace data {
 
 const int AnalogSegment::EnvelopeScalePower = 4;
 const int AnalogSegment::EnvelopeScaleFactor = 1 << EnvelopeScalePower;
-const float AnalogSegment::LogEnvelopeScaleFactor =
-       logf(EnvelopeScaleFactor);
+const float AnalogSegment::LogEnvelopeScaleFactor = logf(EnvelopeScaleFactor);
 const uint64_t AnalogSegment::EnvelopeDataUnit = 64*1024;      // bytes
 
 AnalogSegment::AnalogSegment(Analog& owner, uint64_t samplerate) :
@@ -71,7 +72,7 @@ void AnalogSegment::append_interleaved_samples(const float *data,
 
        uint64_t prev_sample_count = sample_count_;
 
-       for (uint32_t i=0; i < sample_count; i++) {
+       for (uint32_t i = 0; i < sample_count; i++) {
                append_single_sample((void*)data);
                data += stride;
        }
@@ -101,22 +102,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);
 }
@@ -167,6 +168,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;
@@ -177,7 +192,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) {
@@ -188,8 +203,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;
@@ -199,7 +216,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;