X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle.cc;h=5c2a0d0b5f31d65efacf76f4194a812c104bff3f;hb=a991c734ebfedb5456cec827d5eaf2583fdbb9a1;hp=282a2cde1a68b9e494af6fcc005d3f88b8f7b4d2;hpb=bd8fa9a370f1739952c83107352baa08c79d095e;p=dcpomatic.git

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 282a2cde1..5c2a0d0b5 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -25,36 +25,40 @@
 #include "image.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace boost;
+using libdcp::Size;
 
 /** Construct a TimedSubtitle.  This is a subtitle image, position,
  *  and a range of time over which it should be shown.
  *  @param sub AVSubtitle to read.
- *  @param c Fractional seconds that should be subtracted from the AVSubtitle's PTS.
  */
-TimedSubtitle::TimedSubtitle (AVSubtitle const & sub, double c)
+TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
 {
-	assert (sub.rects > 0);
+	assert (sub.num_rects > 0);
 	
-	/* subtitle PTS in seconds */
-	double const packet_time = ((sub.pts / AV_TIME_BASE) + float (sub.pts % AV_TIME_BASE) / 1e6) - c;
+	/* Subtitle PTS in seconds (within the source, not taking into account any of the
+	   source that we may have chopped off for the DCP)
+	*/
+	double const packet_time = static_cast<double> (sub.pts) / AV_TIME_BASE;
 	
 	/* hence start time for this sub */
 	_from = packet_time + (double (sub.start_display_time) / 1e3);
 	_to = packet_time + (double (sub.end_display_time) / 1e3);
 
 	if (sub.num_rects > 1) {
-		throw DecodeError ("multi-part subtitles not yet supported");
+		throw DecodeError (_("multi-part subtitles not yet supported"));
 	}
 
 	AVSubtitleRect const * rect = sub.rects[0];
 
 	if (rect->type != SUBTITLE_BITMAP) {
-		throw DecodeError ("non-bitmap subtitles not yet supported");
+		throw DecodeError (_("non-bitmap subtitles not yet supported"));
 	}
 	
-	shared_ptr<Image> image (new AlignedImage (PIX_FMT_RGBA, Size (rect->w, rect->h)));
+	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true));
 
 	/* Start of the first line in the subtitle */
 	uint8_t* sub_p = rect->pict.data[0];
@@ -76,7 +80,7 @@ TimedSubtitle::TimedSubtitle (AVSubtitle const & sub, double c)
 	_subtitle.reset (new Subtitle (Position (rect->x, rect->y), image));
 }	
 
-/** @param t Time in seconds from the start of the film */
+/** @param t Time in seconds from the start of the source */
 bool
 TimedSubtitle::displayed_at (double t) const
 {
@@ -104,13 +108,13 @@ Subtitle::Subtitle (Position p, shared_ptr<Image> i)
  *  in the coordinate space of the source.
  *  @param subtitle_scale scaling factor to apply to the subtitle image.
  */
-Rect
+dvdomatic::Rect
 subtitle_transformed_area (
 	float target_x_scale, float target_y_scale,
-	Rect sub_area, int subtitle_offset, float subtitle_scale
+	dvdomatic::Rect sub_area, int subtitle_offset, float subtitle_scale
 	)
 {
-	Rect tx;
+	dvdomatic::Rect tx;
 
 	sub_area.y += subtitle_offset;
 
@@ -132,15 +136,15 @@ subtitle_transformed_area (
 	 * Combining these two translations gives these expressions.
 	 */
 	
-	tx.x = target_x_scale * (sub_area.x + (sub_area.width * (1 - subtitle_scale) / 2));
-	tx.y = target_y_scale * (sub_area.y + (sub_area.height * (1 - subtitle_scale) / 2));
+	tx.x = rint (target_x_scale * (sub_area.x + (sub_area.width * (1 - subtitle_scale) / 2)));
+	tx.y = rint (target_y_scale * (sub_area.y + (sub_area.height * (1 - subtitle_scale) / 2)));
 
 	return tx;
 }
 
-/** @return area that this subtitle take up, in the original uncropped source's coordinate space */
-Rect
+/** @return area that this subtitle takes up, in the original uncropped source's coordinate space */
+dvdomatic::Rect
 Subtitle::area () const
 {
-	return Rect (_position.x, _position.y, _image->size().width, _image->size().height);
+	return dvdomatic::Rect (_position.x, _position.y, _image->size().width, _image->size().height);
 }