Support PNG subs in DCPSubtitleDecoder (#1479).

[dcpomatic.git] / src / lib / dcp_subtitle_decoder.cc

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 07e879ddfad8ac0d685980bba67c95cc29783643..5d5e1f6311019dc5269b3f7f29856629fa65d6ac 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -29,7 +29,8 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
+DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
+       : Decoder (film)
 {
        shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
        _subtitles = c->subtitles ();
@@ -43,9 +44,9 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
 }
 
 void
-DCPSubtitleDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool accurate)
+DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-       Decoder::seek (film, time, accurate);
+       Decoder::seek (time, accurate);
 
        _next = _subtitles.begin ();
        list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
@@ -55,7 +56,7 @@ DCPSubtitleDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool ac
 }
 
 bool
-DCPSubtitleDecoder::pass (shared_ptr<const Film>)
+DCPSubtitleDecoder::pass ()
 {
        if (_next == _subtitles.end ()) {
                return true;
@@ -63,12 +64,13 @@ DCPSubtitleDecoder::pass (shared_ptr<const Film>)
 
        /* Gather all subtitles with the same time period that are next
           on the list.  We must emit all subtitles for the same time
-          period with the same plain_text() call otherwise the
+          period with the same emit*() call otherwise the
           TextDecoder will assume there is nothing else at the
-          time of emit the first.
+          time of emitting the first.
        */
 
        list<dcp::SubtitleString> s;
+       list<dcp::SubtitleImage> i;
        ContentTimePeriod const p = content_time_period (*_next);
 
        while (_next != _subtitles.end () && content_time_period (*_next) == p) {
@@ -78,7 +80,15 @@ DCPSubtitleDecoder::pass (shared_ptr<const Film>)
                        ++_next;
                }
 
-               /* XXX: image subtitles */
+               /* XXX: perhaps these image subs should also be collected together like the string ones are;
+                  this would need to be done both here and in DCPDecoder.
+               */
+
+               shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+               if (ni) {
+                       emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+                       ++_next;
+               }
        }
 
        only_text()->emit_plain (p, s);