Make it possible to have separate videos per match, instead of hardcoding one specifi...

[pkanalytics] / video_widget.h

diff --git a/video_widget.h b/video_widget.h
index 1f1ffe2ffb6b8f752fff942a031108dce94f6477..c0f28d75ec7ad8ff99e14e245e49e51054385a93 100644 (file)
--- a/video_widget.h
+++ b/video_widget.h
@@ -25,7 +25,7 @@ public:
        VideoWidget(QWidget *parent);
        ~VideoWidget() { stop(); }
 
-       void open(const std::string &filename);
+       bool open(const std::string &filename);  // False on error.
        void play();
        uint64_t get_position() const { return last_position; }  // In milliseconds.
        void pause();
@@ -56,7 +56,8 @@ private:
                unsigned chroma_width, chroma_height;
                std::unique_ptr<uint8_t[]> data;  // Y, followed by Cb, followed by Cr.
        };
-       std::shared_ptr<Frame> current_frame;
+       std::mutex current_frame_mu;
+       std::shared_ptr<Frame> current_frame;  // Protected by current_frame_mu.
        std::deque<AVFrameWithDeleter> queued_frames;  // Frames decoded but not displayed. Only used when frame-stepping backwards.
 
        GLuint ycbcr_vertex_shader, ycbcr_fragment_shader, ycbcr_program;
@@ -76,7 +77,8 @@ private:
        int64_t pts_origin;
        int64_t last_pts;
        std::atomic<uint64_t> last_position{0};  // TODO: sort of redundant wrt. last_pts (but this one can be read from the other thread)
-       std::atomic<bool> running{false};
+       enum RunState { NOT_RUNNING, STARTING, RUNNING, VIDEO_FILE_ERROR };  // NOT_RUNNING and VIDEO_FILE_ERROR both imply that the thread isn't running and can freely be restarted.
+       std::atomic<RunState> running{NOT_RUNNING};
        bool paused = false;
        std::chrono::steady_clock::time_point start, next_frame_start, last_frame;