X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=098b574b1f8f0b79204c90dbaa55ca148a085294;hp=bb9138cfc6e8a55dc25869782542eb2c855bd56f;hb=a770ba7526844f395b08625480befad83b8fcadf;hpb=75cfb6ee9d6fda13fae5b59bcdb90c69fdf46435

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index bb9138c..098b574 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,14 +1,59 @@
 #include <string.h>
 #include <assert.h>
+#include <GL/glew.h>
 
 #include <Eigen/LU>
 
 #include "ycbcr_input.h"
 #include "util.h"
-#include "opengl.h"
 
 using namespace Eigen;
 
+namespace {
+
+// OpenGL has texel center in (0.5, 0.5), but different formats have
+// chroma in various other places. If luma samples are X, the chroma
+// sample is *, and subsampling is 3x3, the situation with chroma
+// center in (0.5, 0.5) looks approximately like this:
+//
+//   X   X
+//     *   
+//   X   X
+//
+// If, on the other hand, chroma center is in (0.0, 0.5) (common
+// for e.g. MPEG-4), the figure changes to:
+//
+//   X   X
+//   *      
+//   X   X
+//
+// In other words, (0.0, 0.0) means that the chroma sample is exactly
+// co-sited on top of the top-left luma sample. Note, however, that
+// this is _not_ 0.5 texels to the left, since the OpenGL's texel center
+// is in (0.5, 0.5); it is in (0.25, 0.25). In a sense, the four luma samples
+// define a square where chroma position (0.0, 0.0) is in texel position
+// (0.25, 0.25) and chroma position (1.0, 1.0) is in texel position (0.75, 0.75)
+// (the outer border shows the borders of the texel itself, ie. from
+// (0, 0) to (1, 1)):
+//
+//  ---------
+// |         |
+// |  X---X  |
+// |  | * |  |
+// |  X---X  |
+// |         |
+//  ---------
+//
+// Also note that if we have no subsampling, the square will have zero
+// area and the chroma position does not matter at all.
+float compute_chroma_offset(float pos, unsigned subsampling_factor, unsigned resolution)
+{
+	float local_chroma_pos = (0.5 + pos * (subsampling_factor - 1)) / subsampling_factor;
+	return (0.5 - local_chroma_pos) / resolution;
+}
+
+}  // namespace
+
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
                        unsigned width, unsigned height)
@@ -24,18 +69,18 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	pbos[0] = pbos[1] = pbos[2] = 0;
 	texture_num[0] = texture_num[1] = texture_num[2] = 0;
 
-	pitch[0] = pitch[1] = pitch[2] = width;
-
 	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;
 	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);
 }
 
@@ -210,29 +255,20 @@ std::string YCbCrInput::output_fragment_shader()
 		scale[0], scale[1], scale[2]);
 	frag_shader += buf;
 
-	// OpenGL has texel center in (0.5, 0.5), but different formats have
-	// chroma in various other places. If luma samples are X, the chroma
-	// sample is *, and subsampling is 3x3, the situation with chroma
-	// center in (0.5, 0.5) looks approximately like this:
-	//
-	//   X     X
-	//      *   
-  	//   X     X
-	//
-	// If, on the other hand, chroma center is in (0.0, 0.5) (common
-	// for e.g. MPEG-4), the figure changes to:
-	//
-	//   X     X
-	//   *      
-  	//   X     X
-	//
-	// Obviously, the chroma plane here needs to be moved to the left,
-	// which means _adding_ 0.5 to the texture coordinates when sampling
-	// chroma.
-	float chroma_offset_x = (0.5f - ycbcr_format.chroma_x_position) / widths[1];
-	float chroma_offset_y = (0.5f - ycbcr_format.chroma_y_position) / heights[1];
-	sprintf(buf, "const vec2 PREFIX(chroma_offset) = vec2(%.8f, %.8f);\n",
-		chroma_offset_x, chroma_offset_y);
+	float cb_offset_x = compute_chroma_offset(
+		ycbcr_format.cb_x_position, ycbcr_format.chroma_subsampling_x, widths[1]);
+	float cb_offset_y = compute_chroma_offset(
+		ycbcr_format.cb_y_position, ycbcr_format.chroma_subsampling_y, heights[1]);
+	sprintf(buf, "const vec2 PREFIX(cb_offset) = vec2(%.8f, %.8f);\n",
+		cb_offset_x, cb_offset_y);
+	frag_shader += buf;
+
+	float cr_offset_x = compute_chroma_offset(
+		ycbcr_format.cr_x_position, ycbcr_format.chroma_subsampling_x, widths[2]);
+	float cr_offset_y = compute_chroma_offset(
+		ycbcr_format.cr_y_position, ycbcr_format.chroma_subsampling_y, heights[2]);
+	sprintf(buf, "const vec2 PREFIX(cr_offset) = vec2(%.8f, %.8f);\n",
+		cr_offset_x, cr_offset_y);
 	frag_shader += buf;
 
 	frag_shader += read_file("ycbcr_input.frag");