X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.h;h=9220491669c2a194bac2b3c2833d3c3f2ffaf696;hb=b0d8d860fba68b63b5cd70ef97d81b7146b031ab;hp=452c006bd2d36c290de9cd456b4c4edbf4b87b85;hpb=d7bba4abb3d56893399578f0540b9ded0a28380f;p=nageru

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 452c006..9220491 100644
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -12,7 +12,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 +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;