X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=5d9eaa3c596c88671d62dd81d4a22b9c29bee3d0;hp=56d470fb572e7764e0c78d02bf8d8a0e0a08f506;hb=758f632c42befae7f2b7af137554429fa544d4cb;hpb=f6c44598c9dad9ddd024c5f8f010d179a6d971fd

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 56d470f..5d9eaa3 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -13,10 +13,11 @@
 #include "gamma_compression_effect.h"
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
+#include "saturation_effect.h"
 #include "texture_enum.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
-	: width(width), height(height), finalized(false) {}
+	: width(width), height(height), use_srgb_texture_format(false), finalized(false) {}
 
 void EffectChain::add_input(const ImageFormat &format)
 {
@@ -33,21 +34,28 @@ void EffectChain::add_output(const ImageFormat &format)
 Effect *instantiate_effect(EffectId effect)
 {
 	switch (effect) {
-	case GAMMA_CONVERSION:
+	case EFFECT_GAMMA_EXPANSION:
 		return new GammaExpansionEffect();
-	case RGB_PRIMARIES_CONVERSION:
-		return new GammaExpansionEffect();
-	case LIFT_GAMMA_GAIN:
+	case EFFECT_GAMMA_COMPRESSION:
+		return new GammaCompressionEffect();
+	case EFFECT_LIFT_GAMMA_GAIN:
 		return new LiftGammaGainEffect();
+	case EFFECT_SATURATION:
+		return new SaturationEffect();
 	}
 	assert(false);
 }
 
 void EffectChain::normalize_to_linear_gamma()
 {
-	GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
-	gamma_conversion->set_int("source_curve", current_gamma_curve);
-	effects.push_back(gamma_conversion);
+	if (current_gamma_curve == GAMMA_sRGB) {
+		// TODO: check if the extension exists
+		use_srgb_texture_format = true;
+	} else {
+		GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
+		gamma_conversion->set_int("source_curve", current_gamma_curve);
+		effects.push_back(gamma_conversion);
+	}
 	current_gamma_curve = GAMMA_LINEAR;
 }
 
@@ -124,7 +132,13 @@ std::string replace_prefix(const std::string &text, const std::string &prefix)
 
 void EffectChain::finalize()
 {
-	// TODO: If we want a non-sRGB output color space, convert.
+	if (current_color_space != output_format.color_space) {
+		ColorSpaceConversionEffect *colorspace_conversion = new ColorSpaceConversionEffect();
+		colorspace_conversion->set_int("source_space", current_color_space);
+		colorspace_conversion->set_int("destination_space", output_format.color_space);
+		effects.push_back(colorspace_conversion);
+		current_color_space = output_format.color_space;
+	}
 
 	if (current_gamma_curve != output_format.gamma_curve) {
 		if (current_gamma_curve != GAMMA_LINEAR) {
@@ -180,20 +194,26 @@ void EffectChain::render_to_screen(unsigned char *src)
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
 
-	// TODO: use sRGB textures if applicable
+	GLenum internal_format = GL_RGBA8;
+	if (use_srgb_texture_format) {
+		internal_format = GL_SRGB8;
+	}
+
 	if (input_format.pixel_format == FORMAT_RGB) {
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, src);
+		glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, src);
 	} else if (input_format.pixel_format == FORMAT_RGBA) {
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, src);
+		glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, src);
 	} else {
 		assert(false);
 	}
 	check_error();
 	glUniform1i(glGetUniformLocation(glsl_program_num, "input_tex"), 0);
 
-	//for (unsigned i = 0; i < effects.size(); ++i) {
-	//	effects[i]->set_uniforms();
-	//}
+	for (unsigned i = 0; i < effects.size(); ++i) {
+		char effect_id[256];
+		sprintf(effect_id, "eff%d", i);
+		effects[i]->set_uniforms(glsl_program_num, effect_id);
+	}
 
 	glDisable(GL_BLEND);
 	check_error();