X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jpeg_frame_view.h;h=b8e26c4a3a98f35170d73e8445098e11488d7d01;hb=215cdc3dced101eaecb864eb33ffe5c4865a0bb4;hp=d0cd47c200833a961469fd0b1522f3c928268d1d;hpb=3517cb889c4e1d348033bc6aeeeaa0189296827d;p=nageru

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index d0cd47c..b8e26c4 100644
--- 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;
@@ -25,6 +27,19 @@ enum CacheMissBehavior {
 	RETURN_NULLPTR_IF_NOT_IN_CACHE
 };
 
+// This is, well, a hack. We hope for no collisions.
+inline JPEGID create_jpegid_for_interpolated_fade(unsigned stream_idx, int64_t pts, unsigned secondary_stream_idx, int64_t secondary_pts)
+{
+	JPEGID id;
+	id.stream_idx = (stream_idx << 8) | secondary_stream_idx;
+
+	uint64_t rot = secondary_stream_idx;
+	rot = (rot << 32) | (rot >> 32);
+	id.pts = pts ^ int64_t(rot);
+	id.interpolated = true;
+	return id;
+}
+
 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);
@@ -35,14 +50,14 @@ class JPEGFrameView : public QGLWidget {
 public:
 	JPEGFrameView(QWidget *parent);
 
-	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 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(JPEGID id, 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 +74,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;