Add some primitive emergency card mapping. Useful for testing.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 5b82b4e962fe0191d1b0c8b443e71aea4b01c8b0..82a3ccab8a899e9637a17a5b122b48c6c1fb6286 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -7,7 +7,6 @@
 #undef Success
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
-#include <ebur128.h>
 #include <functional>
 
 #include "bmusb/bmusb.h"
@@ -19,8 +18,7 @@
 #include "resampler.h"
 #include "timebase.h"
 #include "httpd.h"
-
-#define NUM_CARDS 2
+#include "ebu_r128_proc.h"
 
 namespace movit {
 class YCbCrInput;
@@ -31,7 +29,7 @@ class QSurfaceFormat;
 class Mixer {
 public:
        // The surface format is used for offscreen destinations for OpenGL contexts we need.
-       Mixer(const QSurfaceFormat &format);
+       Mixer(const QSurfaceFormat &format, unsigned num_cards);
        ~Mixer();
        void start();
        void quit();
@@ -81,7 +79,7 @@ public:
                output_channel[output].set_frame_ready_callback(callback);
        }
 
-       typedef std::function<void(float)> audio_level_callback_t;
+       typedef std::function<void(float, float, float, float, float)> audio_level_callback_t;
        void set_audio_level_callback(audio_level_callback_t callback)
        {
                audio_level_callback = callback;
@@ -93,7 +91,7 @@ public:
        }
 
 private:
-       void bm_frame(int card_index, uint16_t timecode,
+       void bm_frame(unsigned card_index, uint16_t timecode,
                FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
                FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format);
        void place_rectangle(movit::Effect *resample_effect, movit::Effect *padding_effect, float x0, float y0, float x1, float y1);
@@ -103,6 +101,7 @@ private:
        double pts() { return double(pts_int) / TIMEBASE; }
 
        HTTPD httpd;
+       unsigned num_cards;
 
        QSurface *mixer_surface, *h264_encoder_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -137,9 +136,9 @@ private:
                std::unique_ptr<Resampler> resampler;  // Under audio_mutex.
                int last_timecode = -1;  // Unwrapped.
        };
-       CaptureCard cards[NUM_CARDS];  // protected by <bmusb_mutex>
+       CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
 
-       RefCountedFrame bmusb_current_rendering_frame[NUM_CARDS];
+       RefCountedFrame bmusb_current_rendering_frame[MAX_CARDS];
 
        class OutputChannel {
        public:
@@ -164,7 +163,10 @@ private:
        bool should_quit = false;
 
        audio_level_callback_t audio_level_callback = nullptr;
-       ebur128_state *r128_state = nullptr;
+       Ebu_r128_proc r128;
+
+       // TODO: Implement oversampled peak detection.
+       float peak = 0.0f;
 };
 
 extern Mixer *global_mixer;