Small refactoring in JPEGFrameView.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 43418192bfa1969b6f731ea579183c8696b34dbf..567da2dd99c70b83021ecf4c6282debbaabc2c31 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -11,10 +11,24 @@
 
 #include <memory>
 
+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;
 };
+enum CacheMissBehavior {
+       DECODE_IF_NOT_IN_CACHE,
+       RETURN_NULLPTR_IF_NOT_IN_CACHE
+};
+
+std::string filename_for_frame(unsigned stream_idx, int64_t pts);
+std::shared_ptr<Frame> decode_jpeg(const std::string &filename);
+std::shared_ptr<Frame> decode_jpeg_with_cache(JPEGID id, CacheMissBehavior cache_miss_behavior, bool *did_decode);
 
 class JPEGFrameView : public QGLWidget {
        Q_OBJECT
@@ -22,29 +36,30 @@ 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);
+
+       void mousePressEvent(QMouseEvent *event) override;
+
+       unsigned get_stream_idx() const { return current_stream_idx; }
 
        void setDecodedFrame(std::shared_ptr<Frame> frame);
 
+signals:
+       void clicked();
+
 protected:
        void initializeGL() override;
        void resizeGL(int width, int height) override;
        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;
 };
 
 #endif  // !defined(_JPEG_FRAME_VIEW_H)