Move Y'CbCr conversion into a common utility class.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 585417279ca8ebcfbbed1263abcdcfb6d3f7bbc3..d8babbb17ed7dc72a6e014cbc8537920bb0bb9cd 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -11,18 +11,16 @@
 #include <movit/ycbcr_input.h>
 
 #include <memory>
+#include <thread>
+
+#include "jpeg_frame.h"
+#include "ycbcr_converter.h"
 
 struct JPEGID {
        unsigned stream_idx;
        int64_t pts;
        bool interpolated;
 };
-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;
-};
 enum CacheMissBehavior {
        DECODE_IF_NOT_IN_CACHE,
        RETURN_NULLPTR_IF_NOT_IN_CACHE
@@ -48,6 +46,8 @@ public:
        void setDecodedFrame(std::shared_ptr<Frame> frame);
        void set_overlay(const std::string &text);  // Blank for none.
 
+       static void shutdown();
+
 signals:
        void clicked();
 
@@ -58,12 +58,12 @@ protected:
 
 private:
        // The stream index of the latest frame we displayed.
-       unsigned current_stream_idx;
+       unsigned current_stream_idx = 0;
+
+       std::unique_ptr<YCbCrConverter> ycbcr_converter;
+       movit::EffectChain *current_chain = nullptr;  // Owned by ycbcr_converter.
 
-       std::unique_ptr<movit::EffectChain> chain;
        std::shared_ptr<Frame> current_frame;  // So that we hold on to the pixels.
-       movit::YCbCrInput *ycbcr_input;
-       movit::YCbCrFormat ycbcr_format;
 
        static constexpr int overlay_base_width = 16, overlay_base_height = 16;
        int overlay_width = overlay_base_width, overlay_height = overlay_base_height;
@@ -73,6 +73,8 @@ private:
        bool overlay_input_needs_refresh = false;
 
        int gl_width, gl_height;
+
+       static std::thread jpeg_decoder_thread;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)