Move from unique_lock to lock_guard everywhere we can. Perhaps ever so slightly clear...

[nageru] / futatabi / video_stream.h

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index d522ab1e8f5a98f9494004599b9c1aa2a74a76c0..05bd7a7b9453c46228ce66eb08362223ddeb40c3 100644 (file)
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -99,7 +99,7 @@ private:
                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;
 };