Support audio-only FFmpeg inputs. Somewhat wonky, though.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 5a3e203dc9dc0dd5f02c6eb2c100364313521291..226c91d2e4b0b8957d20d00beafe3fda75c783d8 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -421,6 +421,8 @@ public:
                theme->set_theme_menu_callback(callback);
        }
 
+       void wait_for_next_frame();
+
 private:
        struct CaptureCard;
 
@@ -482,7 +484,10 @@ private:
        movit::YCbCrInput *display_input;
 
        int64_t pts_int = 0;  // In TIMEBASE units.
-       unsigned frame_num = 0;
+
+       mutable std::mutex frame_num_mutex;
+       std::condition_variable frame_num_updated;
+       unsigned frame_num = 0;  // Under <frame_num_mutex>.
 
        // Accumulated errors in number of 1/TIMEBASE audio samples. If OUTPUT_FREQUENCY divided by
        // frame rate is integer, will always stay zero.
@@ -520,15 +525,14 @@ private:
                struct NewFrame {
                        RefCountedFrame frame;
                        int64_t length;  // In TIMEBASE units.
-                       bool interlaced;
+                       bool interlaced, audio_only = false;
                        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::deque<NewFrame> new_frames;
-               bool should_quit = false;
-               std::condition_variable new_frames_changed;  // Set whenever new_frames (or should_quit) is changed.
+               std::condition_variable new_frames_changed;  // Set whenever new_frames is changed.
 
                QueueLengthPolicy queue_length_policy;  // Refers to the "new_frames" queue.