X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=680c063f1a4d30ca9e364bbdbed615e7fafc9376;hb=4616b19fb5241a54c9d57f7a91bb975f41aed14b;hp=432cfbd54b9279e0b2631cc417b511066dc2ab2f;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 432cfbd54..680c063f1 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -32,6 +32,7 @@ extern "C" {
 #include "scaler.h"
 #include "timer.h"
 #include "rect.h"
+#include "md5_digester.h"
 
 #include "i18n.h"
 
@@ -40,6 +41,7 @@ using std::min;
 using std::cout;
 using std::cerr;
 using std::list;
+using std::stringstream;
 using boost::shared_ptr;
 using dcp::Size;
 
@@ -320,6 +322,7 @@ Image::make_black ()
 	case PIX_FMT_RGBA:
 	case PIX_FMT_ABGR:
 	case PIX_FMT_BGRA:
+	case PIX_FMT_RGB555LE:
 		memset (data()[0], 0, lines(0) * stride()[0]);
 		break;
 
@@ -357,16 +360,19 @@ Image::make_transparent ()
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
-	int this_bpp = 0;
-	int other_bpp = 0;
+	assert (other->pixel_format() == PIX_FMT_RGBA);
+	int const other_bpp = 4;
 
-	if (_pixel_format == PIX_FMT_BGRA && other->pixel_format() == PIX_FMT_RGBA) {
+	int this_bpp = 0;
+	switch (_pixel_format) {
+	case PIX_FMT_BGRA:
+	case PIX_FMT_RGBA:
 		this_bpp = 4;
-		other_bpp = 4;
-	} else if (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA) {
+		break;
+	case PIX_FMT_RGB24:
 		this_bpp = 3;
-		other_bpp = 4;
-	} else {
+		break;
+	default:
 		assert (false);
 	}
 
@@ -387,13 +393,15 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 	}
 
 	for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) {
-		uint8_t* tp = data()[0] + ty * stride()[0] + position.x * this_bpp;
+		uint8_t* tp = data()[0] + ty * stride()[0] + start_tx * this_bpp;
 		uint8_t* op = other->data()[0] + oy * other->stride()[0];
 		for (int tx = start_tx, ox = start_ox; tx < size().width && ox < other->size().width; ++tx, ++ox) {
 			float const alpha = float (op[3]) / 255;
-			tp[0] = (tp[0] * (1 - alpha)) + op[0] * alpha;
-			tp[1] = (tp[1] * (1 - alpha)) + op[1] * alpha;
-			tp[2] = (tp[2] * (1 - alpha)) + op[2] * alpha;
+			tp[0] = op[0] + (tp[0] * (1 - alpha));
+			tp[1] = op[1] + (tp[1] * (1 - alpha));
+			tp[2] = op[2] + (tp[2] * (1 - alpha));
+			tp[3] = op[3] + (tp[3] * (1 - alpha));
+			
 			tp += this_bpp;
 			op += other_bpp;
 		}
@@ -511,8 +519,13 @@ Image::allocate ()
 		   OS X crashes on this illegal read, though other operating systems don't
 		   seem to mind.  The nasty + 1 in this malloc makes sure there is always a byte
 		   for that instruction to read safely.
+
+		   Further to the above, valgrind is now telling me that ff_rgb24ToY_ssse3
+		   over-reads by more then _avx.  I can't follow the code to work out how much,
+		   so I'll just over-allocate by 32 bytes and have done with it.  Empirical
+		   testing suggests that it works.
 		*/
-		_data[i] = (uint8_t *) wrapped_av_malloc (_stride[i] * lines (i) + 1);
+		_data[i] = (uint8_t *) wrapped_av_malloc (_stride[i] * lines (i) + 32);
 	}
 }
 
@@ -649,6 +662,10 @@ merge (list<PositionImage> images)
 		return PositionImage ();
 	}
 
+	if (images.size() == 1) {
+		return images.front ();
+	}
+
 	dcpomatic::Rect<int> all (images.front().position, images.front().image->size().width, images.front().image->size().height);
 	for (list<PositionImage>::const_iterator i = images.begin(); i != images.end(); ++i) {
 		all.extend (dcpomatic::Rect<int> (i->position, i->image->size().width, i->image->size().height));
@@ -657,8 +674,20 @@ merge (list<PositionImage> images)
 	shared_ptr<Image> merged (new Image (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true));
 	merged->make_transparent ();
 	for (list<PositionImage>::const_iterator i = images.begin(); i != images.end(); ++i) {
-		merged->alpha_blend (i->image, i->position);
+		merged->alpha_blend (i->image, i->position - all.position());
 	}
 
 	return PositionImage (merged, all.position ());
 }
+
+string
+Image::digest () const
+{
+	MD5Digester digester;
+
+	for (int i = 0; i < components(); ++i) {
+		digester.add (data()[i], line_size()[i]);
+	}
+
+	return digester.get ();
+}