X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Foverlayframe.C;h=5176d6da7ee1963b412198f7aea72b304d57023e;hb=5249bc8407920effc00e13940d3d4ccea0dd5d9f;hp=c660dbbb745539b86ab930dad1a9bedc76cf9e07;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/overlayframe.C b/cinelerra-5.1/cinelerra/overlayframe.C
index c660dbbb..5176d6da 100644
--- a/cinelerra-5.1/cinelerra/overlayframe.C
+++ b/cinelerra-5.1/cinelerra/overlayframe.C
@@ -224,17 +224,61 @@ int OverlayFrame::overlay(VFrame *output, VFrame *input,
 		isnan(out_x1) || isnan(out_x2) ||
 		isnan(out_y1) || isnan(out_y2)) return 1;
 
-	if(in_x1 < 0) in_x1 = 0;
-	if(in_y1 < 0) in_y1 = 0;
-	if(in_x2 > input->get_w()) in_x2 = input->get_w();
-	if(in_y2 > input->get_h()) in_y2 = input->get_h();
-	if(out_x1 < 0) out_x1 = 0;
-	if(out_y1 < 0) out_y1 = 0;
-	if(out_x2 > output->get_w()) out_x2 = output->get_w();
-	if(out_y2 > output->get_h()) out_y2 = output->get_h();
+	if( in_x2 <= in_x1 || in_y2 <= in_y1 ) return 1;
+	if( out_x2 <= out_x1 || out_y2 <= out_y1 ) return 1;
 
 	float xscale = (out_x2 - out_x1) / (in_x2 - in_x1);
 	float yscale = (out_y2 - out_y1) / (in_y2 - in_y1);
