X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.h;h=eead7f4a32f979c8203a184f535862c6f1dab0e2;hb=4a0187ffb4075b4d217b8d9e9c96cac548b199d8;hp=118ecd6c23812ff9f1f57f2bb6fb5380bed1bcc2;hpb=25f6b207f157c081495d7abd4ea314b5ef760322;p=nageru

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 118ecd6..eead7f4 100644
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -8,6 +8,8 @@
 #include <mutex>
 #include <queue>
 
+#include <movit/ycbcr.h>
+
 #include "bmusb/bmusb.h"
 
 // An allocator that allocates straight into OpenGL pinned memory.
@@ -20,7 +22,7 @@ public:
 	PBOFrameAllocator(bmusb::PixelFormat pixel_format,
 	                  size_t frame_size,
 	                  GLuint width, GLuint height,
-	                  size_t num_queued_frames = 16,  // FIXME: should be 6
+	                  size_t num_queued_frames = 16,
 	                  GLenum buffer = GL_PIXEL_UNPACK_BUFFER_ARB,
 	                  GLenum permissions = GL_MAP_WRITE_BIT,
 	                  GLenum map_bits = GL_MAP_FLUSH_EXPLICIT_BIT);
@@ -37,17 +39,25 @@ public:
 		// freely at runtime.
 		bmusb::PixelFormat pixel_format;
 
+		// Used only for PixelFormat_8BitYCbCrPlanar.
+		movit::YCbCrFormat ycbcr_format;
+
 		// The second set is only used for the second field of interlaced inputs.
-		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 tex_y[2], tex_cbcr[2];  // For PixelFormat_8BitYCbCr.
+		GLuint tex_cb[2], tex_cr[2];  // For PixelFormat_8BitYCbCrPlanar (which also uses tex_y).
+		GLuint tex_v210[2], tex_444[2];  // For PixelFormat_10BitYCbCr.
+		GLuint tex_rgba[2];  // For PixelFormat_8BitBGRA.
 		GLuint last_width[2], last_height[2];
-		GLuint last_v210_width[2];  // FRAME_FORMAT_YCBCR_10BIT.
+		GLuint last_cbcr_width[2], last_cbcr_height[2];
+		GLuint last_v210_width[2];  // PixelFormat_10BitYCbCr.
 		bool last_interlaced, last_has_signal, last_is_connected;
 		unsigned last_frame_rate_nom, last_frame_rate_den;
 	};
 
 private:
+	void init_frame(size_t frame_idx, size_t frame_size, GLuint width, GLuint height, GLenum permissions, GLenum map_bits);
+	void destroy_frame(Frame *frame);
+
 	bmusb::PixelFormat pixel_format;
 	std::mutex freelist_mutex;
 	std::queue<Frame> freelist;