Switch to BT.601 Y'CbCr coefficients and back to limited range.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 3275b24a85c66c1529086e4df23b48d0ba29d89b..a94cf922fce2b0600521caef8ff87b01ff1939cb 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -9,13 +9,16 @@
 #include <movit/flat_input.h>
 #include <functional>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 #include "h264encode.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 #include "theme.h"
 #include "resampler.h"
+#include "timebase.h"
+#include "httpd.h"
+#include "ebu_r128_proc.h"
 
 #define NUM_CARDS 2
 
@@ -78,9 +81,15 @@ public:
                output_channel[output].set_frame_ready_callback(callback);
        }
 
+       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;
+       }
+
        std::vector<std::string> get_transition_names()
        {
-               return theme->get_transition_names(frame / 60.0);
+               return theme->get_transition_names(pts());
        }
 
 private:
@@ -91,6 +100,9 @@ private:
        void thread_func();
        void subsample_chroma(GLuint src_tex, GLuint dst_dst);
        void release_display_frame(DisplayFrame *frame);
+       double pts() { return double(pts_int) / TIMEBASE; }
+
+       HTTPD httpd;
 
        QSurface *mixer_surface, *h264_encoder_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -102,7 +114,7 @@ private:
        // Effects part of <display_chain>. Owned by <display_chain>.
        movit::FlatInput *display_input;
 
-       int frame = 0;
+       int64_t pts_int = 0;  // In TIMEBASE units.
 
        std::mutex bmusb_mutex;
        struct CaptureCard {
@@ -119,7 +131,11 @@ private:
                GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
                std::vector<float> new_frame_audio;
                std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
-               Resampler *resampler = nullptr;
+               unsigned dropped_frames = 0;  // Before new_frame.
+
+               std::mutex audio_mutex;
+               std::unique_ptr<Resampler> resampler;  // Under audio_mutex.
+               int last_timecode = -1;  // Unwrapped.
        };
        CaptureCard cards[NUM_CARDS];  // protected by <bmusb_mutex>
 
@@ -146,6 +162,12 @@ private:
 
        std::thread mixer_thread;
        bool should_quit = false;
+
+       audio_level_callback_t audio_level_callback = nullptr;
+       Ebu_r128_proc r128;
+
+       // TODO: Implement oversampled peak detection.
+       float peak = 0.0f;
 };
 
 extern Mixer *global_mixer;