X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=jpeg_frame_view.h;h=5ef68d01cb56d50ef7b1677455e2a7fc75fad4a0;hb=e6dd4055a226d31ecb29bc0746bb896e6ff7ff66;hp=2f31c1b1d88206150935b2d02a147be61ed98f68;hpb=530f3b3aa10aafaf22da10e53d3d243df26bf174;p=nageru

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 2f31c1b..5ef68d0 100644
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include <movit/effect_chain.h>
+#include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 
 #include <memory>
@@ -14,6 +15,7 @@
 struct JPEGID {
 	unsigned stream_idx;
 	int64_t pts;
+	bool interpolated;
 };
 struct Frame {
 	std::unique_ptr<uint8_t[]> y, cb, cr;
@@ -36,18 +38,15 @@ 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();
@@ -58,15 +57,19 @@ 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;
 
 	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;
+
+	static constexpr int overlay_width = 16, overlay_height = 16;
+	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;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)