X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=1098bb87a8c94a8df56cf2ca0f3a7d40cd24f72c;hb=9da0bac018e0e7dcad0c1aafaa7f6be6d434da96;hp=ab655ebf83b378e7b1855f250787b558e498b7f8;hpb=cbd4450197a083bf58bda510e626f73ba583cb66;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index ab655ebf8..1098bb87a 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,7 +24,8 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "j2k_image_proxy.h"
-#include "caption_decoder.h"
+#include "text_decoder.h"
+#include "ffmpeg_image_proxy.h"
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
@@ -42,6 +43,7 @@
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_frame.h>
 #include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_image.h>
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -53,19 +55,20 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
+DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent> c, bool fast)
 	: DCP (c)
+	, Decoder (film)
 	, _decode_referenced (false)
 {
 	if (c->video) {
-		video.reset (new VideoDecoder (this, c, log));
+		video.reset (new VideoDecoder (this, c));
 	}
 	if (c->audio) {
-		audio.reset (new AudioDecoder (this, c->audio, log, fast));
+		audio.reset (new AudioDecoder (this, c->audio, fast));
 	}
-	BOOST_FOREACH (shared_ptr<CaptionContent> i, c->caption) {
+	BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
 		/* XXX: this time here should be the time of the first subtitle, not 0 */
-		caption.push_back (shared_ptr<CaptionDecoder> (new CaptionDecoder (this, i, log, ContentTime())));
+		text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, i, ContentTime())));
 	}
 
 	list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
@@ -105,25 +108,28 @@ DCPDecoder::pass ()
 		return true;
 	}
 
-	double const vfr = _dcp_content->active_video_frame_rate ();
+	double const vfr = _dcp_content->active_video_frame_rate (film());
 
 	/* Frame within the (played part of the) reel that is coming up next */
 	int64_t const frame = _next.frames_round (vfr);
 
-	/* We must emit captions first as when we emit the video for this frame
-	   it will expect already to have the captions.
+	shared_ptr<dcp::PictureAsset> picture_asset = (*_reel)->main_picture()->asset();
+	DCPOMATIC_ASSERT (picture_asset);
+
+	/* We must emit texts first as when we emit the video for this frame
+	   it will expect already to have the texts.
 	*/
-	pass_captions (_next);
+	pass_texts (_next, picture_asset->size());
 
 	if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
