X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jpeg_frame_view.h;h=bc36283774e987c69dd14692210722ac4d10bca8;hb=bdef311c334b674ba39a931805fb7d32ce8698da;hp=6f37bfccd4f88d72d4cafaaa95156446a13d97ff;hpb=4ac7a1bf0badfa38e739c54f0d678d379fe3fb25;p=nageru

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 6f37bfc..bc36283 100644
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -1,39 +1,48 @@
 #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 <stdint.h>
+#include <thread>
 
-#include <memory>
-
-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
 };
 
+std::shared_ptr<Frame> decode_jpeg(const std::string &filename);
+std::shared_ptr<Frame> decode_jpeg_with_cache(FrameOnDisk id, CacheMissBehavior cache_miss_behavior, bool *did_decode);
+
 class JPEGFrameView : public QGLWidget {
 	Q_OBJECT
 
 public:
 	JPEGFrameView(QWidget *parent);
 
-	void setFrame(unsigned stream_idx, int64_t pts)
-	{
-		this->stream_idx = stream_idx;
-		this->pts = pts;
-		update_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; }
 
-	unsigned get_stream_idx() const { return stream_idx; }
+	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.
 
-	void setDecodedFrame(std::shared_ptr<Frame> frame);
+	static void shutdown();
+
+signals:
+	void clicked();
 
 protected:
 	void initializeGL() override;
@@ -41,15 +50,25 @@ protected:
 	void paintGL() override;
 
 private:
-	void update_frame();
+	// The stream index of the latest frame we displayed.
+	unsigned current_stream_idx = 0;
 
-	unsigned stream_idx;
-	int64_t pts;
+	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;
+	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;
+	std::unique_ptr<QImage> overlay_image;  // If nullptr, no overlay.
+	std::unique_ptr<movit::EffectChain> overlay_chain;  // Just to get the overlay on screen in the easiest way possible.
+	movit::FlatInput *overlay_input;
+	bool overlay_input_needs_refresh = false;
+
+	int gl_width, gl_height;
+
+	static std::thread jpeg_decoder_thread;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)