+	int in_w = input->get_w(), in_h = input->get_h();
+	int out_w = output->get_w(), out_h = output->get_h();
+
+	if( in_x1 < 0 ) {
+		out_x1 -= in_x1 * xscale;
+		in_x1 = 0;
+	}
+	if( in_x2 > in_w ) {
+		out_x2 -= (in_x2 - in_w) * xscale;
+		in_x2 = in_w;
+	}
+	if( in_y1 < 0 ) {
+		out_y1 -= in_y1 * yscale;
+		in_y1 = 0;
+	}
+	if( in_y2 > in_h ) {
+		out_y2 -= (in_y2 - in_h) * yscale;
+		in_y2 = in_h;
+	}
+
+	if( out_x1 < 0 ) {
+		in_x1 -= out_x1 / xscale;
+		out_x1 = 0;
+	}
+	if( out_x2 > out_w ) {
+		in_x2 -= (out_x2 - out_w) / xscale;
+		out_x2 = out_w;
+	}
+	if( out_y1 < 0 ) {
+		in_y1 -= out_y1 / yscale;
+		out_y1 = 0;
+	}
+	if( out_y2 > out_h ) {
+		in_y2 -= (out_y2 - out_h) / yscale;
+		out_y2 = out_h;
+	}
+
+	if( in_x1 < 0) in_x1 = 0;
+	if( in_y1 < 0) in_y1 = 0;
+	if( in_x2 > in_w ) in_x2 = in_w;
+	if( in_y2 > in_h ) in_y2 = in_h;
+	if( out_x1 < 0) out_x1 = 0;
+	if( out_y1 < 0) out_y1 = 0;
+	if( out_x2 > out_w ) out_x2 = out_w;
+	if( out_y2 > out_h ) out_y2 = out_h;
+
+	if( in_x2 <= in_x1 || in_y2 <= in_y1 ) return 1;
+	if( out_x2 <= out_x1 || out_y2 <= out_y1 ) return 1;
+	xscale = (out_x2 - out_x1) / (in_x2 - in_x1);
+	yscale = (out_y2 - out_y1) / (in_y2 - in_y1);
 
 	/* don't interpolate integer translations, or scale no-ops */
 	if(xscale == 1. && yscale == 1. &&
@@ -361,8 +405,8 @@ int OverlayFrame::overlay(VFrame *output, VFrame *input,
 	return 0;
 }
 
-// NORMAL	[Sa * Sa + Da * (1 - Sa), Sc * Sa + Dc * (1 - Sa)])
-#define ALPHA_NORMAL(mx, Sa, Da) ((Sa * Sa + Da * (mx - Sa)) / mx)
+// NORMAL	[Sa + Da * (1 - Sa), Sc * Sa + Dc * (1 - Sa)])
+#define ALPHA_NORMAL(mx, Sa, Da) (Sa + (Da * (mx - Sa)) / mx)
 #define COLOR_NORMAL(mx, Sc, Sa, Dc, Da) ((Sc * Sa + Dc * (mx - Sa)) / mx)
 #define CHROMA_NORMAL COLOR_NORMAL
 
@@ -485,7 +529,7 @@ ZTYP(float);	ZTYP(double);
 
 #define ALPHA3_BLEND(FN, typ, inp, out, mx, ofs, rnd) \
   typ inp0 = (typ)inp[0], inp1 = (typ)inp[1] - ofs; \
-  typ inp2 = (typ)inp[2] - ofs, inp3 = fade * mx + rnd; \
+  typ inp2 = (typ)inp[2] - ofs, inp3 = mx; \
   typ out0 = (typ)out[0], out1 = (typ)out[1] - ofs; \
   typ out2 = (typ)out[2] - ofs, out3 = mx; \
   r = COLOR_##FN(mx, inp0, inp3, out0, out3); \
@@ -500,7 +544,7 @@ ZTYP(float);	ZTYP(double);
 
 #define ALPHA4_BLEND(FN, typ, inp, out, mx, ofs, rnd) \
   typ inp0 = (typ)inp[0], inp1 = (typ)inp[1] - ofs; \
-  typ inp2 = (typ)inp[2] - ofs, inp3 = (typ)inp[3] * fade + rnd; \
+  typ inp2 = (typ)inp[2] - ofs, inp3 = inp[3]; \
   typ out0 = (typ)out[0], out1 = (typ)out[1] - ofs; \
   typ out2 = (typ)out[2] - ofs, out3 = out[3]; \
   r = COLOR_##FN(mx, inp0, inp3, out0, out3); \
@@ -544,7 +588,7 @@ ZTYP(float);	ZTYP(double);
   out[3] = aclip(a, mx)
 
 #define XBLEND(FN, temp_type, type, max, components, chroma_offset, round) { \
-	temp_type opcty = alpha * max + round, trnsp = max - opcty; \
+	temp_type opcty = fade * max + round, trnsp = max - opcty; \
 	type** output_rows = (type**)output->get_rows(); \
 	type** input_rows = (type**)input->get_rows(); \
 	ix *= components;  ox *= components; \
@@ -608,8 +652,7 @@ void DirectUnit::process_package(LoadPackage *package)
 	VFrame *output = engine->output;
 	VFrame *input = engine->input;
 	int mode = engine->mode;
-	float fade = engine->alpha;
-	float alpha =
+	float fade =
 		BC_CModels::has_alpha(input->get_color_model()) &&
 		mode == TRANSFER_REPLACE ? 1.f : engine->alpha;
 
@@ -690,7 +733,7 @@ LoadPackage* DirectEngine::new_package()
 /* Nearest Neighbor scale / translate / blend ********************/
 
 #define XBLEND_3NN(FN, temp_type, type, max, components, chroma_offset, round) { \
-	temp_type opcty = alpha * max + round, trnsp = max - opcty; \
+	temp_type opcty = fade * max + round, trnsp = max - opcty; \
 	type** output_rows = (type**)output->get_rows(); \
 	type** input_rows = (type**)input->get_rows(); \
 	ox *= components; \
@@ -753,8 +796,7 @@ void NNUnit::process_package(LoadPackage *package)
 	VFrame *output = engine->output;
 	VFrame *input = engine->input;
 	int mode = engine->mode;
-	float fade = engine->alpha;
-	float alpha =
+	float fade =
 		BC_CModels::has_alpha(input->get_color_model()) &&
 		mode == TRANSFER_REPLACE ? 1.f : engine->alpha;
 
@@ -909,7 +951,7 @@ LoadPackage* NNEngine::new_package()
 
 #define XSAMPLE(FN, temp_type, type, max, components, chroma_offset, round) { \
 	float temp[oh*components]; \
-	temp_type opcty = alpha * max + round, trnsp = max - opcty; \
+	temp_type opcty = fade * max + round, trnsp = max - opcty; \
 	type **output_rows = (type**)voutput->get_rows() + o1i; \
 	type **input_rows = (type**)vinput->get_rows(); \
  \
@@ -1027,8 +1069,7 @@ void SampleUnit::process_package(LoadPackage *package)
 	VFrame *voutput = engine->output;
 	VFrame *vinput = engine->input;
 	int mode = engine->mode;
-	float fade = engine->alpha;
-	float alpha =
+	float fade =
 		BC_CModels::has_alpha(vinput->get_color_model()) &&
 		mode == TRANSFER_REPLACE ? 1.f : engine->alpha;