Put depth in 0..1; evidently even fp32 depth is clamped in the ARB version.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 219ee5817c679784141bf31f0c8b14fca4e736a7..6f37bfccd4f88d72d4cafaaa95156446a13d97ff 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -1,13 +1,24 @@
 #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;
+};
+
+class JPEGFrameView : public QGLWidget {
        Q_OBJECT
 
 public:
@@ -17,20 +28,28 @@ public:
        {
                this->stream_idx = stream_idx;
                this->pts = pts;
-               update();
+               update_frame();
        }
 
+       unsigned get_stream_idx() const { return stream_idx; }
+
+       void setDecodedFrame(std::shared_ptr<Frame> frame);
+
 protected:
-       void resizeEvent(QResizeEvent *event) override;
+       void initializeGL() override;
+       void resizeGL(int width, int height) override;
+       void paintGL() override;
 
 private:
-       void update();
-
-       QGraphicsPixmapItem item;
-       QGraphicsScene scene;
+       void update_frame();
 
        unsigned stream_idx;
        int64_t pts;
+
+       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)