X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.h;h=da3bd2e6d05d7f8668b90f9c61d4b3dd30400d22;hb=83e395e558735bd09d645e01b194f42f6764a503;hp=aedae3b99cc89d5d8085c95694d73ea95a49d458;hpb=a98732df9454028ddaa54a9d07b5d7513767bfe9;p=nageru

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index aedae3b..da3bd2e 100644
--- 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,13 +29,17 @@ public:
 
 	struct Userdata {
 		GLuint pbo;
-		GLuint tex_y, tex_cbcr;
-		GLuint last_width, last_height;
+
+		// The second set is only used for the second field of interlaced inputs.
+		GLuint tex_y[2], tex_cbcr[2];  // For 8-bit.
+		GLuint tex_v210[2], tex_444[2];  // For 10-bit.
+		GLuint last_width[2], last_height[2];
+		GLuint last_v210_width[2];  // For 10-bit.
+		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;