Make it possible to override the level compressor with the gain staging knob.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 07a31e959fe5a21e2b268ed7f4aad11e0ac2e90a..f50eb58db5560f620b2fcdb1cc9097f4b6c5d1cb 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -34,6 +34,7 @@
 #include "timebase.h"
 #include "stereocompressor.h"
 #include "filter.h"
+#include "input_state.h"
 
 class H264Encoder;
 class QSurface;
@@ -102,7 +103,7 @@ public:
 
        typedef std::function<void(float level_lufs, float peak_db,
                                   float global_level_lufs, float range_low_lufs, float range_high_lufs,
-                                  float auto_gain_staging_db)> audio_level_callback_t;
+                                  float gain_staging_db)> audio_level_callback_t;
        void set_audio_level_callback(audio_level_callback_t callback)
        {
                audio_level_callback = callback;
@@ -168,18 +169,26 @@ public:
                compressor_enabled = enabled;
        }
 
-       void reset_meters();
+       void set_gain_staging_db(float gain_db)
+       {
+               std::unique_lock<std::mutex> lock(level_compressor_mutex);
+               level_compressor_enabled = false;
+               gain_staging_db = gain_db;
+       }
 
-       struct BufferedFrame {
-               RefCountedFrame frame;
-               unsigned field_number;
-       };
+       void set_gain_staging_auto(bool enabled)
+       {
+               std::unique_lock<std::mutex> lock(level_compressor_mutex);
+               level_compressor_enabled = enabled;
+       }
 
-       BufferedFrame get_buffered_frame(int card, int history_pos)
+       void schedule_cut()
        {
-               return buffered_frames[card][history_pos];
+               should_cut = true;
        }
 
+       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,
@@ -237,12 +246,7 @@ private:
        };
        CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
 
-       // For each card, the last three frames (or fields), with 0 being the
-       // most recent one. Note that we only need the actual history if we have
-       // interlaced output (for deinterlacing), so if we detect progressive input,
-       // we immediately clear out all history and all entries will point to the same
-       // frame.
-       BufferedFrame buffered_frames[MAX_CARDS][FRAME_HISTORY_LENGTH];
+       InputState input_state;
 
        class OutputChannel {
        public:
@@ -266,10 +270,11 @@ private:
        std::thread mixer_thread;
        std::thread audio_thread;
        std::atomic<bool> should_quit{false};
+       std::atomic<bool> should_cut{false};
 
        audio_level_callback_t audio_level_callback = nullptr;
-       std::mutex r128_mutex;
-       Ebu_r128_proc r128;  // Under r128_mutex.
+       std::mutex compressor_mutex;
+       Ebu_r128_proc r128;  // Under compressor_mutex.
 
        Resampler peak_resampler;
        std::atomic<float> peak{0.0f};
@@ -278,8 +283,10 @@ private:
        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;
+       std::mutex level_compressor_mutex;
+       StereoCompressor level_compressor;  // Under compressor_mutex. Used to set/override gain_staging_db if <level_compressor_enabled>.
+       float gain_staging_db = 0.0f;  // Under compressor_mutex.
+       bool level_compressor_enabled = true;  // Under compressor_mutex.
 
        static constexpr float ref_level_dbfs = -14.0f;