Release Nageru 1.7.2.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index 8d4f15c7f2020b399fb726f4ce5b025ac22d65fb..ebe142a74cbc9e6f81d125505022d88588cb00cd 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -46,7 +46,7 @@ enum EQBand {
 
 class AudioMixer {
 public:
-       AudioMixer(unsigned num_cards);
+       AudioMixer(unsigned num_capture_cards, unsigned num_ffmpeg_inputs);
        void reset_resampler(DeviceSpec device_spec);
        void reset_meters();
 
@@ -327,13 +327,14 @@ private:
        std::vector<DeviceSpec> get_active_devices() const;
        void set_input_mapping_lock_held(const InputMapping &input_mapping);
 
-       unsigned num_cards;
+       unsigned num_capture_cards, num_ffmpeg_inputs;
 
        mutable std::timed_mutex audio_mutex;
 
        ALSAPool alsa_pool;
        AudioDevice video_cards[MAX_VIDEO_CARDS];  // Under audio_mutex.
        AudioDevice alsa_inputs[MAX_ALSA_CARDS];  // Under audio_mutex.
+       std::unique_ptr<AudioDevice[]> ffmpeg_inputs;  // Under audio_mutex.
 
        std::atomic<float> locut_cutoff_hz{120};
        StereoFilter locut[MAX_BUSES];  // Default cutoff 120 Hz, 24 dB/oct.
@@ -385,6 +386,28 @@ private:
        CorrelationMeasurer correlation;  // Under audio_measure_mutex.
        Resampler peak_resampler;  // Under audio_measure_mutex.
        std::atomic<float> peak{0.0f};
+
+       // Metrics.
+       std::atomic<double> metric_audio_loudness_short_lufs{0.0 / 0.0};
+       std::atomic<double> metric_audio_loudness_integrated_lufs{0.0 / 0.0};
+       std::atomic<double> metric_audio_loudness_range_low_lufs{0.0 / 0.0};
+       std::atomic<double> metric_audio_loudness_range_high_lufs{0.0 / 0.0};
+       std::atomic<double> metric_audio_peak_dbfs{0.0 / 0.0};
+       std::atomic<double> metric_audio_final_makeup_gain_db{0.0};
+       std::atomic<double> metric_audio_correlation{0.0};
+
+       // These are all gauges corresponding to the elements of BusLevel.
+       // In a sense, they'd probably do better as histograms, but that's an
+       // awful lot of time series when you have many buses.
+       struct BusMetrics {
+               std::vector<std::pair<std::string, std::string>> labels;
+               std::atomic<double> current_level_dbfs[2]{{0.0/0.0},{0.0/0.0}};
+               std::atomic<double> peak_level_dbfs[2]{{0.0/0.0},{0.0/0.0}};
+               std::atomic<double> historic_peak_dbfs{0.0/0.0};
+               std::atomic<double> gain_staging_db{0.0/0.0};
+               std::atomic<double> compressor_attenuation_db{0.0/0.0};
+       };
+       std::unique_ptr<BusMetrics[]> bus_metrics;  // One for each bus in <input_mapping>.
 };
 
 extern AudioMixer *global_audio_mixer;