X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Frender_subtitles.cc;h=53f71328302c7d6dcfc193c8b905eb08010796d7;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=5364b8dfe3eeb9a3e0f0c1655c2b1ff4a425ca3a;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index 5364b8dfe..53f713283 100644
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -17,11 +17,12 @@
 
 */
 
-#include <cairomm/cairomm.h>
-#include <pangomm.h>
 #include "render_subtitles.h"
 #include "types.h"
 #include "image.h"
+#include <cairomm/cairomm.h>
+#include <pangomm.h>
+#include <boost/foreach.hpp>
 
 using std::list;
 using std::cout;
@@ -32,43 +33,36 @@ using std::pair;
 using boost::shared_ptr;
 using boost::optional;
 
-static int
-calculate_position (dcp::VAlign v_align, double v_position, int target_height, int offset)
-{
-	switch (v_align) {
-	case dcp::TOP:
-		return (v_position / 100) * target_height - offset;
-	case dcp::CENTER:
-		return (0.5 + v_position / 100) * target_height - offset;
-	case dcp::BOTTOM:
-		return (1.0 - v_position / 100) * target_height - offset;
-	}
-
-	return 0;
-}
-
-PositionImage
-render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
+static PositionImage
+render_subtitle (dcp::SubtitleString const & subtitle, dcp::Size target)
 {
-	if (subtitles.empty ()) {
-		return PositionImage ();
+	/* Calculate x and y scale factors.  These are only used to stretch
+	   the font away from its normal aspect ratio.
+	*/
+	float xscale = 1;
+	float yscale = 1;
+	if (fabs (subtitle.aspect_adjust() - 1.0) > dcp::ASPECT_ADJUST_EPSILON) {
+		if (subtitle.aspect_adjust() < 1) {
+			xscale = max (0.25f, subtitle.aspect_adjust ());
+			yscale = 1;
+		} else {
+			xscale = 1;
+			yscale = 1 / min (4.0f, subtitle.aspect_adjust ());
+		}
 	}
 
-	/* Estimate height that the subtitle image needs to be */
-	optional<int> top;
-	optional<int> bottom;
-	for (list<dcp::SubtitleString>::const_iterator i = subtitles.begin(); i != subtitles.end(); ++i) {
-		int const b = calculate_position (i->v_align(), i->v_position(), target.height, 0);
-		int const t = b - i->size() * target.height / (11 * 72);
+	/* Make an empty bitmap as wide as target and at
+	   least tall enough for this subtitle.
+	*/
 
-		top = min (top.get_value_or (t), t);
-		bottom = max (bottom.get_value_or (b), b);
-	}
+	/* Basic guess on height... */
+	int height = subtitle.size() * target.height / (11 * 72);
+	/* ...scaled... */
+	height *= yscale;
+	/* ...and add a bit more for luck */
+	height += target.height / 11;
 
-	top = top.get() - 32;
-	bottom = bottom.get() + 32;
-
-	shared_ptr<Image> image (new Image (PIX_FMT_RGBA, dcp::Size (target.width, bottom.get() - top.get ()), false));
+	shared_ptr<Image> image (new Image (PIX_FMT_RGBA, dcp::Size (target.width, height), false));
 	image->make_black ();
 
 	Cairo::RefPtr<Cairo::ImageSurface> surface = Cairo::ImageSurface::create (
@@ -78,75 +72,103 @@ render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
 		image->size().height,
 		Cairo::ImageSurface::format_stride_for_width (Cairo::FORMAT_ARGB32, image->size().width)
 		);
-	
+
 	Cairo::RefPtr<Cairo::Context> context = Cairo::Context::create (surface);
 	Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (context);
 
-	layout->set_width (image->size().width * PANGO_SCALE);
-	layout->set_alignment (Pango::ALIGN_CENTER);
+	layout->set_alignment (Pango::ALIGN_LEFT);
 
 	context->set_line_width (1);
 
-	for (list<dcp::SubtitleString>::const_iterator i = subtitles.begin(); i != subtitles.end(); ++i) {
-		string f = i->font ();
-		if (f.empty ()) {
-			f = "Arial";
-		}
-		Pango::FontDescription font (f);
-		font.set_absolute_size (i->size_in_pixels (target.height) * PANGO_SCALE);
-		if (i->italic ()) {
-			font.set_style (Pango::STYLE_ITALIC);
-		}
-		layout->set_font_description (font);
-		layout->set_text (i->text ());
-
-		/* Compute fade factor */
-		/* XXX */
-		float fade_factor = 1;
-#if 0		
-		dcp::Time now (time * 1000 / (4 * TIME_HZ));
-		dcp::Time end_fade_up = i->in() + i->fade_up_time ();
-		dcp::Time start_fade_down = i->out() - i->fade_down_time ();
-		if (now < end_fade_up) {
-			fade_factor = (now - i->in()) / i->fade_up_time();
-		} else if (now > start_fade_down) {
-			fade_factor = 1.0 - ((now - start_fade_down) / i->fade_down_time ());
-		}
-#endif		
-
-		layout->update_from_cairo_context (context);
-		
-		/* Work out position */
-
-		int const x = 0;
-		int const y = calculate_position (i->v_align (), i->v_position (), target.height, (layout->get_baseline() / PANGO_SCALE) + top.get ());
-
-		if (i->effect() == dcp::SHADOW) {
-			/* Drop-shadow effect */
-			dcp::Color const ec = i->effect_color ();
-			context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
-			context->move_to (x + 4, y + 4);
-			layout->add_to_cairo_context (context);
-			context->fill ();
-		}
+	/* Render the subtitle at the top left-hand corner of image */
 
-		/* The actual subtitle */
-		context->move_to (x, y);
-		dcp::Color const c = i->color ();
-		context->set_source_rgba (float(c.r) / 255, float(c.g) / 255, float(c.b) / 255, fade_factor);
+	Pango::FontDescription font (subtitle.font().get_value_or ("Arial"));
+	font.set_absolute_size (subtitle.size_in_pixels (target.height) * PANGO_SCALE);
+	if (subtitle.italic ()) {
+		font.set_style (Pango::STYLE_ITALIC);
+	}
+	layout->set_font_description (font);
+	layout->set_text (subtitle.text ());
+
+	/* Compute fade factor */
+	/* XXX */
+	float fade_factor = 1;
+
+	layout->update_from_cairo_context (context);
+
+	context->scale (xscale, yscale);
+
+	if (subtitle.effect() == dcp::SHADOW) {
+		/* Drop-shadow effect */
+		dcp::Colour const ec = subtitle.effect_colour ();
+		context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
+		context->move_to (4, 4);
 		layout->add_to_cairo_context (context);
 		context->fill ();
+	}
 
-		if (i->effect() == dcp::BORDER) {
-			/* Border effect */
-			context->move_to (x, y);
-			dcp::Color ec = i->effect_color ();
-			context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
-			layout->add_to_cairo_context (context);
-			context->stroke ();
-		}
+	/* The actual subtitle */
+
+	dcp::Colour const c = subtitle.colour ();
+	context->set_source_rgba (float(c.r) / 255, float(c.g) / 255, float(c.b) / 255, fade_factor);
+	context->move_to (0, 0);
+	layout->add_to_cairo_context (context);
+	context->fill ();
+
+	if (subtitle.effect() == dcp::BORDER) {
+		/* Border effect */
+		dcp::Colour ec = subtitle.effect_colour ();
+		context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
+		context->move_to (0, 0);
+		layout->add_to_cairo_context (context);
+		context->stroke ();
+	}
+
+	int layout_width;
+	int layout_height;
+	layout->get_size (layout_width, layout_height);
+
+	int x = 0;
+	switch (subtitle.h_align ()) {
+	case dcp::HALIGN_LEFT:
+		/* h_position is distance between left of frame and left of subtitle */
+		x = subtitle.h_position() * target.width;
+		break;
+	case dcp::HALIGN_CENTER:
+		/* h_position is distance between centre of frame and centre of subtitle */
+		x = (0.5 + subtitle.h_position()) * target.width - layout_width / (PANGO_SCALE * 2);
+		break;
+	case dcp::HALIGN_RIGHT:
+		/* h_position is distance between right of frame and right of subtitle */
+		x = (1.0 - subtitle.h_position()) * target.width - layout_width / PANGO_SCALE;
+		break;
+	}
+
+	int y = 0;
+	switch (subtitle.v_align ()) {
+	case dcp::VALIGN_TOP:
+		/* v_position is distance between top of frame and top of subtitle */
+		y = subtitle.v_position() * target.height;
+		break;
+	case dcp::VALIGN_CENTER:
+		/* v_position is distance between centre of frame and centre of subtitle */
+		y = (0.5 + subtitle.v_position()) * target.height - layout_height / (PANGO_SCALE * 2);
+		break;
+	case dcp::VALIGN_BOTTOM:
+		/* v_position is distance between bottom of frame and bottom of subtitle */
+		y = (1.0 - subtitle.v_position()) * target.height - layout_height / PANGO_SCALE;
+		break;
 	}
 
-	return PositionImage (image, Position<int> (0, top.get ()));
+	return PositionImage (image, Position<int> (x, y));
 }
 
+list<PositionImage>
+render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
+{
+	list<PositionImage> images;
+	BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
+		images.push_back (render_subtitle (i, target));
+	}
+	return images;
+}