X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.cpp;h=bdd9beb8f0a034c6ba777178e916697a78e7d0d6;hb=d3e48df512d9476d3849227067792a3537bb094e;hp=ed1ddb5f9a1c0eb94588daa508c4ebf2fdaad858;hpb=e7042ad94ffec1505feaf7f8c5a265b2165957a0;p=nageru

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index ed1ddb5..bdd9beb 100644
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -12,6 +12,20 @@
 
 using namespace std;
 
+namespace {
+
+void set_clamp_to_edge()
+{
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	check_error();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	check_error();
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	check_error();
+}
+
+}  // namespace
+
 PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
         : pixel_format(pixel_format), buffer(buffer)
 {
@@ -22,7 +36,7 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
 		check_error();
 		glBindBuffer(buffer, pbo);
 		check_error();
-		glBufferStorage(buffer, frame_size, NULL, permissions | GL_MAP_PERSISTENT_BIT);
+		glBufferStorage(buffer, frame_size, nullptr, permissions | GL_MAP_PERSISTENT_BIT);
 		check_error();
 
 		Frame frame;
@@ -35,10 +49,10 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
 		userdata[i].pixel_format = pixel_format;
 		frame.owner = this;
 
-		// For 8-bit Y'CbCr, we ask the driver to split Y' and Cb/Cr
+		// For 8-bit non-planar Y'CbCr, we ask the driver to split Y' and Cb/Cr
 		// into separate textures. For 10-bit, the input format (v210)
 		// is complicated enough that we need to interpolate up to 4:4:4,
-		// which we do in a compute shader ourselves. For RGBA, the data
+		// which we do in a compute shader ourselves. For BGRA, the data
 		// is already 4:4:4:4.
 		frame.interleaved = (pixel_format == bmusb::PixelFormat_8BitYCbCr);
 
@@ -58,18 +72,32 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
 			glGenTextures(2, userdata[i].tex_444);
 			check_error();
 			break;
-		case bmusb::PixelFormat_8BitRGBA:
+		case bmusb::PixelFormat_8BitBGRA:
 			glGenTextures(2, userdata[i].tex_rgba);
 			check_error();
 			break;
+		case bmusb::PixelFormat_8BitYCbCrPlanar:
+			glGenTextures(2, userdata[i].tex_y);
+			check_error();
+			glGenTextures(2, userdata[i].tex_cb);
+			check_error();
+			glGenTextures(2, userdata[i].tex_cr);
+			check_error();
+			break;
+		default:
+			assert(false);
 		}
 
 		userdata[i].last_width[0] = width;
 		userdata[i].last_height[0] = height;
+		userdata[i].last_cbcr_width[0] = width / 2;
+		userdata[i].last_cbcr_height[0] = height;
 		userdata[i].last_v210_width[0] = 0;
 
 		userdata[i].last_width[1] = 0;
 		userdata[i].last_height[1] = 0;
+		userdata[i].last_cbcr_width[1] = 0;
+		userdata[i].last_cbcr_height[1] = 0;
 		userdata[i].last_v210_width[1] = 0;
 
 		userdata[i].last_interlaced = false;
@@ -89,20 +117,15 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
 				check_error();
 				if (field == 0) {
 					userdata[i].last_v210_width[0] = v210_width;
-					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, v210_width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL);
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, v210_width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
 					check_error();
 				}
 
 				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_444[field]);
 				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-				check_error();
+				set_clamp_to_edge();
 				if (field == 0) {
-					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL);
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
 					check_error();
 				}
 				break;
@@ -110,48 +133,58 @@ PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t fra
 			case bmusb::PixelFormat_8BitYCbCr:
 				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
 				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-				check_error();
+				set_clamp_to_edge();
 				if (field == 0) {
-					glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
 					check_error();
 				}
 
 				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cbcr[field]);
 				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-				check_error();
+				set_clamp_to_edge();
 				if (field == 0) {
-					glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL);
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, nullptr);
 					check_error();
 				}
 				break;
-			case bmusb::PixelFormat_8BitRGBA:
+			case bmusb::PixelFormat_8BitBGRA:
 				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_rgba[field]);
 				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-				check_error();
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-				check_error();
+				set_clamp_to_edge();
 				if (field == 0) {
 					if (global_flags.can_disable_srgb_decoder) {  // See the comments in tweaked_inputs.h.
-						glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+						glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
 					} else {
-						glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+						glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
 					}
 					check_error();
 				}
 				break;
+			case bmusb::PixelFormat_8BitYCbCrPlanar:
+				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
+				check_error();
+				set_clamp_to_edge();
+				if (field == 0) {
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+					check_error();
+				}
+
+				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cb[field]);
+				check_error();
+				set_clamp_to_edge();
+				if (field == 0) {
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+					check_error();
+				}
+
+				glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cr[field]);
+				check_error();
+				set_clamp_to_edge();
+				if (field == 0) {
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width / 2, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+					check_error();
+				}
+				break;
 			default:
 				assert(false);
 			}
@@ -192,10 +225,18 @@ PBOFrameAllocator::~PBOFrameAllocator()
 			glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cbcr);
 			check_error();
 			break;
-		case bmusb::PixelFormat_8BitRGBA:
+		case bmusb::PixelFormat_8BitBGRA:
 			glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_rgba);
 			check_error();
 			break;
+		case bmusb::PixelFormat_8BitYCbCrPlanar:
+			glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_y);
+			check_error();
+			glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cb);
+			check_error();
+			glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cr);
+			check_error();
+			break;
 		default:
 			assert(false);
 		}
@@ -239,7 +280,7 @@ void PBOFrameAllocator::release_frame(Frame frame)
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 		check_error();
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, userdata->last_width[field], userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, userdata->last_width[field], userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
 		check_error();
 
 		glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr[field]);
@@ -250,7 +291,7 @@ void PBOFrameAllocator::release_frame(Frame frame)
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 		check_error();
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, userdata->last_width[field] / 2, userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, userdata->last_width[field] / 2, userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
 		check_error();
 	}
 #endif