Factor out some common logic from Player::thread_func().

[nageru] / futatabi / video_stream.h

diff --git a/futatabi/video_stream.h b/futatabi/video_stream.h
index d4cb18eb7e91e758fc53d6e99adb90e7a2741e45..05bd7a7b9453c46228ce66eb08362223ddeb40c3 100644 (file)
--- a/futatabi/video_stream.h
+++ b/futatabi/video_stream.h
@@ -5,6 +5,7 @@
 #include <stdint.h>
 
 extern "C" {
+#include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 }
 
@@ -35,7 +36,7 @@ class YCbCrConverter;
 
 class VideoStream {
 public:
-       VideoStream();
+       VideoStream(AVFormatContext *file_avctx);  // nullptr if output to stream.
        ~VideoStream();
        void start();
        void stop();
@@ -98,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);
                        }
                }
@@ -120,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.
@@ -131,9 +132,11 @@ private:
        std::deque<QueuedFrame> frame_queue;  // Under <queue_lock>.
        std::condition_variable queue_changed;
 
-       std::unique_ptr<Mux> stream_mux;  // To HTTP.
-       std::string stream_mux_header;
+       AVFormatContext *avctx;
+       std::unique_ptr<Mux> mux;  // To HTTP, or to file.
+       std::string stream_mux_header;  // Only used in HTTP.
        bool seen_sync_markers = false;
+       bool output_fast_forward;
 
        std::unique_ptr<YCbCrConverter> ycbcr_converter;
        std::unique_ptr<YCbCrConverter> ycbcr_semiplanar_converter;
@@ -143,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;
 };