Write 1.4.0 changelog.

[nageru] / pbo_frame_allocator.h

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 452c006bd2d36c290de9cd456b4c4edbf4b87b85..024e57a30dc2f60d771659f561b2ac43a337b7aa 100644 (file)
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -2,6 +2,7 @@
 #define _PBO_FRAME_ALLOCATOR 1
 
 #include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <memory>
 #include <mutex>
@@ -12,7 +13,7 @@
 // An allocator that allocates straight into OpenGL pinned memory.
 // Meant for video frames only. We use a queue rather than a stack,
 // since we want to maximize pipelineability.
-class PBOFrameAllocator : public FrameAllocator {
+class PBOFrameAllocator : public bmusb::FrameAllocator {
 public:
        // Note: You need to have an OpenGL context when calling
        // the constructor.
@@ -28,12 +29,15 @@ public:
 
        struct Userdata {
                GLuint pbo;
-               GLuint tex_y, tex_cbcr;
+
+               // The second set is only used for the second field of interlaced inputs.
+               GLuint tex_y[2], tex_cbcr[2];
+               GLuint last_width[2], last_height[2];
+               bool last_interlaced, last_has_signal, last_is_connected;
+               unsigned last_frame_rate_nom, last_frame_rate_den;
        };
 
 private:
-       size_t frame_size;
-
        std::mutex freelist_mutex;
        std::queue<Frame> freelist;
        GLenum buffer;