-		shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
 		int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
 		if (_mono_reader) {
 			video->emit (
+				film(),
 				shared_ptr<ImageProxy> (
 					new J2KImageProxy (
 						_mono_reader->get_frame (entry_point + frame),
-						asset->size(),
+						picture_asset->size(),
 						AV_PIX_FMT_XYZ12LE,
 						_forced_reduction
 						)
@@ -132,10 +138,11 @@ DCPDecoder::pass ()
 				);
 		} else {
 			video->emit (
+				film(),
 				shared_ptr<ImageProxy> (
 					new J2KImageProxy (
 						_stereo_reader->get_frame (entry_point + frame),
-						asset->size(),
+						picture_asset->size(),
 						dcp::EYE_LEFT,
 						AV_PIX_FMT_XYZ12LE,
 						_forced_reduction
@@ -145,10 +152,11 @@ DCPDecoder::pass ()
 				);
 
 			video->emit (
+				film(),
 				shared_ptr<ImageProxy> (
 					new J2KImageProxy (
 						_stereo_reader->get_frame (entry_point + frame),
-						asset->size(),
+						picture_asset->size(),
 						dcp::EYE_RIGHT,
 						AV_PIX_FMT_XYZ12LE,
 						_forced_reduction
@@ -175,7 +183,7 @@ DCPDecoder::pass ()
 			}
 		}
 
-		audio->emit (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
+		audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
 	}
 
 	_next += ContentTime::from_frames (1, vfr);
@@ -191,27 +199,36 @@ DCPDecoder::pass ()
 }
 
 void
-DCPDecoder::pass_captions (ContentTime next)
+DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
 {
-	list<shared_ptr<CaptionDecoder> >::const_iterator decoder = caption.begin ();
+	list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
 	if ((*_reel)->main_subtitle()) {
-		pass_captions (
-			next, (*_reel)->main_subtitle()->asset(), _dcp_content->reference_caption(CAPTION_OPEN), (*_reel)->main_subtitle()->entry_point(), *decoder
+		DCPOMATIC_ASSERT (decoder != text.end ());
+		pass_texts (
+			next,
+			(*_reel)->main_subtitle()->asset(),
+			_dcp_content->reference_text(TEXT_OPEN_SUBTITLE),
+			(*_reel)->main_subtitle()->entry_point(),
+			*decoder,
+			size
 			);
 		++decoder;
 	}
-	if ((*_reel)->closed_caption()) {
-		pass_captions (
-			next, (*_reel)->closed_caption()->asset(), _dcp_content->reference_caption(CAPTION_CLOSED), (*_reel)->closed_caption()->entry_point(), *decoder
+	BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
+		DCPOMATIC_ASSERT (decoder != text.end ());
+		pass_texts (
+			next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder, size
 			);
 		++decoder;
 	}
 }
 
 void
-DCPDecoder::pass_captions (ContentTime next, shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, shared_ptr<CaptionDecoder> decoder)
+DCPDecoder::pass_texts (
+	ContentTime next, shared_ptr<dcp::SubtitleAsset> asset, bool reference, int64_t entry_point, shared_ptr<TextDecoder> decoder, dcp::Size size
+	)
 {
-	double const vfr = _dcp_content->active_video_frame_rate ();
+	double const vfr = _dcp_content->active_video_frame_rate (film());
 	/* Frame within the (played part of the) reel that is coming up next */
 	int64_t const frame = next.frames_round (vfr);
 
@@ -222,21 +239,79 @@ DCPDecoder::pass_captions (ContentTime next, shared_ptr<dcp::SubtitleAsset> asse
 			true
 			);
 
+		list<dcp::SubtitleString> strings;
+
 		BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
 			shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
 			if (is) {
-				list<dcp::SubtitleString> s;
-				s.push_back (*is);
-				decoder->emit_plain (
+				if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
+					dcp::SubtitleString b = strings.back();
+					decoder->emit_plain (
+						ContentTimePeriod (
+							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
+							ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds())
+							),
+						strings
+						);
+					strings.clear ();
+				}
+
+				strings.push_back (*is);
+			}
+
+			shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage> (i);
+			if (ii) {
+				FFmpegImageProxy proxy (ii->png_image());
+				shared_ptr<Image> image = proxy.image().first;
+				/* set up rect with height and width */
+				dcpomatic::Rect<double> rect(0, 0, image->size().width / double(size.width), image->size().height / double(size.height));
+
+				/* add in position */
+
+				switch (ii->h_align()) {
+				case dcp::HALIGN_LEFT:
+					rect.x += ii->h_position();
+					break;
+				case dcp::HALIGN_CENTER:
+					rect.x += 0.5 + ii->h_position() - rect.width / 2;
+					break;
+				case dcp::HALIGN_RIGHT:
+					rect.x += 1 - ii->h_position() - rect.width;
+					break;
+				}
+
+				switch (ii->v_align()) {
+				case dcp::VALIGN_TOP:
+					rect.y += ii->v_position();
+					break;
+				case dcp::VALIGN_CENTER:
+					rect.y += 0.5 + ii->v_position() - rect.height / 2;
+					break;
+				case dcp::VALIGN_BOTTOM:
+					rect.y += 1 - ii->v_position() - rect.height;
+					break;
+				}
+
+				decoder->emit_bitmap (
 					ContentTimePeriod (
 						ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->in().as_seconds ()),
 						ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->out().as_seconds ())
 						),
-					s
+					image, rect
 					);
 			}
+		}
 
-			/* XXX: image subtitles */
+		if (!strings.empty()) {
+			dcp::SubtitleString b = strings.back();
+			decoder->emit_plain (
+				ContentTimePeriod (
+					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
+					ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds())
+					),
+				strings
+				);
+			strings.clear ();
 		}
 	}
 }
@@ -307,25 +382,25 @@ DCPDecoder::seek (ContentTime t, bool accurate)
 
 	/* Seek to pre-roll position */
 
-	while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-		ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+	while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()))) {
+		ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()));
 		pre -= rd;
 		t -= rd;
 		next_reel ();
 	}
 
-	/* Pass captions in the pre-roll */
+	/* Pass texts in the pre-roll */
 
-	double const vfr = _dcp_content->active_video_frame_rate ();
+	double const vfr = _dcp_content->active_video_frame_rate (film());
 	for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
-		pass_captions (pre);
+		pass_texts (pre, (*_reel)->main_picture()->asset()->size());
 		pre += ContentTime::from_frames (1, vfr);
 	}
 
 	/* Seek to correct position */
 
-	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()))) {
+		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film()));
 		next_reel ();
 	}