X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.h;h=118ecd6c23812ff9f1f57f2bb6fb5380bed1bcc2;hb=d42c974620e7b0f780c0d4d10a3ce8f34e8e912a;hp=321842bcff08ee5d7477433dcd1f90ffe9d1b1fe;hpb=05b0c5b2b693ba809b8334a892463ae34febb6c3;p=nageru

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 321842b..118ecd6 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,11 +13,12 @@
 // 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.
-	PBOFrameAllocator(size_t frame_size,
+	PBOFrameAllocator(bmusb::PixelFormat pixel_format,
+	                  size_t frame_size,
 	                  GLuint width, GLuint height,
 	                  size_t num_queued_frames = 16,  // FIXME: should be 6
 	                  GLenum buffer = GL_PIXEL_UNPACK_BUFFER_ARB,
@@ -29,12 +31,24 @@ public:
 	struct Userdata {
 		GLuint pbo;
 
+		// NOTE: These frames typically go into LiveInputWrapper, which is
+		// configured to accept one type of frame only. In other words,
+		// the existence of a format field doesn't mean you can set it
+		// freely at runtime.
+		bmusb::PixelFormat pixel_format;
+
 		// The second set is only used for the second field of interlaced inputs.
-		GLuint tex_y[2], tex_cbcr[2];
+		GLuint tex_y[2], tex_cbcr[2];  // For FRAME_FORMAT_YCBCR_8BIT.
+		GLuint tex_v210[2], tex_444[2];  // For FRAME_FORMAT_YCBCR_10BIT.
+		GLuint tex_rgba[2];  // For FRAME_FORMAT_RGBA_8BIT.
 		GLuint last_width[2], last_height[2];
+		GLuint last_v210_width[2];  // FRAME_FORMAT_YCBCR_10BIT.
+		bool last_interlaced, last_has_signal, last_is_connected;
+		unsigned last_frame_rate_nom, last_frame_rate_den;
 	};
 
 private:
+	bmusb::PixelFormat pixel_format;
 	std::mutex freelist_mutex;
 	std::queue<Frame> freelist;
 	GLenum buffer;