Show interpolated frames in the live window.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 2f31c1b1d88206150935b2d02a147be61ed98f68..591ff13e96daa0a38770ec9dfea9be5bd5b8dc88 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -14,6 +14,7 @@
 struct JPEGID {
        unsigned stream_idx;
        int64_t pts;
+       bool interpolated;
 };
 struct Frame {
        std::unique_ptr<uint8_t[]> y, cb, cr;
@@ -36,19 +37,16 @@ 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);
 
+
 signals:
        void clicked();
 
@@ -58,10 +56,8 @@ 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.