Make for somewhat cleaner shutdown.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 567da2dd99c70b83021ecf4c6282debbaabc2c31..d0cd47c200833a961469fd0b1522f3c928268d1d 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -7,19 +7,18 @@
 #include <stdint.h>
 
 #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;
-};
-struct Frame {
-       std::unique_ptr<uint8_t[]> y, cb, cr;
-       unsigned width, height;
-       unsigned chroma_subsampling_x, chroma_subsampling_y;
-       unsigned pitch_y, pitch_chroma;
+       bool interpolated;
 };
 enum CacheMissBehavior {
        DECODE_IF_NOT_IN_CACHE,
@@ -36,13 +35,17 @@ class JPEGFrameView : public QGLWidget {
 public:
        JPEGFrameView(QWidget *parent);
 
-       void setFrame(unsigned stream_idx, int64_t pts);
+       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();
@@ -54,12 +57,26 @@ protected:
 
 private:
        // The stream index of the latest frame we displayed.
-       unsigned current_stream_idx;
+       unsigned current_stream_idx = 0;
 
-       std::unique_ptr<movit::EffectChain> chain;
+       std::unique_ptr<movit::EffectChain> planar_chain;
        std::shared_ptr<Frame> current_frame;  // So that we hold on to the pixels.
-       movit::YCbCrInput *ycbcr_input;
+       movit::YCbCrInput *ycbcr_planar_input;
        movit::YCbCrFormat ycbcr_format;
+
+       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)