Fix truncated log timestamps in at least some cases.

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 3d971fd4b4fe8516ec43d5b7111b9f095b6176be..2f8b8a5f36f4bccaa64543861cd58881f9c47421 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.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,13 +17,20 @@
 
 */
 
-#include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
 #include "subrip_content.h"
+#include <dcp/subtitle_string.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::vector;
+using std::string;
+using std::cout;
+using std::max;
 using boost::shared_ptr;
+using boost::optional;
+using boost::dynamic_pointer_cast;
 
 SubRipDecoder::SubRipDecoder (shared_ptr<const SubRipContent> content)
        : SubtitleDecoder (content)
@@ -37,58 +44,98 @@ void
 SubRipDecoder::seek (ContentTime time, bool accurate)
 {
        SubtitleDecoder::seek (time, accurate);
-       
+
        _next = 0;
-       list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin();
-       while (i != _subtitles[_next].pieces.end() && _subtitles[_next].period.from < time) {
-               ++i;
+       while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
+               ++_next;
        }
-       
 }
 
 bool
-SubRipDecoder::pass ()
+SubRipDecoder::pass (PassReason, bool)
 {
        if (_next >= _subtitles.size ()) {
                return true;
        }
-       
+
+       /* XXX: we are ignoring positioning specified in the file */
+
+       shared_ptr<const SubRipContent> content = dynamic_pointer_cast<const SubRipContent> (_subtitle_content);
+       DCPOMATIC_ASSERT (content);
+
        list<dcp::SubtitleString> out;
-       for (list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin(); i != _subtitles[_next].pieces.end(); ++i) {
-               out.push_back (
-                       dcp::SubtitleString (
-                               "Arial",
-                               i->italic,
-                               dcp::Color (255, 255, 255),
-                               72,
-                               dcp::Time (rint (_subtitles[_next].period.from.seconds() * 250)),
-                               dcp::Time (rint (_subtitles[_next].period.to.seconds() * 250)),
-                               0.9,
-                               dcp::BOTTOM,
-                               i->text,
-                               dcp::NONE,
-                               dcp::Color (255, 255, 255),
-                               0,
-                               0
-                               )
-                       );
+
+       /* Highest line index in this subtitle */
+       int highest = 0;
+       BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
+               DCPOMATIC_ASSERT (i.vertical_position.reference && i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
+               DCPOMATIC_ASSERT (i.vertical_position.line);
+               highest = max (highest, i.vertical_position.line.get());
+       }
+
+       BOOST_FOREACH (sub::Line i, _subtitles[_next].lines) {
+               BOOST_FOREACH (sub::Block j, i.blocks) {
+                       out.push_back (
+                               dcp::SubtitleString (
+                                       SubRipContent::font_id,
+                                       j.italic,
+                                       /* force the colour to whatever is configured */
+                                       content->colour(),
+                                       j.font_size.points (72 * 11),
+                                       1.0,
+                                       dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
+                                       dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
+                                       0,
+                                       dcp::HALIGN_CENTER,
+                                       /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
+                                          of the screen a bit to a pleasing degree.
+                                       */
+                                       1.015 - ((1 + highest - i.vertical_position.line.get()) * 1.5 / 22),
+                                       dcp::VALIGN_TOP,
+                                       j.text,
+                                       content->outline() ? dcp::BORDER : dcp::NONE,
+                                       content->outline_colour(),
+                                       dcp::Time (0, 1000),
+                                       dcp::Time (0, 1000)
+                                       )
+                               );
+               }
        }
 
-       text_subtitle (out);
-       _next++;
+       text_subtitle (content_time_period (_subtitles[_next]), out);
+
+       ++_next;
        return false;
 }
 
-bool
-SubRipDecoder::has_subtitle_during (ContentTimePeriod p) const
+list<ContentTimePeriod>
+SubRipDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 {
        /* XXX: inefficient */
 
-       for (vector<SubRipSubtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-               if (p.overlaps (i->period)) {
-                       return true;
+       list<ContentTimePeriod> d;
+
+       for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+               ContentTimePeriod t = content_time_period (*i);
+               if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
+                       d.push_back (t);
                }
        }
 
-       return false;
+       return d;
+}
+
+ContentTimePeriod
+SubRipDecoder::content_time_period (sub::Subtitle s) const
+{
+       return ContentTimePeriod (
+               ContentTime::from_seconds (s.from.all_as_seconds()),
+               ContentTime::from_seconds (s.to.all_as_seconds())
+               );
 }