Make for somewhat cleaner shutdown.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 60c97d97392de5b6c9f55396f697457a33d55702..d0cd47c200833a961469fd0b1522f3c928268d1d 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -1,38 +1,82 @@
 #ifndef _JPEG_FRAME_VIEW_H
 #define _JPEG_FRAME_VIEW_H 1
 
-#include <QGraphicsView>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsScene>
+#include <epoxy/gl.h>
+#include <QGLWidget>
 
 #include <stdint.h>
 
-class JPEGFrameView : public QGraphicsView {
+#include <movit/effect_chain.h>
+#include <movit/flat_input.h>
+#include <movit/ycbcr_input.h>
+
+#include <memory>
+#include <thread>
+
+#include "jpeg_frame.h"
+
+struct JPEGID {
+       unsigned stream_idx;
+       int64_t pts;
+       bool interpolated;
+};
+enum CacheMissBehavior {
+       DECODE_IF_NOT_IN_CACHE,
+       RETURN_NULLPTR_IF_NOT_IN_CACHE
+};
+
+std::string filename_for_frame(unsigned stream_idx, int64_t pts);
+std::shared_ptr<Frame> decode_jpeg(const std::string &filename);
+std::shared_ptr<Frame> decode_jpeg_with_cache(JPEGID id, CacheMissBehavior cache_miss_behavior, bool *did_decode);
+
+class JPEGFrameView : public QGLWidget {
        Q_OBJECT
 
 public:
        JPEGFrameView(QWidget *parent);
 
-       void setFrame(unsigned stream_idx, int64_t pts)
-       {
-               this->stream_idx = stream_idx;
-               this->pts = pts;
-               update_frame();
-       }
+       void setFrame(unsigned stream_idx, int64_t pts, bool interpolated);
+       static void insert_interpolated_frame(unsigned stream_idx, int64_t pts, std::shared_ptr<Frame> frame);
+
+       void mousePressEvent(QMouseEvent *event) override;
+
+       unsigned get_stream_idx() const { return current_stream_idx; }
+
+       void setDecodedFrame(std::shared_ptr<Frame> frame);
+       void set_overlay(const std::string &text);  // Blank for none.
+
+       static void shutdown();
+
+signals:
+       void clicked();
 
 protected:
-       void resizeEvent(QResizeEvent *event) override;
-       void paintEvent(QPaintEvent *event) override;
+       void initializeGL() override;
+       void resizeGL(int width, int height) override;
+       void paintGL() override;
 
 private:
-       void update_frame();
+       // The stream index of the latest frame we displayed.
+       unsigned current_stream_idx = 0;
 
-       QGraphicsPixmapItem item;
-       QGraphicsScene scene;
+       std::unique_ptr<movit::EffectChain> planar_chain;
+       std::shared_ptr<Frame> current_frame;  // So that we hold on to the pixels.
+       movit::YCbCrInput *ycbcr_planar_input;
+       movit::YCbCrFormat ycbcr_format;
 
-       unsigned stream_idx;
-       int64_t pts;
-       bool dirty = false;
+       std::unique_ptr<movit::EffectChain> semiplanar_chain;
+       movit::YCbCrInput *ycbcr_semiplanar_input;
+
+       static constexpr int overlay_base_width = 16, overlay_base_height = 16;
+       int overlay_width = overlay_base_width, overlay_height = overlay_base_height;
+       std::unique_ptr<QImage> overlay_image;  // If nullptr, no overlay.
+       std::unique_ptr<movit::EffectChain> overlay_chain;  // Just to get the overlay on screen in the easiest way possible.
+       movit::FlatInput *overlay_input;
+       bool overlay_input_needs_refresh = false;
+
+       int gl_width, gl_height;
+
+       static std::thread jpeg_decoder_thread;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)