X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=7bb187714e6f2ef0041a777ce864a4402525b78b;hb=ee7da87b4aa284b7babd59dc21db925f7c384ce7;hp=84f37ba0002d07db95983828944c66bc6777d7c7;hpb=f7f5d076b3a81fccfb559b547b24721bbd9a15c2;p=nageru

diff --git a/theme.cpp b/theme.cpp
index 84f37ba..7bb1877 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -265,19 +265,24 @@ int EffectChain_finalize(lua_State* L)
 		// happens in a pass not run by Movit (see ChromaSubsampler::subsample_chroma()).
 		output_ycbcr_format.chroma_subsampling_x = 1;
 		output_ycbcr_format.chroma_subsampling_y = 1;
+
+		// This will be overridden if HDMI/SDI output is in force.
 		if (global_flags.ycbcr_rec709_coefficients) {
 			output_ycbcr_format.luma_coefficients = YCBCR_REC_709;
 		} else {
 			output_ycbcr_format.luma_coefficients = YCBCR_REC_601;
 		}
+
 		output_ycbcr_format.full_range = false;
 		output_ycbcr_format.num_levels = 256;
 
 		chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR);
+		chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_INTERLEAVED);  // Add a copy where we'll only be using the Y component.
 		chain->set_dither_bits(8);
 		chain->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT);
+	} else {
+		chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 	}
-	chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
 
 	chain->finalize();
 	return 0;
@@ -603,8 +608,9 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
 	// Perhaps 601 was only to indicate the subsampling positions, not the
 	// colorspace itself? Tested with a Lenovo X1 gen 3 as input.
 	YCbCrFormat input_ycbcr_format;
-	input_ycbcr_format.chroma_subsampling_x = 2;
+	input_ycbcr_format.chroma_subsampling_x = global_flags.ten_bit_input ? 1 : 2;
 	input_ycbcr_format.chroma_subsampling_y = 1;
+	input_ycbcr_format.num_levels = global_flags.ten_bit_input ? 1024 : 256;
 	input_ycbcr_format.cb_x_position = 0.0;
 	input_ycbcr_format.cr_x_position = 0.0;
 	input_ycbcr_format.cb_y_position = 0.5;
@@ -628,10 +634,12 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
 		num_inputs = 1;
 	}
 	for (unsigned i = 0; i < num_inputs; ++i) {
+		// When using 10-bit input, we're converting to interleaved through v210Converter.
+		YCbCrInputSplitting splitting = global_flags.ten_bit_input ? YCBCR_INPUT_INTERLEAVED : YCBCR_INPUT_SPLIT_Y_AND_CBCR;
 		if (override_bounce) {
-			inputs.push_back(new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, global_flags.width, global_flags.height, YCBCR_INPUT_SPLIT_Y_AND_CBCR));
+			inputs.push_back(new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, global_flags.width, global_flags.height, splitting));
 		} else {
-			inputs.push_back(new YCbCrInput(inout_format, input_ycbcr_format, global_flags.width, global_flags.height, YCBCR_INPUT_SPLIT_Y_AND_CBCR));
+			inputs.push_back(new YCbCrInput(inout_format, input_ycbcr_format, global_flags.width, global_flags.height, splitting));
 		}
 		chain->add_input(inputs.back());
 	}
@@ -680,8 +688,12 @@ void LiveInputWrapper::connect_signal(int signal_num)
 			userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
 		}
 
-		inputs[i]->set_texture_num(0, userdata->tex_y[frame.field_number]);
-		inputs[i]->set_texture_num(1, userdata->tex_cbcr[frame.field_number]);
+		if (global_flags.ten_bit_input) {
+			inputs[i]->set_texture_num(0, userdata->tex_444[frame.field_number]);
+		} else {
+			inputs[i]->set_texture_num(0, userdata->tex_y[frame.field_number]);
+			inputs[i]->set_texture_num(1, userdata->tex_cbcr[frame.field_number]);
+		}
 		inputs[i]->set_width(userdata->last_width[frame.field_number]);
 		inputs[i]->set_height(userdata->last_height[frame.field_number]);