Cleanup in Mixer.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 2dffe6dc3ceced01116581ed834e401884ac0614..74d5cd7edd48412562b09c28136f632799477a73 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -4,23 +4,30 @@
 // The actual video mixer, running in its own separate background thread.
 
 #include <epoxy/gl.h>
+#undef Success
+#include <movit/effect_chain.h>
 #include <functional>
 
 #include "bmusb.h"
+#include "h264encode.h"
+#include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
 
 #define NUM_CARDS 2
 
 namespace movit {
-class Effect;
-class ResourcePool;
+class YCbCrInput;
 }
 class QOpenGLContext;
 class QSurface;
 
 class Mixer {
 public:
-       void start(QSurface *surface, QSurface *surface2, QSurface *surface3, QSurface *surface4);
+       // The surfaces are used for offscreen destinations for OpenGL contexts we need.
+       // TODO: Figure out something slightly more generic.
+       Mixer(QSurface *surface1, QSurface *surface2, QSurface *surface3, QSurface *surface4);
+       ~Mixer();
+       void start();
        void quit();
 
        enum Source {
@@ -45,11 +52,23 @@ private:
                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);
-       void thread_func(QSurface *surface, QSurface *surface2, QSurface *surface3, QSurface *surface4);
+       void thread_func();
 
-       Source current_source = SOURCE_INPUT1;
+       std::unique_ptr<PBOFrameAllocator> pbo_allocator1, pbo_allocator2;
+
+       QSurface *surface1, *surface2, *surface3, *surface4;
+       std::unique_ptr<movit::EffectChain> chain;
+       movit::ResourcePool *resource_pool;  // Owned by <chain>.
+       GLuint cbcr_program_num;  // Owned by <resource_pool>.
+       std::unique_ptr<H264Encoder> h264_encoder;
 
-       movit::ResourcePool *resource_pool;
+       // Effects part of <chain>. Owned by <chain>.
+       movit::YCbCrInput *input[NUM_CARDS];
+       movit::Effect *resample_effect, *resample2_effect;
+       movit::Effect *padding_effect, *padding2_effect;
+
+       Source current_source = SOURCE_INPUT1;
+       int frame = 0;
 
        std::mutex display_frame_mutex;
        DisplayFrame current_display_frame, ready_display_frame;  // protected by <frame_mutex>
@@ -60,22 +79,24 @@ private:
                BMUSBCapture *usb;
 
                // Threading stuff
-               bool thread_initialized;
+               bool thread_initialized = false;
                QSurface *surface;
                QOpenGLContext *context;
 
-               bool new_data_ready;  // Whether new_frame contains anything.
+               bool new_data_ready = false;  // Whether new_frame contains anything.
                FrameAllocator::Frame new_frame;
                GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
                std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
        };
        CaptureCard cards[NUM_CARDS];  // protected by <bmusb_mutex>
 
+       FrameAllocator::Frame bmusb_current_rendering_frame[NUM_CARDS];
+
        new_frame_ready_callback_t new_frame_ready_callback;
        bool has_new_frame_ready_callback = false;
 
        std::thread mixer_thread;
-       bool should_quit;
+       bool should_quit = false;
 };
 
 extern Mixer *global_mixer;