Store reel lengths in DCPContent to speed up e.g. timeline with many DCPs.

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

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index f00254ae25ffb357da7e5b06f63fde2ce53e5550..d389714e9e0c5ef9f194432e88bc34dfd08e2a82 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -19,7 +19,7 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -29,6 +29,7 @@ using std::map;
 using std::list;
 using std::cout;
 using std::make_pair;
+using dcp::raw_convert;
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
@@ -143,6 +144,13 @@ FFmpegSubtitleStream::text_subtitles_during (ContentTimePeriod period, bool star
        return subtitles_during (period, starting, _text_subtitles);
 }
 
+struct PeriodSorter
+{
+       bool operator() (ContentTimePeriod const & a, ContentTimePeriod const & b) {
+               return a.from < b.from;
+       }
+};
+
 list<ContentTimePeriod>
 FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const
 {
@@ -150,11 +158,13 @@ FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting,
 
        /* XXX: inefficient */
        for (map<string, ContentTimePeriod>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
-               if ((starting && period.contains (i->second.from)) || (!starting && period.overlaps (i->second))) {
+               if ((starting && period.contains(i->second.from)) || (!starting && period.overlap(i->second))) {
                        d.push_back (i->second);
                }
        }
 
+       d.sort (PeriodSorter ());
+
        return d;
 }
 
@@ -171,6 +181,23 @@ FFmpegSubtitleStream::find_subtitle_to (string id) const
        return i->second.to;
 }
 
+/** @param id Subtitle id.
+ *  @return true if the `from' and `to' times for this id are equal, which indicates
+ *  that the `to' time is unknown.
+ */
+bool
+FFmpegSubtitleStream::unknown_to (string id) const
+{
+       PeriodMap::const_iterator i = _image_subtitles.find (id);
+       if (i != _image_subtitles.end ()) {
+               return i->second.from == i->second.to;
+       }
+
+       i = _text_subtitles.find (id);
+       DCPOMATIC_ASSERT (i != _text_subtitles.end ());
+       return i->second.from == i->second.to;
+}
+
 /** Add some offset to all the times in the stream */
 void
 FFmpegSubtitleStream::add_offset (ContentTime offset)
@@ -197,3 +224,31 @@ FFmpegSubtitleStream::set_colour (RGBA from, RGBA to)
 {
        _colours[from] = to;
 }
+
+bool
+FFmpegSubtitleStream::has_text () const
+{
+       return !_text_subtitles.empty ();
+}
+
+bool
+FFmpegSubtitleStream::has_image () const
+{
+       return !_image_subtitles.empty ();
+}
+
+void
+FFmpegSubtitleStream::set_subtitle_to (string id, ContentTime to)
+{
+       PeriodMap::iterator i = _image_subtitles.find (id);
+       if (i != _image_subtitles.end ()) {
+               i->second.to = to;
+       } else {
+               i = _text_subtitles.find (id);
+               if (i != _text_subtitles.end ()) {
+                       i->second.to = to;
+               } else {
+                       DCPOMATIC_ASSERT (false);
+               }
+       }
+}