Embed shaders into the binary.

[nageru] / video_stream.h

diff --git a/video_stream.h b/video_stream.h
index 8e0b0abd597e2242f69ebd2524a8524ab72fc530..22ae26a42b195f9f93338fccbd559687eeeacf27 100644 (file)
--- a/video_stream.h
+++ b/video_stream.h
@@ -51,7 +51,7 @@ public:
                                  unsigned stream_idx, int64_t input_pts, int secondary_stream_idx,
                                  int64_t secondary_input_pts, float fade_alpha);
        void schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
-                                 std::function<void()> &&display_func,
+                                 std::function<void(std::shared_ptr<Frame>)> &&display_func,
                                  QueueSpotHolder &&queue_spot_holder,
                                  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,
@@ -70,6 +70,8 @@ private:
        // Allocated at the very start; if we're empty, we start dropping frames
        // (so that we don't build up an infinite interpolation backlog).
        struct InterpolatedFrameResources {
+               VideoStream *owner;  // Used only for IFRReleaser, below.
+
                GLuint input_tex;  // Layered (contains both input frames), Y'CbCr.
                GLuint gray_tex;  // Same, but Y only.
                GLuint input_fbos[2];  // For rendering to the two layers of input_tex.
@@ -83,9 +85,21 @@ private:
                GLuint pbo;  // For reading the data back.
                void *pbo_contents;  // Persistently mapped.
        };
-       std::deque<InterpolatedFrameResources> interpolate_resources;  // Under <queue_lock>.
+       std::mutex queue_lock;
+       std::deque<std::unique_ptr<InterpolatedFrameResources>> interpolate_resources;  // Under <queue_lock>.
        static constexpr size_t num_interpolate_slots = 15;  // Should be larger than Player::max_queued_frames, or we risk mass-dropping frames.
 
+       struct IFRReleaser {
+               void operator() (InterpolatedFrameResources *ifr) const
+               {
+                       if (ifr != nullptr) {
+                               std::unique_lock<std::mutex> lock(ifr->owner->queue_lock);
+                               ifr->owner->interpolate_resources.emplace_back(ifr);
+                       }
+               }
+       };
+       using BorrowedInterpolatedFrameResources = std::unique_ptr<InterpolatedFrameResources, IFRReleaser>;
+
        struct QueuedFrame {
                std::chrono::steady_clock::time_point local_pts;
 
@@ -101,17 +115,17 @@ private:
                // For interpolated frames only.
                int64_t input_second_pts;
                float alpha;
-               InterpolatedFrameResources resources;
+               BorrowedInterpolatedFrameResources resources;
                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::function<void(std::shared_ptr<Frame>)> display_decoded_func;  // Same, except for INTERPOLATED and FADED_INTERPOLATED.
 
                QueueSpotHolder queue_spot_holder;
        };
        std::deque<QueuedFrame> frame_queue;  // Under <queue_lock>.
-       std::mutex queue_lock;
        std::condition_variable queue_changed;
 
        std::unique_ptr<Mux> stream_mux;  // To HTTP.