Remove some debugging code.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index d0cd47c200833a961469fd0b1522f3c928268d1d..9a4621d46b3bc512b27a04613bc7cd42d6d8642f 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -8,12 +8,14 @@
 
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <movit/mix_effect.h>
 #include <movit/ycbcr_input.h>
 
 #include <memory>
 #include <thread>
 
 #include "jpeg_frame.h"
+#include "ycbcr_converter.h"
 
 struct JPEGID {
        unsigned stream_idx;
@@ -35,14 +37,14 @@ class JPEGFrameView : public QGLWidget {
 public:
        JPEGFrameView(QWidget *parent);
 
-       void setFrame(unsigned stream_idx, int64_t pts, bool interpolated);
+       void setFrame(unsigned stream_idx, int64_t pts, bool interpolated, int secondary_stream_idx = -1, int64_t secondary_pts = -1, float fade_alpha = 0.0f);
        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 setDecodedFrame(std::shared_ptr<Frame> frame, std::shared_ptr<Frame> secondary_frame, float fade_alpha);
        void set_overlay(const std::string &text);  // Blank for none.
 
        static void shutdown();
@@ -59,13 +61,11 @@ 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.
+       std::shared_ptr<Frame> current_secondary_frame;  // Same.
 
        static constexpr int overlay_base_width = 16, overlay_base_height = 16;
        int overlay_width = overlay_base_width, overlay_height = overlay_base_height;