Start capturing only when the mixer is ready.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 5c69edd4450ac4922b30ac05b52a6413c6fe2084..0de651915f6fe9aa0a3c268fd993121b9e3c3dbf 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -5,13 +5,11 @@
 
 #include <assert.h>
 #include <epoxy/gl.h>
+
 #undef Success
 
-#include <movit/effect_chain.h>
-#include <movit/flat_input.h>
 #include <stdbool.h>
 #include <stdint.h>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -25,34 +23,28 @@
 #include <thread>
 #include <vector>
 
-#include "alsa_output.h"
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
 #include "httpd.h"
 #include "input_state.h"
+#include "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "resampling_queue.h"
 #include "theme.h"
 #include "timebase.h"
-#include "stereocompressor.h"
 #include "video_encoder.h"
 
 class ALSAOutput;
 class QSurface;
-class QuickSyncEncoder;
+
 namespace movit {
 class Effect;
 class EffectChain;
 class FlatInput;
 class ResourcePool;
 }  // namespace movit
-
-namespace movit {
-class YCbCrInput;
-}
 class QSurfaceFormat;
 
 // For any card that's not the master (where we pick out the frames as they
@@ -199,16 +191,6 @@ public:
                return theme->map_signal(channel);
        }
 
-       unsigned get_audio_source() const
-       {
-               return audio_source_channel;
-       }
-
-       void set_audio_source(unsigned channel)
-       {
-               audio_source_channel = channel;
-       }
-
        unsigned get_master_clock() const
        {
                return master_clock_channel;
@@ -234,6 +216,7 @@ public:
                theme->set_wb(channel, r, g, b);
        }
 
+       // Note: You can also get this through the global variable global_audio_mixer.
        AudioMixer *get_audio_mixer() { return &audio_mixer; }
        const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
 
@@ -327,6 +310,7 @@ private:
        std::atomic<unsigned> master_clock_channel{0};
        std::unique_ptr<movit::EffectChain> display_chain;
        GLuint cbcr_program_num;  // Owned by <resource_pool>.
+       GLuint cbcr_texture_sampler_uniform;
        GLuint cbcr_vbo;  // Holds position and texcoord data.
        GLuint cbcr_position_attribute_index, cbcr_texcoord_attribute_index;
        std::unique_ptr<VideoEncoder> video_encoder;
@@ -353,6 +337,7 @@ private:
                        unsigned field;  // Which field (0 or 1) of the frame to use. Always 0 for progressive.
                        std::function<void()> upload_func;  // Needs to be called to actually upload the texture to OpenGL.
                        unsigned dropped_frames = 0;  // Number of dropped frames before this one.
+                       std::chrono::steady_clock::time_point received_timestamp = std::chrono::steady_clock::time_point::min();
                };
                std::queue<NewFrame> new_frames;
                bool should_quit = false;
@@ -367,7 +352,7 @@ private:
                int last_timecode = -1;  // Unwrapped.
        };
        CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
-       AudioMixer audio_mixer;
+       AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
        void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], int num_samples[MAX_VIDEO_CARDS]);
 
        InputState input_state;