Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / meter.cc

diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc
index 0c23ea168dbd6a39d881b81432751b7af6cbdd3a..80690bd74479e2d77c68c9ff574d77d7ab8f27f7 100644 (file)
--- a/libs/ardour/meter.cc
+++ b/libs/ardour/meter.cc
@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <limits>
 
 #include "pbd/compose.h"
 
@@ -43,6 +44,8 @@ PeakMeter::PeakMeter (Session& s, const std::string& name)
        Iec1ppmdsp::init(s.nominal_frame_rate());
        Iec2ppmdsp::init(s.nominal_frame_rate());
        Vumeterdsp::init(s.nominal_frame_rate());
+       _pending_active = true;
+       _meter_type = MeterPeak;
 }
 
 PeakMeter::~PeakMeter ()
@@ -105,8 +108,12 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr
 
        // Meter audio in to the rest of the peaks
        for (uint32_t i = 0; i < n_audio; ++i, ++n) {
-               _peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]);
-               if (_meter_type & (MeterKrms | MeterK20 | MeterK14)) {
+               if (bufs.get_audio(i).silent()) {
+                       _peak_signal[n] = .0f;
+               } else {
+                       _peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]);
+               }
+               if (_meter_type & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) {
                        _kmeter[i]->process(bufs.get_audio(i).data(), nframes);
                }
                if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) {
@@ -147,7 +154,7 @@ void
 PeakMeter::reset_max ()
 {
        for (size_t i = 0; i < _max_peak_power.size(); ++i) {
-               _max_peak_power[i] = -INFINITY;
+               _max_peak_power[i] = -std::numeric_limits<float>::infinity();
                _max_peak_signal[i] = 0;
        }
 
@@ -157,13 +164,13 @@ PeakMeter::reset_max ()
                if (n < n_midi) {
                        _visible_peak_power[n] = 0;
                } else {
-                       _visible_peak_power[n] = -INFINITY;
+                       _visible_peak_power[n] = -std::numeric_limits<float>::infinity();
                }
        }
 }
 
 bool
-PeakMeter::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
+PeakMeter::can_support_io_configuration (const ChanCount& in, ChanCount& out)
 {
        out = in;
        return true;
@@ -268,7 +275,17 @@ PeakMeter::meter ()
                return;
        }
 
-       assert(_visible_peak_power.size() == _peak_signal.size());
+       // TODO block this thread while PeakMeter::reset_max_channels() is
+       // reallocating channels.
+       // (may happen with Session > New: old session not yet closed,
+       // meter-thread still active while new one is initializing and
+       // maybe on other occasions, too)
+       if (   (_visible_peak_power.size() != _peak_signal.size())
+                       || (_max_peak_power.size()     != _peak_signal.size())
+                       || (_max_peak_signal.size()    != _peak_signal.size())
+                        ) {
+               return;
+       }
 
        const size_t limit = min (_peak_signal.size(), (size_t) current_meters.n_total ());
        const size_t n_midi  = min (_peak_signal.size(), (size_t) current_meters.n_midi());
@@ -276,7 +293,7 @@ PeakMeter::meter ()
        /* 0.01f ^= 100 Hz update rate */
        const float midi_meter_falloff = Config->get_meter_falloff() * 0.01f;
        /* kmeters: 24dB / 2 sec */
-       const float audio_meter_falloff = (_meter_type & (MeterK20 | MeterK14)) ? 0.12f : midi_meter_falloff;
+       const float audio_meter_falloff = (_meter_type & (MeterK20 | MeterK14 | MeterK12)) ? 0.12f : midi_meter_falloff;
 
        for (size_t n = 0; n < limit; ++n) {
 
@@ -286,7 +303,7 @@ PeakMeter::meter ()
                _peak_signal[n] = 0;              /* ... to here */
 
                if (n < n_midi) {
-                       _max_peak_power[n] = -INFINITY; // std::max (new_peak, _max_peak_power[n]); // XXX
+                       _max_peak_power[n] = -std::numeric_limits<float>::infinity(); // std::max (new_peak, _max_peak_power[n]); // XXX
                        _max_peak_signal[n] = 0;
                        if (midi_meter_falloff == 0.0f || new_peak > _visible_peak_power[n]) {
                                ;
@@ -320,20 +337,23 @@ PeakMeter::meter ()
                } else {
                        // do falloff
                        new_peak = _visible_peak_power[n] - (audio_meter_falloff);
-                       _visible_peak_power[n] = std::max (new_peak, -INFINITY);
+                       _visible_peak_power[n] = std::max (new_peak, -std::numeric_limits<float>::infinity());
                }
        }
 }
 
+#define CHECKSIZE(MTR) (n < MTR.size() + n_midi && n >= n_midi)
+
 float
 PeakMeter::meter_level(uint32_t n, MeterType type) {
        switch (type) {
                case MeterKrms:
                case MeterK20:
                case MeterK14:
+               case MeterK12:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _kmeter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_kmeter)) {
                                        return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read());
                                }
                        }
@@ -341,8 +361,8 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterIEC1DIN:
                case MeterIEC1NOR:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _iec1meter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_iec1meter)) {
                                        return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read());
                                }
                        }
@@ -350,16 +370,16 @@ PeakMeter::meter_level(uint32_t n, MeterType type) {
                case MeterIEC2BBC:
                case MeterIEC2EBU:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _iec2meter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_iec2meter)) {
                                        return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read());
                                }
                        }
                        break;
                case MeterVU:
                        {
-                               const int n_midi = current_meters.n_midi();
-                               if ((n - n_midi) < _vumeter.size() && (n - n_midi) >= 0) {
+                               const uint32_t n_midi = current_meters.n_midi();
+                               if (CHECKSIZE(_vumeter)) {
                                        return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read());
                                }
                        }
@@ -390,7 +410,7 @@ PeakMeter::set_type(MeterType t)
 
        _meter_type = t;
 
-       if (t & (MeterKrms | MeterK20 | MeterK14)) {
+       if (t & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) {
                const size_t n_audio = current_meters.n_audio();
                for (size_t n = 0; n < n_audio; ++n) {
                        _kmeter[n]->reset();