X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage.cc;fp=src%2Flib%2Fimage.cc;h=d4ec6f99a6381070835b2fd54a875f414e5d7f87;hp=1fa55e24209ed099ba43bf03cda8693c13e57067;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hpb=884093edac5f63d26c02d411c73dfb52376ccf8f

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 1fa55e242..d4ec6f99a 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,6 +31,8 @@ extern "C" {
 #include "image.h"
 #include "exceptions.h"
 #include "scaler.h"
+#include "timer.h"
+#include "rect.h"
 
 #include "i18n.h"
 
@@ -38,9 +40,10 @@ using std::string;
 using std::min;
 using std::cout;
 using std::cerr;
+using std::list;
 using std::stringstream;
 using boost::shared_ptr;
-using libdcp::Size;
+using dcp::Size;
 
 int
 Image::line_factor (int n) const
@@ -84,7 +87,7 @@ Image::components () const
 
 /** Crop this image, scale it to `inter_size' and then place it in a black frame of `out_size' */
 shared_ptr<Image>
-Image::crop_scale_window (Crop crop, libdcp::Size inter_size, libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
+Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
 {
 	assert (scaler);
 	/* Empirical testing suggests that sws_scale() will crash if
@@ -100,13 +103,13 @@ Image::crop_scale_window (Crop crop, libdcp::Size inter_size, libdcp::Size out_s
 	out->make_black ();
 
 	/* Size of the image after any crop */
-	libdcp::Size const cropped_size = crop.apply (size ());
+	dcp::Size const cropped_size = crop.apply (size ());
 
 	/* Scale context for a scale from cropped_size to inter_size */
 	struct SwsContext* scale_context = sws_getContext (
-		cropped_size.width, cropped_size.height, pixel_format(),
-		inter_size.width, inter_size.height, out_format,
-		scaler->ffmpeg_id (), 0, 0, 0
+			cropped_size.width, cropped_size.height, pixel_format(),
+			inter_size.width, inter_size.height, out_format,
+			scaler->ffmpeg_id (), 0, 0, 0
 		);
 
 	if (!scale_context) {
@@ -140,7 +143,7 @@ Image::crop_scale_window (Crop crop, libdcp::Size inter_size, libdcp::Size out_s
 }
 
 shared_ptr<Image>
-Image::scale (libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
+Image::scale (dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
 {
 	assert (scaler);
 	/* Empirical testing suggests that sws_scale() will crash if
@@ -171,7 +174,7 @@ Image::scale (libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_fo
 shared_ptr<Image>
 Image::crop (Crop crop, bool aligned) const
 {
-	libdcp::Size cropped_size = crop.apply (size ());
+	dcp::Size cropped_size = crop.apply (size ());
 	shared_ptr<Image> out (new Image (pixel_format(), cropped_size, aligned));
 
 	for (int c = 0; c < components(); ++c) {
@@ -343,11 +346,31 @@ Image::make_black ()
 	}
 }
 
+void
+Image::make_transparent ()
+{
+	if (_pixel_format != PIX_FMT_RGBA) {
+		throw PixelFormatError ("make_transparent()", _pixel_format);
+	}
+
+	memset (data()[0], 0, lines(0) * stride()[0]);
+}
+
 void
 Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 {
-	/* Only implemented for RGBA onto RGB24 so far */
-	assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA);
+	int this_bpp = 0;
+	int other_bpp = 0;
+
+	if (_pixel_format == PIX_FMT_BGRA && other->pixel_format() == PIX_FMT_RGBA) {
+		this_bpp = 4;
+		other_bpp = 4;
+	} else if (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA) {
+		this_bpp = 3;
+		other_bpp = 4;
+	} else {
+		assert (false);
+	}
 
 	int start_tx = position.x;
 	int start_ox = 0;
@@ -366,15 +389,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 * 3;
+		uint8_t* tp = data()[0] + ty * stride()[0] + position.x * 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 += 3;
-			op += 4;
+			tp += this_bpp;
+			op += other_bpp;
 		}
 	}
 }
@@ -458,8 +481,8 @@ Image::bytes_per_pixel (int c) const
  *  @param p Pixel format.
  *  @param s Size in pixels.
  */
-Image::Image (AVPixelFormat p, libdcp::Size s, bool aligned)
-	: libdcp::Image (s)
+Image::Image (AVPixelFormat p, dcp::Size s, bool aligned)
+	: dcp::Image (s)
 	, _pixel_format (p)
 	, _aligned (aligned)
 {
@@ -496,7 +519,7 @@ Image::allocate ()
 }
 
 Image::Image (Image const & other)
-	: libdcp::Image (other)
+	: dcp::Image (other)
 	,  _pixel_format (other._pixel_format)
 	, _aligned (other._aligned)
 {
@@ -514,7 +537,7 @@ Image::Image (Image const & other)
 }
 
 Image::Image (AVFrame* frame)
-	: libdcp::Image (libdcp::Size (frame->width, frame->height))
+	: dcp::Image (dcp::Size (frame->width, frame->height))
 	, _pixel_format (static_cast<AVPixelFormat> (frame->format))
 	, _aligned (true)
 {
@@ -533,7 +556,7 @@ Image::Image (AVFrame* frame)
 }
 
 Image::Image (shared_ptr<const Image> other, bool aligned)
-	: libdcp::Image (other)
+	: dcp::Image (other)
 	, _pixel_format (other->_pixel_format)
 	, _aligned (aligned)
 {
@@ -566,7 +589,7 @@ Image::operator= (Image const & other)
 void
 Image::swap (Image & other)
 {
-	libdcp::Image::swap (other);
+	dcp::Image::swap (other);
 	
 	std::swap (_pixel_format, other._pixel_format);
 
@@ -609,7 +632,7 @@ Image::stride () const
 	return _stride;
 }
 
-libdcp::Size
+dcp::Size
 Image::size () const
 {
 	return _size;
@@ -621,6 +644,27 @@ Image::aligned () const
 	return _aligned;
 }
 
+PositionImage
+merge (list<PositionImage> images)
+{
+	if (images.empty ()) {
+		return PositionImage ();
+	}
+
+	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));
+	}
+
+	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);
+	}
+
+	return PositionImage (merged, all.position ());
+}
+
 string
 Image::digest () const
 {
@@ -641,4 +685,3 @@ Image::digest () const
 
 	return s.str ();
 }
-