X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=e089e512d5b7961f88159a3db23e9aa89259943e;hp=958b9167f2ede78eba5b543f9eae54053d908de5;hb=c4f0d4e876a8177db5738596f22349e030e0a1dc;hpb=29072985d0a00a53e5b578a1444cee61a0c9e1f2

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index 958b916..e089e51 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,11 +1,13 @@
-#include <string.h>
-#include <assert.h>
-#include <GL/glew.h>
-
+#include <Eigen/Core>
 #include <Eigen/LU>
+#include <GL/glew.h>
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
-#include "ycbcr_input.h"
+#include "effect_util.h"
 #include "util.h"
+#include "ycbcr_input.h"
 
 using namespace Eigen;
 
@@ -60,7 +62,6 @@ 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),
@@ -79,15 +80,13 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	heights[1] = height / ycbcr_format.chroma_subsampling_y;
 	heights[2] = height / ycbcr_format.chroma_subsampling_y;
 
+	pixel_data[0] = pixel_data[1] = pixel_data[2] = NULL;
+
 	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();
@@ -96,33 +95,17 @@ YCbCrInput::~YCbCrInput()
 
 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();
+	// Create the textures themselves.
 	glGenTextures(3, texture_num);
 	check_error();
 
 	for (unsigned channel = 0; channel < 3; ++channel) {
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
-		check_error();
-		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch[channel] * heights[channel], NULL, GL_STREAM_DRAW);
-		check_error();
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-		check_error();
-		
 		glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		check_error();
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
-		check_error();
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8, widths[channel], heights[channel], 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
 		check_error();
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-		check_error();
 	}
 
 	needs_update = true;
@@ -137,27 +120,16 @@ 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 || needs_pbo_recreate) {
+		if (needs_update) {
+			// Re-upload the texture.
 			// 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);
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 			check_error();
-
-			// Re-upload the texture from the PBO.
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
 			check_error();
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_LUMINANCE, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_LUMINANCE, GL_UNSIGNED_BYTE, pixel_data[channel]);
 			check_error();
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 			check_error();
@@ -165,11 +137,12 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
 			check_error();
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 			check_error();
-			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-			check_error();
 		}
 	}
 
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+	check_error();
+
 	// Bind samplers.
 	set_uniform_int(glsl_program_num, prefix, "tex_y", *sampler_num + 0);
 	set_uniform_int(glsl_program_num, prefix, "tex_cb", *sampler_num + 1);
@@ -177,7 +150,6 @@ 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()
@@ -198,6 +170,14 @@ std::string YCbCrInput::output_fragment_shader()
 		coeff[1] = 0.7152;
 		coeff[2] = 0.0722;
 		break;
+
+	case YCBCR_REC_2020:
+		// Rec. 2020, page 4.
+		coeff[0] = 0.2627;
+		coeff[1] = 0.6780;
+		coeff[2] = 0.0593;
+		break;
+
 	default:
 		assert(false);
 	}
@@ -211,7 +191,7 @@ std::string YCbCrInput::output_fragment_shader()
 		scale[1] = 1.0;
 		scale[2] = 1.0;
 	} else {
-		// Rec. 601, page 4; Rec. 709, page 19.
+		// Rec. 601, page 4; Rec. 709, page 19; Rec. 2020, page 4.
 		offset[0] = 16.0 / 255.0;
 		offset[1] = 128.0 / 255.0;
 		offset[2] = 128.0 / 255.0;