Fix a deadlock in the new queueing logic.

[nageru] / video_stream.h

diff --git a/video_stream.h b/video_stream.h
index 2bac2ad425bacc196926aca41db998590e9884f1..64f72d8104d6aef219a6747e251b501bc4b29d16 100644 (file)
--- a/video_stream.h
+++ b/video_stream.h
@@ -11,8 +11,10 @@ extern "C" {
 #include "jpeg_frame_view.h"
 #include "ref_counted_gl_sync.h"
 
+#include <chrono>
 #include <condition_variable>
 #include <deque>
+#include <functional>
 #include <movit/effect_chain.h>
 #include <movit/mix_effect.h>
 #include <movit/ycbcr_input.h>
@@ -34,11 +36,15 @@ public:
        ~VideoStream();
        void start();
        void stop();
+       void clear_queue();
 
-       void schedule_original_frame(int64_t output_pts, unsigned stream_idx, int64_t input_pts);
-       void schedule_faded_frame(int64_t output_pts, unsigned stream_idx, int64_t input_pts, int secondary_stream_idx, int64_t secondary_input_pts, float fade_alpha);
-       void schedule_interpolated_frame(int64_t output_pts, unsigned stream_idx, int64_t input_first_pts, int64_t input_second_pts, float alpha, int secondary_stream_idx = -1, int64_t secondary_inputs_pts = -1, float fade_alpha = 0.0f);  // -1 = no secondary frame.
-       void schedule_refresh_frame(int64_t output_pts);
+       // “display_func” is called after the frame has been calculated (if needed)
+       // and has gone out to the stream. Returns false on failure (ie., couldn't
+       // schedule the frame due to lack of resources).
+       void schedule_original_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func, unsigned stream_idx, int64_t input_pts);
+       bool schedule_faded_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func, unsigned stream_idx, int64_t input_pts, int secondary_stream_idx, int64_t secondary_input_pts, float fade_alpha);
+       bool schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func, unsigned stream_idx, int64_t input_first_pts, int64_t input_second_pts, float alpha, int secondary_stream_idx = -1, int64_t secondary_inputs_pts = -1, float fade_alpha = 0.0f);  // -1 = no secondary frame.
+       void schedule_refresh_frame(std::chrono::steady_clock::time_point, int64_t output_pts, std::function<void()> &&display_func);
 
 private:
        void encode_thread_func();
@@ -64,11 +70,13 @@ private:
                void *pbo_contents;  // Persistently mapped.
        };
        std::deque<InterpolatedFrameResources> interpolate_resources;  // Under <queue_lock>.
-       static constexpr size_t num_interpolate_slots = 10;
+       static constexpr size_t num_interpolate_slots = 15;  // Should be larger than Player::max_queued_frames, or we risk mass-dropping frames.
 
        struct QueuedFrame {
+               std::chrono::steady_clock::time_point local_pts;
+
                int64_t output_pts;
-               enum Type { ORIGINAL, FADED, INTERPOLATED, FADED_INTERPOLATED } type;
+               enum Type { ORIGINAL, FADED, INTERPOLATED, FADED_INTERPOLATED, REFRESH } type;
                unsigned stream_idx;
                int64_t input_first_pts;  // The only pts for original frames.
 
@@ -83,10 +91,12 @@ private:
                RefCountedGLsync fence;  // Set when the interpolated image is read back to the CPU.
                GLuint flow_tex, output_tex, cbcr_tex;  // Released in the receiving thread; not really used for anything else.
                JPEGID id;
+
+               std::function<void()> display_func;  // Called when the image is done decoding.
        };
        std::deque<QueuedFrame> frame_queue;  // Under <queue_lock>.
        std::mutex queue_lock;
-       std::condition_variable queue_nonempty;
+       std::condition_variable queue_changed;
 
        std::unique_ptr<Mux> stream_mux;  // To HTTP.
        std::string stream_mux_header;