X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=padding_effect.cpp;h=00d475ac2fb23995780920569ee09203abb91177;hp=9d6e292996f33aca18062597de166766d90a9550;hb=5c97329dd35909847e2120b0b368b2723ffe5a44;hpb=eddc371976d7586176a74503ec9896159ececa43

diff --git a/padding_effect.cpp b/padding_effect.cpp
index 9d6e292..00d475a 100644
--- a/padding_effect.cpp
+++ b/padding_effect.cpp
@@ -1,6 +1,7 @@
-#include <math.h>
 #include <GL/glew.h>
+#include <assert.h>
 
+#include "effect_util.h"
 #include "padding_effect.h"
 #include "util.h"
 
@@ -46,14 +47,14 @@ void PaddingEffect::set_gl_state(GLuint glsl_program_num, const std::string &pre
 	// than losing a pixel in the common cases of integer shift.
 	// Thus the 1e-3 fudge factors.
 	float texcoord_min[2] = {
-		(0.5f - 1e-3) / input_width,
-		(0.5f - 1e-3) / input_height
+		float((0.5f - 1e-3) / input_width),
+		float((0.5f - 1e-3) / input_height)
 	};
 	set_uniform_vec2(glsl_program_num, prefix, "texcoord_min", texcoord_min);
 
 	float texcoord_max[2] = {
-		1.0f - (0.5f - 1e-3) / input_width,
-		1.0f - (0.5f - 1e-3) / input_height
+		float(1.0f - (0.5f - 1e-3) / input_width),
+		float(1.0f - (0.5f - 1e-3) / input_height)
 	};
 	set_uniform_vec2(glsl_program_num, prefix, "texcoord_max", texcoord_max);
 }
@@ -63,12 +64,16 @@ void PaddingEffect::set_gl_state(GLuint glsl_program_num, const std::string &pre
 // differently in different modes.
 
 // 0.0 and 1.0 are interpreted the same, no matter the gamma ramp.
-// Alpha is not affected by gamma.
+// Alpha is not affected by gamma per se, but the combination of
+// premultiplied alpha and non-linear gamma curve does not make sense,
+// so if could possibly be converting blank alpha to non-blank
+// (ie., premultiplied), we need our output to be in linear light.
 bool PaddingEffect::needs_linear_light() const
 {
 	if ((border_color.r == 0.0 || border_color.r == 1.0) &&
 	    (border_color.g == 0.0 || border_color.g == 1.0) &&
-	    (border_color.b == 0.0 || border_color.b == 1.0)) {
+	    (border_color.b == 0.0 || border_color.b == 1.0) &&
+	    border_color.a == 1.0) {
 		return false;
 	}
 	return true;
@@ -89,20 +94,32 @@ bool PaddingEffect::needs_srgb_primaries() const
 	return true;
 }
 
-// If the border color is black, it doesn't matter if we're pre- or postmultiplied
-// (or even blank, as a hack). Otherwise, it does.
 Effect::AlphaHandling PaddingEffect::alpha_handling() const
 {
-	if (border_color.r == 0.0 && border_color.g == 0.0 && border_color.b == 0.0) {
+	// If the border color is black, it doesn't matter if we're pre- or postmultiplied.
+	// Note that for non-solid black (i.e. alpha < 1.0), we're equally fine with
+	// pre- and postmultiplied, but later effects might change this status
+	// (consider e.g. blur), so setting DONT_CARE_ALPHA_TYPE is inappropriate,
+	// as it propagate blank alpha through this effect.
+	if (border_color.r == 0.0 && border_color.g == 0.0 && border_color.b == 0.0 && border_color.a == 1.0) {
 		return DONT_CARE_ALPHA_TYPE;
 	}
-	return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED;
+
+	// If the border color is solid, we preserve blank alpha, as we never output any
+	// new non-solid pixels.
+	if (border_color.a == 1.0) {
+		return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK;
+	}
+
+	// Otherwise, we're going to output our border color in premultiplied alpha,
+	// so the other pixels better be premultiplied as well.
+	return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
 }
 	
-void PaddingEffect::get_output_size(unsigned *width, unsigned *height) const
+void PaddingEffect::get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const
 {
-	*width = output_width;
-	*height = output_height;
+	*virtual_width = *width = output_width;
+	*virtual_height = *height = output_height;
 }
 	
 void PaddingEffect::inform_input_size(unsigned input_num, unsigned width, unsigned height)