X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=jpeg_frame_view.h;h=7c41b78b384e3fe863e57828ebafcce25e42d597;hb=d2664bbfbd09f04b25f94fefbf1ac890edbb4486;hp=5d97b074b5d706164ce33542053d86448a97fac4;hpb=a004d0069fc646197554fa470e65e51f111895a1;p=nageru

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 5d97b07..7c41b78 100644
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -7,19 +7,17 @@
 #include <stdint.h>
 
 #include <movit/effect_chain.h>
+#include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 
 #include <memory>
 
+#include "jpeg_frame.h"
+
 struct JPEGID {
 	unsigned stream_idx;
 	int64_t pts;
-};
-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;
+	bool interpolated;
 };
 enum CacheMissBehavior {
 	DECODE_IF_NOT_IN_CACHE,
@@ -36,16 +34,18 @@ class JPEGFrameView : public QGLWidget {
 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, int64_t pts, bool interpolated);
+	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 stream_idx; }
+	unsigned get_stream_idx() const { return current_stream_idx; }
 
 	void setDecodedFrame(std::shared_ptr<Frame> frame);
+	void set_overlay(const std::string &text);  // Blank for none.
+
+signals:
+	void clicked();
 
 protected:
 	void initializeGL() override;
@@ -53,15 +53,25 @@ protected:
 	void paintGL() override;
 
 private:
-	void update_frame();
-
-	unsigned stream_idx;
-	int64_t pts;
+	// The stream index of the latest frame we displayed.
+	unsigned current_stream_idx = 0;
 
-	std::unique_ptr<movit::EffectChain> chain;
+	std::unique_ptr<movit::EffectChain> planar_chain;
 	std::shared_ptr<Frame> current_frame;  // So that we hold on to the pixels.
-	movit::YCbCrInput *ycbcr_input;
+	movit::YCbCrInput *ycbcr_planar_input;
 	movit::YCbCrFormat ycbcr_format;
+
+	std::unique_ptr<movit::EffectChain> semiplanar_chain;
+	movit::YCbCrInput *ycbcr_semiplanar_input;
+
+	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;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)