X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fvideo_stream.h;h=906cd77af9224056e6524c3a01a7c91ab0e061bf;hb=e64a84bb856263242278afa9770ae5d05e21b055;hp=d522ab1e8f5a98f9494004599b9c1aa2a74a76c0;hpb=eaba7288c4fb39ca195c9355970293bcaf088dbc;p=nageru

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index d522ab1..906cd77 100644
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -11,8 +11,8 @@ extern "C" {
 
 #include "frame_on_disk.h"
 #include "jpeg_frame_view.h"
-#include "shared/ref_counted_gl_sync.h"
 #include "queue_spot_holder.h"
+#include "shared/ref_counted_gl_sync.h"
 
 #include <atomic>
 #include <chrono>
@@ -54,11 +54,11 @@ public:
 	                          FrameOnDisk frame1, FrameOnDisk frame2,
 	                          float fade_alpha);
 	void schedule_interpolated_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
-	                          std::function<void(std::shared_ptr<Frame>)> &&display_func,
-	                          QueueSpotHolder &&queue_spot_holder,
-	                          FrameOnDisk frame1, FrameOnDisk frame2,
-	                          float alpha, FrameOnDisk secondary_frame = {},  // Empty = no secondary (fade) frame.
-	                          float fade_alpha = 0.0f);
+	                                 std::function<void(std::shared_ptr<Frame>)> &&display_func,
+	                                 QueueSpotHolder &&queue_spot_holder,
+	                                 FrameOnDisk frame1, FrameOnDisk frame2,
+	                                 float alpha, FrameOnDisk secondary_frame = {},  // Empty = no secondary (fade) frame.
+	                                 float fade_alpha = 0.0f);
 	void schedule_refresh_frame(std::chrono::steady_clock::time_point, int64_t output_pts,
 	                            std::function<void()> &&display_func,
 	                            QueueSpotHolder &&queue_spot_holder);
@@ -68,7 +68,7 @@ private:
 
 	void encode_thread_func();
 	std::thread encode_thread;
-	std::atomic<bool> should_quit{false};
+	std::atomic<bool> should_quit{ false };
 
 	static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 	int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
@@ -96,10 +96,10 @@ private:
 	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
+		void operator()(InterpolatedFrameResources *ifr) const
 		{
 			if (ifr != nullptr) {
-				std::unique_lock<std::mutex> lock(ifr->owner->queue_lock);
+				std::lock_guard<std::mutex> lock(ifr->owner->queue_lock);
 				ifr->owner->interpolate_resources.emplace_back(ifr);
 			}
 		}
@@ -121,7 +121,7 @@ private:
 		float alpha;
 		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.
+		GLuint flow_tex, output_tex, cbcr_tex;  // Released in the receiving thread; not really used for anything else. flow_tex will typically even be from a previous frame.
 		FrameOnDisk id;
 
 		std::function<void()> display_func;  // Called when the image is done decoding.
@@ -146,6 +146,10 @@ private:
 	std::unique_ptr<Interpolate> interpolate, interpolate_no_split;
 	std::unique_ptr<ChromaSubsampler> chroma_subsampler;
 
+	// Cached flow computation from previous frame, if any.
+	GLuint last_flow_tex = 0;
+	FrameOnDisk last_frame1, last_frame2;
+
 	std::vector<uint8_t> last_frame;
 };