X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=65103713df923aa59d38317e183564d04e58e446;hp=a0b9abf2933fa602e75a4dac7715f6c3cf962839;hb=b0532d475da098fd6d8a0475e4b106cac6502163;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index a0b9abf..6510371 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,12 +1,13 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
+#include <Eigen/LU>
+
 #include "ycbcr_input.h"
 #include "util.h"
+#include "opengl.h"
+
+using namespace Eigen;
 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
@@ -14,17 +15,19 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	: image_format(image_format),
 	  ycbcr_format(ycbcr_format),
 	  needs_update(false),
+	  needs_pbo_recreate(false),
 	  finalized(false),
 	  needs_mipmaps(false),
 	  width(width),
 	  height(height)
 {
-	pitch[0] = pitch[1] = pitch[2] = width;
+	pbos[0] = pbos[1] = pbos[2] = 0;
+	texture_num[0] = texture_num[1] = texture_num[2] = 0;
 
 	assert(width % ycbcr_format.chroma_subsampling_x == 0);
-	widths[0] = width;
-	widths[1] = width / ycbcr_format.chroma_subsampling_x;
-	widths[2] = width / ycbcr_format.chroma_subsampling_x;
+	pitch[0] = widths[0] = width;
+	pitch[1] = widths[1] = width / ycbcr_format.chroma_subsampling_x;
+	pitch[2] = widths[2] = width / ycbcr_format.chroma_subsampling_x;
 
 	assert(height % ycbcr_format.chroma_subsampling_y == 0);
 	heights[0] = height;
@@ -34,8 +37,23 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	register_int("needs_mipmaps", &needs_mipmaps);
 }
 
+YCbCrInput::~YCbCrInput()
+{
+	if (pbos[0] != 0) {
+		glDeleteBuffers(3, pbos);
+		check_error();
+	}
+	if (texture_num[0] != 0) {
+		glDeleteTextures(3, texture_num);
+		check_error();
+	}
+}
+
 void YCbCrInput::finalize()
 {
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	check_error();
+
 	// Create PBOs to hold the textures holding the input image, and then the texture itself.
 	glGenBuffers(3, pbos);
 	check_error();
@@ -62,7 +80,7 @@ void YCbCrInput::finalize()
 		check_error();
 	}
 
-	needs_update = false;
+	needs_update = true;
 	finalized = true;
 }
 	
@@ -74,12 +92,20 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
 		glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
 		check_error();
 
-		if (needs_update) {
+		if (needs_update || needs_pbo_recreate) {
 			// Copy the pixel data into the PBO.
 			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
 			check_error();
+
+			if (needs_pbo_recreate) {
+				// The pitch has changed; we need to reallocate this PBO.
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch[channel] * heights[channel], NULL, GL_STREAM_DRAW);
+				check_error();
+			}
+
 			void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
 			memcpy(mapped_pbo, pixel_data[channel], pitch[channel] * heights[channel]);
+
 			glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
 			check_error();
 
@@ -106,6 +132,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
 
 	*sampler_num += 3;
 	needs_update = false;
+	needs_pbo_recreate = false;
 }
 
 std::string YCbCrInput::output_fragment_shader()
@@ -150,38 +177,29 @@ std::string YCbCrInput::output_fragment_shader()
 	}
 
 	// Matrix to convert RGB to YCbCr. See e.g. Rec. 601.
-	Matrix3x3 rgb_to_ycbcr;
-	rgb_to_ycbcr[0] = coeff[0];
-	rgb_to_ycbcr[3] = coeff[1];
-	rgb_to_ycbcr[6] = coeff[2];
+	Matrix3d rgb_to_ycbcr;
+	rgb_to_ycbcr(0,0) = coeff[0];
+	rgb_to_ycbcr(0,1) = coeff[1];
+	rgb_to_ycbcr(0,2) = coeff[2];
 
 	float cb_fac = (224.0 / 219.0) / (coeff[0] + coeff[1] + 1.0f - coeff[2]);
-	rgb_to_ycbcr[1] = -coeff[0] * cb_fac;
-	rgb_to_ycbcr[4] = -coeff[1] * cb_fac;
-	rgb_to_ycbcr[7] = (1.0f - coeff[2]) * cb_fac;
+	rgb_to_ycbcr(1,0) = -coeff[0] * cb_fac;
+	rgb_to_ycbcr(1,1) = -coeff[1] * cb_fac;
+	rgb_to_ycbcr(1,2) = (1.0f - coeff[2]) * cb_fac;
 
 	float cr_fac = (224.0 / 219.0) / (1.0f - coeff[0] + coeff[1] + coeff[2]);
-	rgb_to_ycbcr[2] = (1.0f - coeff[0]) * cr_fac;
-	rgb_to_ycbcr[5] = -coeff[1] * cr_fac;
-	rgb_to_ycbcr[8] = -coeff[2] * cr_fac;
+	rgb_to_ycbcr(2,0) = (1.0f - coeff[0]) * cr_fac;
+	rgb_to_ycbcr(2,1) = -coeff[1] * cr_fac;
+	rgb_to_ycbcr(2,2) = -coeff[2] * cr_fac;
 
 	// Inverting the matrix gives us what we need to go from YCbCr back to RGB.
-	Matrix3x3 ycbcr_to_rgb;
-	invert_3x3_matrix(rgb_to_ycbcr, ycbcr_to_rgb);
+	Matrix3d ycbcr_to_rgb = rgb_to_ycbcr.inverse();
 
 	std::string frag_shader;
 
-	char buf[1024];
-	sprintf(buf,
-		"const mat3 PREFIX(inv_ycbcr_matrix) = mat3(\n"
-		"    %.8f, %.8f, %.8f,\n"
-		"    %.8f, %.8f, %.8f,\n"
-		"    %.8f, %.8f, %.8f);\n",
-		ycbcr_to_rgb[0], ycbcr_to_rgb[1], ycbcr_to_rgb[2],
-		ycbcr_to_rgb[3], ycbcr_to_rgb[4], ycbcr_to_rgb[5],
-		ycbcr_to_rgb[6], ycbcr_to_rgb[7], ycbcr_to_rgb[8]);
-	frag_shader = buf;
+	frag_shader = output_glsl_mat3("PREFIX(inv_ycbcr_matrix)", ycbcr_to_rgb);
 
+	char buf[256];
 	sprintf(buf, "const vec3 PREFIX(offset) = vec3(%.8f, %.8f, %.8f);\n",
 		offset[0], offset[1], offset[2]);
 	frag_shader += buf;