Add a flag to output Y'CbCr using Rec. 709 coefficients.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 39b259b45938b4a4dbbf9ffedbf36dcb9c4b5ed3..b5ae946575937dd6cb2bcacd29b8a831064a2173 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,24 +23,24 @@
 #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 ChromaSubsampler;
 class QSurface;
-class QuickSyncEncoder;
+class QSurfaceFormat;
+
 namespace movit {
 class Effect;
 class EffectChain;
@@ -50,11 +48,6 @@ 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
 // come, as fast as we can process), there's going to be a queue. The question
 // is when we should drop frames from that queue (apart from the obvious
@@ -304,7 +297,6 @@ private:
        void schedule_audio_resampling_tasks(unsigned dropped_frames, int num_samples_per_frame, int length_per_frame);
        void render_one_frame(int64_t duration);
        void audio_thread_func();
-       void subsample_chroma(GLuint src_tex, GLuint dst_dst);
        void release_display_frame(DisplayFrame *frame);
        double pts() { return double(pts_int) / TIMEBASE; }
 
@@ -317,9 +309,7 @@ private:
        std::atomic<unsigned> audio_source_channel{0};
        std::atomic<unsigned> master_clock_channel{0};
        std::unique_ptr<movit::EffectChain> display_chain;
-       GLuint cbcr_program_num;  // Owned by <resource_pool>.
-       GLuint cbcr_vbo;  // Holds position and texcoord data.
-       GLuint cbcr_position_attribute_index, cbcr_texcoord_attribute_index;
+       std::unique_ptr<ChromaSubsampler> chroma_subsampler;
        std::unique_ptr<VideoEncoder> video_encoder;
 
        // Effects part of <display_chain>. Owned by <display_chain>.
@@ -327,7 +317,11 @@ private:
 
        int64_t pts_int = 0;  // In TIMEBASE units.
 
-       std::mutex bmusb_mutex;
+       // Accumulated errors in number of 1/TIMEBASE audio samples. If OUTPUT_FREQUENCY divided by
+       // frame rate is integer, will always stay zero.
+       unsigned fractional_samples = 0;
+
+       std::mutex card_mutex;
        bool has_bmusb_thread = false;
        struct CaptureCard {
                bmusb::CaptureInterface *capture = nullptr;
@@ -344,6 +338,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;
@@ -351,15 +346,16 @@ private:
 
                QueueLengthPolicy queue_length_policy;  // Refers to the "new_frames" queue.
 
-               // Accumulated errors in number of 1/TIMEBASE samples. If OUTPUT_FREQUENCY divided by
-               // frame rate is integer, will always stay zero.
-               unsigned fractional_samples = 0;
-
                int last_timecode = -1;  // Unwrapped.
        };
-       CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
+       CaptureCard cards[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
        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]);
+       struct OutputFrameInfo {
+               int dropped_frames;  // Since last frame.
+               int num_samples;  // Audio samples needed for this output frame.
+               int64_t frame_duration;  // In TIMEBASE units.
+       };
+       OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS]);
 
        InputState input_state;