Kill the H.264 encoder a bit earlier during shutdown; seems easier to debug shutdown...

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 3a19d3aaef946f6257a27a9ae060c0cf057306ba..89a80dd52fabaccd8e81f1743c491f41b4d329ff 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -10,6 +10,7 @@
 
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <zita-resampler/resampler.h>
 #include <atomic>
 #include <condition_variable>
 #include <cstddef>
@@ -21,6 +22,7 @@
 #include <vector>
 
 #include "bmusb/bmusb.h"
+#include "alsa_output.h"
 #include "ebu_r128_proc.h"
 #include "h264encode.h"
 #include "httpd.h"
@@ -136,6 +138,36 @@ public:
                locut_cutoff_hz = cutoff_hz;
        }
 
+       float get_limiter_threshold_dbfs()
+       {
+               return limiter_threshold_dbfs;
+       }
+
+       float get_compressor_threshold_dbfs()
+       {
+               return compressor_threshold_dbfs;
+       }
+
+       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:
@@ -213,7 +245,7 @@ private:
        audio_level_callback_t audio_level_callback = nullptr;
        Ebu_r128_proc r128;
 
-       // TODO: Implement oversampled peak detection.
+       Resampler peak_resampler;
        std::atomic<float> peak{0.0f};
 
        StereoFilter locut;  // Default cutoff 150 Hz, 24 dB/oct.
@@ -223,8 +255,16 @@ private:
        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 + 4.0f};   // 4 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};
+
+       std::unique_ptr<ALSAOutput> alsa;
 };
 
 extern Mixer *global_mixer;