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

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index 958b916..d1d849a 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;
 
@@ -79,6 +81,8 @@ 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);
 }
 
@@ -198,6 +202,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 +223,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;