std::shared_ptr is surprisingly not thread-safe, so we need a mutex.

[pkanalytics] / video_widget.h

diff --git a/video_widget.h b/video_widget.h
index 293c968852d4ef976c60ed30394a4740efdc2ad5..dc7d0ab7b3f834285b1da2feabd3a2e06417a927 100644 (file)
--- a/video_widget.h
+++ b/video_widget.h
@@ -37,9 +37,17 @@ public:
        void initializeGL() override;
        void resizeGL(int w, int h) override;
        void paintGL() override;
+       void wheelEvent(QWheelEvent *event) override;
+
+       // For dragging, and for back/forward button presses.
+       void mousePressEvent(QMouseEvent *e);
+       void mouseReleaseEvent(QMouseEvent *e);
+       void mouseMoveEvent(QMouseEvent *e);
 
 signals:
        void position_changed(uint64_t pos);
+       void mouse_back_clicked();
+       void mouse_forward_clicked();
 
 private:
        // Should really have been persistent and a PBO, but this is OK for now.
@@ -48,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;
@@ -59,6 +68,11 @@ private:
        GLuint last_chroma_width = 0, last_chroma_height = 0;
        GLfloat cbcr_offset[2];
        double display_aspect = 1.0;
+       double zoom_matrix[9] = {  // Column-major, to match with OpenGL.
+               1.0, 0.0, 0.0,
+               0.0, 1.0, 0.0,
+               0.0, 0.0, 1.0,
+       };
 
        int64_t pts_origin;
        int64_t last_pts;
@@ -86,6 +100,9 @@ private:
 
        std::string pathname;
 
+       bool dragging = false;
+       float last_drag_x, last_drag_y;
+
        void producer_thread_func();
        bool play_video(const std::string &pathname);
        void internal_rewind();
@@ -95,6 +112,8 @@ private:
        Frame make_video_frame(const AVFrame *frame);
        bool process_queued_commands(AVFormatContext *format_ctx, AVCodecContext *video_codec_ctx, int video_stream_index, bool *seeked);
        void store_pts(int64_t pts);
+
+       void fixup_zoom_matrix();
 };
 
 #endif  // !defined(_VIDEO_WIDGET_H)