Add some GUI elements (hooked up) to help tuning the compressor.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 312566d891e0371eac7ebf765299480fec074f42..01712b8f136a0b116cc27c3d603b2c3b2613e348 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -10,6 +10,8 @@
 
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <zita-resampler/resampler.h>
+#include <atomic>
 #include <condition_variable>
 #include <cstddef>
 #include <functional>
@@ -26,7 +28,7 @@
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "resampler.h"
+#include "resampling_queue.h"
 #include "theme.h"
 #include "timebase.h"
 #include "stereocompressor.h"
@@ -130,6 +132,33 @@ public:
                theme->set_wb(channel, r, g, b);
        }
 
+       void set_locut_cutoff(float cutoff_hz)
+       {
+               locut_cutoff_hz = cutoff_hz;
+       }
+
+       void set_limiter_threshold_dbfs(float threshold_dbfs)
+       {
+               limiter_threshold_dbfs = threshold_dbfs;
+       }
+
+       void set_compressor_threshold_dbfs(float threshold_dbfs)
+       {
+               compressor_threshold_dbfs = threshold_dbfs;
+       }
+
+       void set_limiter_enabled(bool enabled)
+       {
+               limiter_enabled = enabled;
+       }
+
+       void set_compressor_enabled(bool enabled)
+       {
+               compressor_enabled = enabled;
+       }
+
+       void reset_meters();
+
 private:
        void bm_frame(unsigned card_index, uint16_t timecode,
                FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
@@ -173,7 +202,7 @@ private:
                unsigned dropped_frames = 0;  // Before new_frame.
 
                std::mutex audio_mutex;
-               std::unique_ptr<Resampler> resampler;  // Under audio_mutex.
+               std::unique_ptr<ResamplingQueue> resampling_queue;  // Under audio_mutex.
                int last_timecode = -1;  // Unwrapped.
        };
        CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
@@ -205,14 +234,24 @@ private:
        audio_level_callback_t audio_level_callback = nullptr;
        Ebu_r128_proc r128;
 
-       // TODO: Implement oversampled peak detection.
-       float peak = 0.0f;
+       Resampler peak_resampler;
+       std::atomic<float> peak{0.0f};
 
-       StereoFilter locut;  // Cutoff 150 Hz, 24 dB/oct.
+       StereoFilter locut;  // Default cutoff 150 Hz, 24 dB/oct.
+       std::atomic<float> locut_cutoff_hz;
 
        // First compressor; takes us up to about -12 dBFS.
        StereoCompressor level_compressor;
        float last_gain_staging_db = 0.0f;
+
+       static constexpr float ref_level_dbfs = -14.0f;
+
+       StereoCompressor limiter;
+       std::atomic<float> limiter_threshold_dbfs{ref_level_dbfs + 0.0f};   // 0 dB.
+       std::atomic<bool> limiter_enabled{true};
+       StereoCompressor compressor;
+       std::atomic<float> compressor_threshold_dbfs{ref_level_dbfs - 12.0f};  // -12 dB.
+       std::atomic<bool> compressor_enabled{true};
 };
 
 extern Mixer *global_mixer;