Stop sending interpolated images through the cache.

[nageru] / jpeg_frame_view.h

diff --git a/jpeg_frame_view.h b/jpeg_frame_view.h
index 1047e0b36d584db8b89363a3567b2b7ce1a3c95c..65a6608991ce8337616afdaf3d7f6f12a64d9362 100644 (file)
--- a/jpeg_frame_view.h
+++ b/jpeg_frame_view.h
@@ -17,26 +17,12 @@
 struct JPEGID {
        unsigned stream_idx;
        int64_t pts;
-       bool interpolated;
 };
 enum CacheMissBehavior {
        DECODE_IF_NOT_IN_CACHE,
        RETURN_NULLPTR_IF_NOT_IN_CACHE
 };
 
-// This is, well, a hack. We hope for no collisions.
-inline JPEGID create_jpegid_for_interpolated_fade(unsigned stream_idx, int64_t pts, unsigned secondary_stream_idx, int64_t secondary_pts)
-{
-       JPEGID id;
-       id.stream_idx = (stream_idx << 8) | secondary_stream_idx;
-
-       uint64_t rot = secondary_stream_idx;
-       rot = (rot << 32) | (rot >> 32);
-       id.pts = pts ^ int64_t(rot);
-       id.interpolated = true;
-       return id;
-}
-
 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);
@@ -47,8 +33,8 @@ class JPEGFrameView : public QGLWidget {
 public:
        JPEGFrameView(QWidget *parent);
 
-       void setFrame(unsigned stream_idx, int64_t pts, bool interpolated, int secondary_stream_idx = -1, int64_t secondary_pts = -1, float fade_alpha = 0.0f);
-       static void insert_interpolated_frame(JPEGID id, std::shared_ptr<Frame> frame);
+       void setFrame(unsigned stream_idx, int64_t pts, int secondary_stream_idx = -1, int64_t secondary_pts = -1, float fade_alpha = 0.0f);
+       void setFrame(std::shared_ptr<Frame> frame);
 
        void mousePressEvent(QMouseEvent *event) override;