X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.h;h=9220491669c2a194bac2b3c2833d3c3f2ffaf696;hb=26e1ec466d4730b6abc0e20201d704cfdf41a6eb;hp=5050f6fbdd1d34579627ba36605b7b3f609a1029;hpb=956a923ae947b58a21ed08ba5d30700633608468;p=nageru

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 5050f6f..9220491 100644
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -2,15 +2,17 @@
 #define _PBO_FRAME_ALLOCATOR 1
 
 #include <epoxy/gl.h>
+#include <stddef.h>
+#include <memory>
 #include <mutex>
 #include <queue>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 
 // 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.
@@ -26,12 +28,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;