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

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index d0cd47c..bc36283 100644
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -1,33 +1,27 @@
 #ifndef _JPEG_FRAME_VIEW_H
 #define _JPEG_FRAME_VIEW_H 1
 
-#include <epoxy/gl.h>
-#include <QGLWidget>
-
-#include <stdint.h>
+#include "frame_on_disk.h"
+#include "jpeg_frame.h"
+#include "ycbcr_converter.h"
 
+#include <QGLWidget>
+#include <epoxy/gl.h>
+#include <memory>
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <movit/mix_effect.h>
 #include <movit/ycbcr_input.h>
-
-#include <memory>
+#include <stdint.h>
 #include <thread>
 
-#include "jpeg_frame.h"
-
-struct JPEGID {
-	unsigned stream_idx;
-	int64_t pts;
-	bool interpolated;
-};
 enum CacheMissBehavior {
 	DECODE_IF_NOT_IN_CACHE,
 	RETURN_NULLPTR_IF_NOT_IN_CACHE
 };
 
-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);
+std::shared_ptr<Frame> decode_jpeg_with_cache(FrameOnDisk id, CacheMissBehavior cache_miss_behavior, bool *did_decode);
 
 class JPEGFrameView : public QGLWidget {
 	Q_OBJECT
@@ -35,14 +29,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, FrameOnDisk frame, FrameOnDisk secondary_frame = {}, float fade_alpha = 0.0f);
+	void setFrame(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 +53,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;