Move position variables into the video/audio/subtitle decoder classes.

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

diff --git a/src/lib/text_subtitle_decoder.cc b/src/lib/text_subtitle_decoder.cc
index 94604cd714aae108dfd297ce6ed3a96ba5fd78e9..1576f50a19ddbe05c49ddb0c1681333ba377f40b 100644 (file)
--- a/src/lib/text_subtitle_decoder.cc
+++ b/src/lib/text_subtitle_decoder.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -34,17 +35,23 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 
 TextSubtitleDecoder::TextSubtitleDecoder (shared_ptr<const TextSubtitleContent> content)
-       : SubtitleDecoder (content->subtitle)
-       , TextSubtitle (content)
+       : TextSubtitle (content)
        , _next (0)
 {
-
+       subtitle.reset (
+               new SubtitleDecoder (
+                       this,
+                       content->subtitle,
+                       bind (&TextSubtitleDecoder::image_subtitles_during, this, _1, _2),
+                       bind (&TextSubtitleDecoder::text_subtitles_during, this, _1, _2)
+                       )
+               );
 }
 
 void
 TextSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
-       SubtitleDecoder::seek (time, accurate);
+       subtitle->seek (time, accurate);
 
        _next = 0;
        while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
@@ -59,50 +66,9 @@ TextSubtitleDecoder::pass (PassReason, bool)
                return true;
        }
 
-       /* XXX: we are ignoring positioning specified in the file */
-
-       list<dcp::SubtitleString> out;
-
-       /* 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 (
-                                       TextSubtitleContent::font_id,
-                                       j.italic,
-                                       j.bold,
-                                       /* force the colour to whatever is configured */
-                                       _subtitle_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,
-                                       dcp::DIRECTION_LTR,
-                                       j.text,
-                                       _subtitle_content->outline() ? dcp::BORDER : dcp::NONE,
-                                       _subtitle_content->outline_colour(),
-                                       dcp::Time (0, 1000),
-                                       dcp::Time (0, 1000)
-                                       )
-                               );
-               }
-       }
-
-       text_subtitle (content_time_period (_subtitles[_next]), out);
+       ContentTimePeriod const p = content_time_period (_subtitles[_next]);
+       subtitle->give_text (p, _subtitles[_next]);
+       subtitle->set_position (p.from);
 
        ++_next;
        return false;
@@ -121,10 +87,20 @@ TextSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting)
 
        list<ContentTimePeriod> d;
 
+       /* Only take `during' (not starting) subs if they overlap more than half the requested period;
+          here's the threshold for being significant.
+       */
+       ContentTime const significant (p.duration().get() / 2);
+
        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))) {
+               if (starting && p.contains(t.from)) {
                        d.push_back (t);
+               } else if (!starting) {
+                       optional<ContentTimePeriod> const o = p.overlap (t);
+                       if (o && o->duration() > significant) {
+                               d.push_back (t);
+                       }
                }
        }
 
@@ -139,3 +115,9 @@ TextSubtitleDecoder::content_time_period (sub::Subtitle s) const
                ContentTime::from_seconds (s.to.all_as_seconds())
                );
 }
+
+void
+TextSubtitleDecoder::reset ()
+{
+       subtitle->reset ();
+}