Stop sending interpolated images through the cache.

[nageru] / video_stream.h

diff --git a/video_stream.h b/video_stream.h
index 2c0334a0e1c2d1d048453d33b1f5182740420c49..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,
@@ -121,6 +121,7 @@ private:
                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;
        };