#include <extdef.h>
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cassert>
#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
#include <algorithm>
+#include "analog.hpp"
#include "analogsegment.hpp"
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;
+using std::unique_ptr;
namespace pv {
namespace data {
const int AnalogSegment::EnvelopeScalePower = 4;
const int AnalogSegment::EnvelopeScaleFactor = 1 << EnvelopeScalePower;
-const float AnalogSegment::LogEnvelopeScaleFactor =
- logf(EnvelopeScaleFactor);
-const uint64_t AnalogSegment::EnvelopeDataUnit = 64*1024; // bytes
+const float AnalogSegment::LogEnvelopeScaleFactor = logf(EnvelopeScaleFactor);
+const uint64_t AnalogSegment::EnvelopeDataUnit = 64 * 1024; // bytes
-AnalogSegment::AnalogSegment(uint64_t samplerate) :
- Segment(samplerate, sizeof(float)),
+AnalogSegment::AnalogSegment(Analog& owner, uint32_t segment_id, uint64_t samplerate) :
+ Segment(segment_id, samplerate, sizeof(float)),
+ owner_(owner),
min_value_(0),
max_value_(0)
{
lock_guard<recursive_mutex> lock(mutex_);
- for (uint32_t i=0; i < sample_count; i++) {
- append_single_sample((void*)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++) {
+ *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();
+
+ if (sample_count > 1)
+ owner_.notify_samples_added(this, prev_sample_count + 1,
+ prev_sample_count + 1 + sample_count);
+ else
+ owner_.notify_samples_added(this, prev_sample_count + 1,
+ 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));
-}
-
-const std::pair<float, float> AnalogSegment::get_min_max() const
-{
- return std::make_pair(min_value_, max_value_);
+ get_raw_samples(start_sample, (end_sample - start_sample), (uint8_t*)dest);
}
-SegmentAnalogDataIterator* AnalogSegment::begin_sample_iteration(uint64_t start) const
+const pair<float, float> AnalogSegment::get_min_max() const
{
- return (SegmentAnalogDataIterator*)begin_raw_sample_iteration(start);
+ return make_pair(min_value_, max_value_);
}
-void AnalogSegment::continue_sample_iteration(SegmentAnalogDataIterator* it, uint64_t increase) const
+float* AnalogSegment::get_iterator_value_ptr(SegmentDataIterator* it)
{
- Segment::continue_raw_sample_iteration((SegmentRawDataIterator*)it, increase);
-}
+ assert(it->sample_index <= (sample_count_ - 1));
-void AnalogSegment::end_sample_iteration(SegmentAnalogDataIterator* it) const
-{
- Segment::end_raw_sample_iteration((SegmentRawDataIterator*)it);
+ return (float*)(it->chunk + it->chunk_offs);
}
void AnalogSegment::get_envelope_section(EnvelopeSection &s,
Envelope &e0 = envelope_levels_[0];
uint64_t prev_length;
EnvelopeSample *dest_ptr;
- SegmentRawDataIterator* it;
+ SegmentDataIterator* it;
// Expand the data buffer to fit the new samples
prev_length = e0.length;
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_sample_iteration(0);
+ for (uint64_t i = 0; i < sample_count_; i++) {
+ const float sample = *get_iterator_value_ptr(it);
+ if (sample < min_value_)
+ min_value_ = sample;
+ if (sample > max_value_)
+ max_value_ = sample;
+ continue_sample_iteration(it, 1);
+ }
+ end_sample_iteration(it);
+ }
+
// Break off if there are no new samples to compute
if (e0.length == prev_length)
return;
// 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);
+ it = begin_sample_iteration(start_sample);
for (uint64_t i = start_sample; i < end_sample; i += EnvelopeScaleFactor) {
- const float* samples = (float*)it->value;
+ const float* samples = get_iterator_value_ptr(it);
const EnvelopeSample sub_sample = {
*min_element(samples, samples + EnvelopeScaleFactor),
*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);
+ continue_sample_iteration(it, EnvelopeScaleFactor);
*dest_ptr++ = sub_sample;
}
- end_raw_sample_iteration(it);
+ end_sample_iteration(it);
// 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;
*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