Make the output actually follow the input in an interpolated fashion.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 60c97d97392de5b6c9f55396f697457a33d55702..1f7b2b7a67108a88e6baaaddcdbd436d0b746b4e 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -1,13 +1,27 @@
 #ifndef _JPEG_FRAME_VIEW_H
 #define _JPEG_FRAME_VIEW_H 1
 
-#include <QGraphicsView>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsScene>
+#include <epoxy/gl.h>
+#include <QGLWidget>
 
 #include <stdint.h>
 
-class JPEGFrameView : public QGraphicsView {
+#include <movit/effect_chain.h>
+#include <movit/ycbcr_input.h>
+
+#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;
+};
+
+std::string filename_for_frame(unsigned stream_idx, int64_t pts);
+std::shared_ptr<Frame> decode_jpeg(const std::string &filename);
+
+class JPEGFrameView : public QGLWidget {
        Q_OBJECT
 
 public:
@@ -20,19 +34,25 @@ public:
                update_frame();
        }
 
+       unsigned get_stream_idx() const { return stream_idx; }
+
+       void setDecodedFrame(std::shared_ptr<Frame> frame);
+
 protected:
-       void resizeEvent(QResizeEvent *event) override;
-       void paintEvent(QPaintEvent *event) override;
+       void initializeGL() override;
+       void resizeGL(int width, int height) override;
+       void paintGL() override;
 
 private:
        void update_frame();
 
-       QGraphicsPixmapItem item;
-       QGraphicsScene scene;
-
        unsigned stream_idx;
        int64_t pts;
-       bool dirty = false;
+
+       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;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)