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 d0cd47c200833a961469fd0b1522f3c928268d1d..d8babbb17ed7dc72a6e014cbc8537920bb0bb9cd 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -14,6 +14,7 @@
 #include <thread>
 
 #include "jpeg_frame.h"
+#include "ycbcr_converter.h"
 
 struct JPEGID {
        unsigned stream_idx;
@@ -59,13 +60,10 @@ private:
        // The stream index of the latest frame we displayed.
        unsigned current_stream_idx = 0;
 
-       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;
+       std::unique_ptr<YCbCrConverter> ycbcr_converter;
+       movit::EffectChain *current_chain = nullptr;  // Owned by ycbcr_converter.
 
-       std::unique_ptr<movit::EffectChain> semiplanar_chain;
-       movit::YCbCrInput *ycbcr_semiplanar_input;
+       std::shared_ptr<Frame> current_frame;  // So that we hold on to the pixels.
 
        static constexpr int overlay_base_width = 16, overlay_base_height = 16;
        int overlay_width = overlay_base_width, overlay_height = overlay_base_height;