From e95d33502fc5abe86d5fc715fe3dd9c0fe7a008e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 7 Apr 2020 04:02:52 +0200 Subject: NO-OP: whitespace --- libs/ardour/ardour/meter.h | 40 +++---- libs/ardour/meter.cc | 260 +++++++++++++++++++++++---------------------- 2 files changed, 153 insertions(+), 147 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index d5ba27dbf8..73869a0ea3 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -23,14 +23,16 @@ #define __ardour_meter_h__ #include + +#include "pbd/fastlog.h" + #include "ardour/libardour_visibility.h" -#include "ardour/types.h" #include "ardour/processor.h" -#include "pbd/fastlog.h" +#include "ardour/types.h" -#include "ardour/kmeterdsp.h" #include "ardour/iec1ppmdsp.h" #include "ardour/iec2ppmdsp.h" +#include "ardour/kmeterdsp.h" #include "ardour/vumeterdsp.h" namespace ARDOUR { @@ -41,15 +43,16 @@ class Session; /** Meters peaks on the input and stores them for access. */ -class LIBARDOUR_API PeakMeter : public Processor { +class LIBARDOUR_API PeakMeter : public Processor +{ public: - PeakMeter(Session& s, const std::string& name); - ~PeakMeter(); + PeakMeter (Session& s, const std::string& name); + ~PeakMeter (); void reset (); void reset_max (); - std::string display_name() const; + std::string display_name () const; bool can_support_io_configuration (const ChanCount& in, ChanCount& out); bool configure_io (ChanCount in, ChanCount out); @@ -71,18 +74,17 @@ public: /** Compute peaks */ void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool); - void activate () { } - void deactivate () { } + void activate () {} + void deactivate () {} - ChanCount input_streams () const { return current_meters; } + ChanCount input_streams () const { return current_meters; } ChanCount output_streams () const { return current_meters; } float meter_level (uint32_t n, MeterType type); - void set_meter_type (MeterType t); + void set_meter_type (MeterType t); MeterType meter_type () const { return _meter_type; } - PBD::Signal1 MeterTypeChanged; protected: @@ -101,15 +103,15 @@ private: volatile gint _reset_max; uint32_t _bufcnt; - std::vector _peak_buffer; // internal, integrate - std::vector _peak_power; // includes accurate falloff, hence dB + std::vector _peak_buffer; // internal, integrate + std::vector _peak_power; // includes accurate falloff, hence dB std::vector _max_peak_signal; // dB calculation is done on demand - float _combined_peak; // Mackie surfaces expect the highest peak of all track channels + float _combined_peak; // Mackie surfaces expect the highest peak of all track channels - std::vector _kmeter; - std::vector _iec1meter; - std::vector _iec2meter; - std::vector _vumeter; + std::vector _kmeter; + std::vector _iec1meter; + std::vector _iec2meter; + std::vector _vumeter; MeterType _meter_type; }; diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 669ea8bf61..7964ca0431 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -31,9 +31,9 @@ #include "ardour/dB.h" #include "ardour/meter.h" #include "ardour/midi_buffer.h" -#include "ardour/session.h" #include "ardour/rc_configuration.h" #include "ardour/runtime_functions.h" +#include "ardour/session.h" #include "pbd/i18n.h" @@ -44,39 +44,40 @@ using namespace ARDOUR; PeakMeter::PeakMeter (Session& s, const std::string& name) : Processor (s, string_compose ("meter-%1", name)) { - Kmeterdsp::init(s.nominal_sample_rate()); - Iec1ppmdsp::init(s.nominal_sample_rate()); - Iec2ppmdsp::init(s.nominal_sample_rate()); - Vumeterdsp::init(s.nominal_sample_rate()); + Kmeterdsp::init (s.nominal_sample_rate ()); + Iec1ppmdsp::init (s.nominal_sample_rate ()); + Iec2ppmdsp::init (s.nominal_sample_rate ()); + Vumeterdsp::init (s.nominal_sample_rate ()); + _pending_active = true; - _meter_type = MeterPeak; - _reset_dpm = 1; - _reset_max = 1; - _bufcnt = 0; - _combined_peak = 0; + _meter_type = MeterPeak; + _reset_dpm = 1; + _reset_max = 1; + _bufcnt = 0; + _combined_peak = 0; } PeakMeter::~PeakMeter () { - while (_kmeter.size() > 0) { - delete (_kmeter.back()); - delete (_iec1meter.back()); - delete (_iec2meter.back()); - delete (_vumeter.back()); - _kmeter.pop_back(); - _iec1meter.pop_back(); - _iec2meter.pop_back(); - _vumeter.pop_back(); + while (_kmeter.size () > 0) { + delete _kmeter.back (); + delete _iec1meter.back (); + delete _iec2meter.back (); + delete _vumeter.back (); + _kmeter.pop_back (); + _iec1meter.pop_back (); + _iec2meter.pop_back (); + _vumeter.pop_back (); } - while (_peak_power.size() > 0) { - _peak_buffer.pop_back(); - _peak_power.pop_back(); - _max_peak_signal.pop_back(); + while (_peak_power.size () > 0) { + _peak_buffer.pop_back (); + _peak_power.pop_back (); + _max_peak_signal.pop_back (); } } std::string -PeakMeter::display_name() const +PeakMeter::display_name () const { return _("Meter"); } @@ -101,13 +102,14 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end _combined_peak = 0; - const uint32_t n_audio = min (current_meters.n_audio(), bufs.count().n_audio()); - const uint32_t n_midi = min (current_meters.n_midi(), bufs.count().n_midi()); + const uint32_t n_audio = min (current_meters.n_audio (), bufs.count ().n_audio ()); + const uint32_t n_midi = min (current_meters.n_midi (), bufs.count ().n_midi ()); uint32_t n = 0; - const float falloff_dB = Config->get_meter_falloff() * nframes / _session.nominal_sample_rate(); - const uint32_t zoh = _session.nominal_sample_rate() * .021; + const uint32_t zoh = _session.nominal_sample_rate () * .021; + const float falloff_dB = Config->get_meter_falloff () * nframes / _session.nominal_sample_rate (); + _bufcnt += nframes; /* Meter MIDI */ @@ -116,12 +118,12 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end if (reset_dpm) { _peak_power[n] = 0; } - const MidiBuffer& buf (bufs.get_midi(i)); + const MidiBuffer& buf (bufs.get_midi (i)); - for (MidiBuffer::const_iterator e = buf.begin(); e != buf.end(); ++e) { - const Evoral::Event ev(*e, false); - if (ev.is_note_on()) { - const float this_vel = ev.buffer()[2] / 127.0; + for (MidiBuffer::const_iterator e = buf.begin (); e != buf.end (); ++e) { + const Evoral::Event ev (*e, false); + if (ev.is_note_on ()) { + const float this_vel = ev.buffer ()[2] / 127.0; if (this_vel > val) { val = this_vel; } @@ -131,7 +133,7 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end } } } else { - val += 1.0 / bufs.get_midi(n).capacity(); + val += 1.0 / bufs.get_midi (n).capacity (); if (val > 1.0) { val = 1.0; } @@ -143,19 +145,19 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end /* empirical algorithm WRT to audio falloff times */ _peak_power[n] -= sqrtf (_peak_power[n]) * falloff_dB * 0.045f; } - _peak_power[n] = max(_peak_power[n], val); + _peak_power[n] = max (_peak_power[n], val); _max_peak_signal[n] = 0; } /* Audio Meters */ for (uint32_t i = 0; i < n_audio; ++i, ++n) { - if (bufs.get_audio(i).silent()) { + if (bufs.get_audio (i).silent ()) { _peak_buffer[n] = 0; } else { - _peak_buffer[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_buffer[n]); - _peak_buffer[n] = std::min (_peak_buffer[n], 100.f); // cut off at +40dBFS for falloff. - _max_peak_signal[n] = std::max(_peak_buffer[n], _max_peak_signal[n]); - _combined_peak = std::max(_peak_buffer[n], _combined_peak); + _peak_buffer[n] = compute_peak (bufs.get_audio (i).data (), nframes, _peak_buffer[n]); + _peak_buffer[n] = std::min (_peak_buffer[n], 100.f); // cut off at +40dBFS for falloff. + _max_peak_signal[n] = std::max (_peak_buffer[n], _max_peak_signal[n]); + _combined_peak = std::max (_peak_buffer[n], _combined_peak); } if (reset_max) { @@ -164,15 +166,15 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end if (reset_dpm) { _peak_buffer[n] = 0; - _peak_power[n] = -std::numeric_limits::infinity(); + _peak_power[n] = -std::numeric_limits::infinity (); } else { /* falloff */ - if (_peak_power[n] > -318.8f) { + if (_peak_power[n] > -318.8f) { _peak_power[n] -= falloff_dB; } else { - _peak_power[n] = -std::numeric_limits::infinity(); + _peak_power[n] = -std::numeric_limits::infinity (); } - _peak_power[n] = max(_peak_power[n], accurate_coefficient_to_dB(_peak_buffer[n])); + _peak_power[n] = max (_peak_power[n], accurate_coefficient_to_dB (_peak_buffer[n])); /* integration buffer, retain peaks > 49Hz */ if (_bufcnt > zoh) { _peak_buffer[n] = 0; @@ -180,22 +182,22 @@ PeakMeter::run (BufferSet& bufs, samplepos_t /*start_sample*/, samplepos_t /*end } if (_meter_type & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) { - _kmeter[i]->process(bufs.get_audio(i).data(), nframes); + _kmeter[i]->process (bufs.get_audio (i).data (), nframes); } if (_meter_type & (MeterIEC1DIN | MeterIEC1NOR)) { - _iec1meter[i]->process(bufs.get_audio(i).data(), nframes); + _iec1meter[i]->process (bufs.get_audio (i).data (), nframes); } if (_meter_type & (MeterIEC2BBC | MeterIEC2EBU)) { - _iec2meter[i]->process(bufs.get_audio(i).data(), nframes); + _iec2meter[i]->process (bufs.get_audio (i).data (), nframes); } if (_meter_type & MeterVU) { - _vumeter[i]->process(bufs.get_audio(i).data(), nframes); + _vumeter[i]->process (bufs.get_audio (i).data (), nframes); } } /* Zero any excess peaks */ - for (uint32_t i = n; i < _peak_power.size(); ++i) { - _peak_power[i] = -std::numeric_limits::infinity(); + for (uint32_t i = n; i < _peak_power.size (); ++i) { + _peak_power[i] = -std::numeric_limits::infinity (); _max_peak_signal[n] = 0; } @@ -216,22 +218,22 @@ PeakMeter::reset () if (_active || _pending_active) { g_atomic_int_set (&_reset_dpm, 1); } else { - for (size_t i = 0; i < _peak_power.size(); ++i) { - _peak_power[i] = -std::numeric_limits::infinity(); + for (size_t i = 0; i < _peak_power.size (); ++i) { + _peak_power[i] = -std::numeric_limits::infinity (); _peak_buffer[i] = 0; } - const uint32_t n_midi = min (current_meters.n_midi(), (uint32_t)_peak_power.size()); + const uint32_t n_midi = min (current_meters.n_midi (), (uint32_t)_peak_power.size ()); for (size_t i = 0; i < n_midi; ++i) { _peak_power[i] = 0; } } /* these are handled async just fine. */ - for (size_t n = 0; n < _kmeter.size(); ++n) { - _kmeter[n]->reset(); - _iec1meter[n]->reset(); - _iec2meter[n]->reset(); - _vumeter[n]->reset(); + for (size_t n = 0; n < _kmeter.size (); ++n) { + _kmeter[n]->reset (); + _iec1meter[n]->reset (); + _iec2meter[n]->reset (); + _vumeter[n]->reset (); } } @@ -242,9 +244,9 @@ PeakMeter::reset_max () g_atomic_int_set (&_reset_max, 1); return; } - for (size_t i = 0; i < _max_peak_signal.size(); ++i) { + for (size_t i = 0; i < _max_peak_signal.size (); ++i) { _max_peak_signal[i] = 0; - _peak_buffer[i] = 0; + _peak_buffer[i] = 0; } } @@ -272,7 +274,7 @@ PeakMeter::configure_io (ChanCount in, ChanCount out) set_max_channels (in); if (changed) { - reset_max(); + reset_max (); } return Processor::configure_io (in, out); @@ -281,66 +283,67 @@ PeakMeter::configure_io (ChanCount in, ChanCount out) void PeakMeter::reflect_inputs (const ChanCount& in) { - reset(); + reset (); current_meters = in; - reset_max(); + reset_max (); } void -PeakMeter::emit_configuration_changed () { +PeakMeter::emit_configuration_changed () +{ ConfigurationChanged (current_meters, current_meters); /* EMIT SIGNAL */ } void PeakMeter::set_max_channels (const ChanCount& chn) { - uint32_t const limit = chn.n_total(); - const size_t n_audio = chn.n_audio(); + uint32_t const limit = chn.n_total (); + const size_t n_audio = chn.n_audio (); - while (_peak_power.size() > limit) { - _peak_buffer.pop_back(); - _peak_power.pop_back(); - _max_peak_signal.pop_back(); + while (_peak_power.size () > limit) { + _peak_buffer.pop_back (); + _peak_power.pop_back (); + _max_peak_signal.pop_back (); } - while (_peak_power.size() < limit) { - _peak_buffer.push_back(0); - if (_peak_power.size() < current_meters.n_midi()) { - _peak_power.push_back(0); + while (_peak_power.size () < limit) { + _peak_buffer.push_back (0); + if (_peak_power.size () < current_meters.n_midi ()) { + _peak_power.push_back (0); } else { - _peak_power.push_back(-std::numeric_limits::infinity()); + _peak_power.push_back (-std::numeric_limits::infinity ()); } - _max_peak_signal.push_back(0); + _max_peak_signal.push_back (0); } - assert(_peak_buffer.size() == limit); - assert(_peak_power.size() == limit); - assert(_max_peak_signal.size() == limit); + assert (_peak_buffer.size () == limit); + assert (_peak_power.size () == limit); + assert (_max_peak_signal.size () == limit); /* alloc/free other audio-only meter types. */ - while (_kmeter.size() > n_audio) { - delete (_kmeter.back()); - delete (_iec1meter.back()); - delete (_iec2meter.back()); - delete (_vumeter.back()); - _kmeter.pop_back(); - _iec1meter.pop_back(); - _iec2meter.pop_back(); - _vumeter.pop_back(); + while (_kmeter.size () > n_audio) { + delete _kmeter.back (); + delete _iec1meter.back (); + delete _iec2meter.back (); + delete _vumeter.back (); + _kmeter.pop_back (); + _iec1meter.pop_back (); + _iec2meter.pop_back (); + _vumeter.pop_back (); } - while (_kmeter.size() < n_audio) { - _kmeter.push_back(new Kmeterdsp()); - _iec1meter.push_back(new Iec1ppmdsp()); - _iec2meter.push_back(new Iec2ppmdsp()); - _vumeter.push_back(new Vumeterdsp()); + while (_kmeter.size () < n_audio) { + _kmeter.push_back (new Kmeterdsp ()); + _iec1meter.push_back (new Iec1ppmdsp ()); + _iec2meter.push_back (new Iec2ppmdsp ()); + _vumeter.push_back (new Vumeterdsp ()); } - assert(_kmeter.size() == n_audio); - assert(_iec1meter.size() == n_audio); - assert(_iec2meter.size() == n_audio); - assert(_vumeter.size() == n_audio); + assert (_kmeter.size () == n_audio); + assert (_iec1meter.size () == n_audio); + assert (_iec2meter.size () == n_audio); + assert (_vumeter.size () == n_audio); - reset(); - reset_max(); + reset (); + reset_max (); } /** To be driven by the Meter signal from IO. @@ -348,10 +351,11 @@ PeakMeter::set_max_channels (const ChanCount& chn) * of meter size during this call. */ -#define CHECKSIZE(MTR) (n < MTR.size() + n_midi && n >= n_midi) +#define CHECKSIZE(MTR) (n < MTR.size () + n_midi && n >= n_midi) float -PeakMeter::meter_level(uint32_t n, MeterType type) { +PeakMeter::meter_level (uint32_t n, MeterType type) +{ float mcptmp; switch (type) { case MeterKrms: @@ -359,58 +363,58 @@ PeakMeter::meter_level(uint32_t n, MeterType type) { case MeterK14: case MeterK12: { - const uint32_t n_midi = current_meters.n_midi(); - if (CHECKSIZE(_kmeter)) { - return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read()); + const uint32_t n_midi = current_meters.n_midi (); + if (CHECKSIZE (_kmeter)) { + return accurate_coefficient_to_dB (_kmeter[n - n_midi]->read ()); } } break; case MeterIEC1DIN: case MeterIEC1NOR: { - const uint32_t n_midi = current_meters.n_midi(); - if (CHECKSIZE(_iec1meter)) { - return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read()); + const uint32_t n_midi = current_meters.n_midi (); + if (CHECKSIZE (_iec1meter)) { + return accurate_coefficient_to_dB (_iec1meter[n - n_midi]->read ()); } } break; case MeterIEC2BBC: case MeterIEC2EBU: { - const uint32_t n_midi = current_meters.n_midi(); - if (CHECKSIZE(_iec2meter)) { - return accurate_coefficient_to_dB (_iec2meter[n - n_midi]->read()); + 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 uint32_t n_midi = current_meters.n_midi(); - if (CHECKSIZE(_vumeter)) { - return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read()); + const uint32_t n_midi = current_meters.n_midi (); + if (CHECKSIZE (_vumeter)) { + return accurate_coefficient_to_dB (_vumeter[n - n_midi]->read ()); } } break; case MeterPeak: case MeterPeak0dB: - if (n < _peak_power.size()) { + if (n < _peak_power.size ()) { return _peak_power[n]; } break; case MeterMCP: mcptmp = _combined_peak; - return accurate_coefficient_to_dB(mcptmp); + return accurate_coefficient_to_dB (mcptmp); case MeterMaxSignal: - assert(0); + assert (0); break; default: case MeterMaxPeak: - if (n < _max_peak_signal.size()) { - return accurate_coefficient_to_dB(_max_peak_signal[n]); + if (n < _max_peak_signal.size ()) { + return accurate_coefficient_to_dB (_max_peak_signal[n]); } break; } - return minus_infinity(); + return minus_infinity (); } void @@ -423,27 +427,27 @@ PeakMeter::set_meter_type (MeterType t) _meter_type = t; if (t & (MeterKrms | MeterK20 | MeterK14 | MeterK12)) { - const size_t n_audio = current_meters.n_audio(); + const size_t n_audio = current_meters.n_audio (); for (size_t n = 0; n < n_audio; ++n) { - _kmeter[n]->reset(); + _kmeter[n]->reset (); } } if (t & (MeterIEC1DIN | MeterIEC1NOR)) { - const size_t n_audio = current_meters.n_audio(); + const size_t n_audio = current_meters.n_audio (); for (size_t n = 0; n < n_audio; ++n) { - _iec1meter[n]->reset(); + _iec1meter[n]->reset (); } } if (t & (MeterIEC2BBC | MeterIEC2EBU)) { - const size_t n_audio = current_meters.n_audio(); + const size_t n_audio = current_meters.n_audio (); for (size_t n = 0; n < n_audio; ++n) { - _iec2meter[n]->reset(); + _iec2meter[n]->reset (); } } if (t & MeterVU) { - const size_t n_audio = current_meters.n_audio(); + const size_t n_audio = current_meters.n_audio (); for (size_t n = 0; n < n_audio; ++n) { - _vumeter[n]->reset(); + _vumeter[n]->reset (); } } @@ -454,6 +458,6 @@ XMLNode& PeakMeter::state () { XMLNode& node (Processor::state ()); - node.set_property("type", "meter"); + node.set_property ("type", "meter"); return node; } -- cgit v1.2.3