Assorted image subtitle fixes.

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 51d16b43c6d767f03c2b2b85237fc06a657c8ea3..ab0df8a8641d660315be9cc7068a6243896c0ba9 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -133,7 +133,13 @@ DCPDecoder::seek (ContentTime t, bool accurate)
 
 
 list<ContentTimePeriod>
 
 
 list<ContentTimePeriod>

-DCPDecoder::subtitles_during (ContentTimePeriod, bool) const
+DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+DCPDecoder::text_subtitles_during (ContentTimePeriod, bool) const

 {
        /* XXX */
        return list<ContentTimePeriod> ();
 {
        /* XXX */
        return list<ContentTimePeriod> ();

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 8afebff57dbe0858dc1ccb20e10de74b9acc45fe..20ca2bb6774a5263caad2824e56cb7783418e9ca 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -40,7 +40,8 @@ public:
 private:
        void seek (ContentTime t, bool accurate);
        bool pass ();
 private:
        void seek (ContentTime t, bool accurate);
        bool pass ();

-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;

 
        ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;
 
        ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index e3c06378b8eabd86216d8f08394e1db57152fab6..236e999969e243e9ac5eae4f062348d050d78111 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -61,7 +61,13 @@ DCPSubtitleDecoder::pass ()
 }
 
 list<ContentTimePeriod>
 }
 
 list<ContentTimePeriod>

-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}
+       
+list<ContentTimePeriod>
+DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const

 {
        /* XXX: inefficient */
 
 {
        /* XXX: inefficient */
 

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 2326b31ad8098afdfb6fa96135b0872732208771..9a16fb7c850dcf92e57ddf1ee7a80f8372386dc1 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -32,7 +32,8 @@ protected:
        bool pass ();
 
 private:
        bool pass ();
 
 private:

-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;

 
        std::list<dcp::SubtitleString> _subtitles;
        std::list<dcp::SubtitleString>::const_iterator _next;
 
        std::list<dcp::SubtitleString> _subtitles;
        std::list<dcp::SubtitleString>::const_iterator _next;

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index dc9b0cd8ac680c6e1a3803d7805c76cdd9d14b57..ae8f251996088814f507ff63f0b2c6427ea68d97 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -193,6 +193,7 @@ class ContentTimePeriod
 {
 public:
        ContentTimePeriod () {}
 {
 public:
        ContentTimePeriod () {}

+       

        ContentTimePeriod (ContentTime f, ContentTime t)
                : from (f)
                , to (t)
        ContentTimePeriod (ContentTime f, ContentTime t)
                : from (f)
                , to (t)

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index bd01b280b65bc223101aac0282ef4c4bc5f71b40..5dc06fa8e44f68f7b57201ac36ad50296cce8fd7 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -301,6 +301,7 @@ FFmpegDecoder::seek (ContentTime time, bool accurate)
 {
        VideoDecoder::seek (time, accurate);
        AudioDecoder::seek (time, accurate);
 {
        VideoDecoder::seek (time, accurate);
        AudioDecoder::seek (time, accurate);

+       SubtitleDecoder::seek (time, accurate);

 
        /* If we are doing an `accurate' seek, we need to use pre-roll, as
           we don't really know what the seek will give us.
 
        /* If we are doing an `accurate' seek, we need to use pre-roll, as
           we don't really know what the seek will give us.


@@ -426,27 +427,38 @@ FFmpegDecoder::decode_subtitle_packet ()
                return;
        }
 
                return;
        }
 

-       /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
-          indicate that the previous subtitle should stop.
+       /* Subtitle PTS (within the source, not taking into account any of the
+          source that we may have chopped off for the DCP)

        */
        */

+       FFmpegSubtitlePeriod period = subtitle_period (sub);
+       period.from += _pts_offset;
+       if (period.to) {
+               period.to = period.to.get() + _pts_offset;
+       }
+       

        if (sub.num_rects <= 0) {
        if (sub.num_rects <= 0) {

-               image_subtitle (ContentTimePeriod (), shared_ptr<Image> (), dcpomatic::Rect<double> ());
+               /* Sometimes we get an empty AVSubtitle, which is used by some codecs to
+                  indicate that the previous subtitle should stop.  Emit the pending one.
+               */
+               if (_pending_subtitle_from && _pending_subtitle_image && _pending_subtitle_rect) {
+                       image_subtitle (
+                               ContentTimePeriod (_pending_subtitle_from.get(), period.from),
+                               _pending_subtitle_image,
+                               _pending_subtitle_rect.get ()
+                               );
+                       _pending_subtitle_from = optional<ContentTime> ();
+                       _pending_subtitle_image.reset ();
+                       _pending_subtitle_rect = optional<dcpomatic::Rect<double> > ();
+               }                       

                return;
        } else if (sub.num_rects > 1) {
                throw DecodeError (_("multi-part subtitles not yet supported"));
        }
                
                return;
        } else if (sub.num_rects > 1) {
                throw DecodeError (_("multi-part subtitles not yet supported"));
        }
                

-       /* Subtitle PTS (within the source, not taking into account any of the
-          source that we may have chopped off for the DCP)
-       */
-       ContentTimePeriod period = subtitle_period (sub) + _pts_offset;
-

        AVSubtitleRect const * rect = sub.rects[0];
 
        if (rect->type != SUBTITLE_BITMAP) {
        AVSubtitleRect const * rect = sub.rects[0];
 
        if (rect->type != SUBTITLE_BITMAP) {

-               /* XXX */
-               // throw DecodeError (_("non-bitmap subtitles not yet supported"));
-               return;
+               throw DecodeError (_("non-bitmap subtitles not yet supported"));

        }
 
        /* Note RGBA is expressed little-endian, so the first byte in the word is R, second
        }
 
        /* Note RGBA is expressed little-endian, so the first byte in the word is R, second


@@ -475,23 +487,33 @@ FFmpegDecoder::decode_subtitle_packet ()
        }
 
        dcp::Size const vs = _ffmpeg_content->video_size ();
        }
 
        dcp::Size const vs = _ffmpeg_content->video_size ();

-
-       image_subtitle (
-               period,
-               image,
-               dcpomatic::Rect<double> (
-                       static_cast<double> (rect->x) / vs.width,
-                       static_cast<double> (rect->y) / vs.height,
-                       static_cast<double> (rect->w) / vs.width,
-                       static_cast<double> (rect->h) / vs.height
-                       )
+       dcpomatic::Rect<double> const scaled_rect (
+               static_cast<double> (rect->x) / vs.width,
+               static_cast<double> (rect->y) / vs.height,
+               static_cast<double> (rect->w) / vs.width,
+               static_cast<double> (rect->h) / vs.height

                );
                );

+
+       if (period.to) {
+               image_subtitle (ContentTimePeriod (period.from, period.to.get()), image, scaled_rect);
+       } else {
+               /* We don't know when this subtitle stops, so store it until we find out */
+               _pending_subtitle_from = period.from;
+               _pending_subtitle_image = image;
+               _pending_subtitle_rect = scaled_rect;
+       }

        
        avsubtitle_free (&sub);
 }
 
 list<ContentTimePeriod>
        
        avsubtitle_free (&sub);
 }
 
 list<ContentTimePeriod>

-FFmpegDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+FFmpegDecoder::image_subtitles_during (ContentTimePeriod p, bool starting) const

 {
        return _ffmpeg_content->subtitles_during (p, starting);
 }
 {
        return _ffmpeg_content->subtitles_during (p, starting);
 }

+
+list<ContentTimePeriod>
+FFmpegDecoder::text_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0334a30e203f4064d8ef4d0ea788eb38d0a2ef2a..b5bcdd35800fbaa07a0556ce00c082f8e4964e91 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -27,6 +27,7 @@
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"

+#include "rect.h"

 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 extern "C" {
 #include <libavcodec/avcodec.h>
 }


@@ -66,7 +67,12 @@ private:
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 

-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       boost::optional<ContentTime> _pending_subtitle_from;
+       boost::shared_ptr<Image> _pending_subtitle_image;
+       boost::optional<dcpomatic::Rect<double> > _pending_subtitle_rect;
+
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;

        
        boost::shared_ptr<Log> _log;
        
        
        boost::shared_ptr<Log> _log;
        

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 4409526dc4872015897357ffa385a28259a6acf2..e4f4e6f2904c3a263fc176e78fbb7da23d13f3c3 100644 (file)
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -150,13 +150,18 @@ FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubti
        int frame_finished;
        AVSubtitle sub;
        if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {
        int frame_finished;
        AVSubtitle sub;
        if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {

-               ContentTimePeriod const period = subtitle_period (sub);
-               if (sub.num_rects == 0 && !stream->periods.empty () && stream->periods.back().to > period.from) {
-                       /* Finish the last subtitle */
-                       stream->periods.back().to = period.from;
+               FFmpegSubtitlePeriod const period = subtitle_period (sub);
+               if (sub.num_rects <= 0 && _last_subtitle_start) {
+                       stream->periods.push_back (ContentTimePeriod (_last_subtitle_start.get (), period.from));
+                       _last_subtitle_start = optional<ContentTime> ();

                } else if (sub.num_rects == 1) {
                } else if (sub.num_rects == 1) {

-                       stream->periods.push_back (period);
+                       if (period.to) {
+                               stream->periods.push_back (ContentTimePeriod (period.from, period.to.get ()));
+                       } else {
+                               _last_subtitle_start = period.from;
+                       }

                }
                }

+               avsubtitle_free (&sub);

        }
 }
 
        }
 }
 

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index b873222c112e3d06c77bb989475f2a69f4bc7bbe..34d4b1e0d341304f4f9ff903f7debcc958421a40 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -55,7 +55,7 @@ private:
        std::string audio_stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;
        boost::optional<ContentTime> frame_time (AVStream* s) const;
        std::string audio_stream_name (AVStream* s) const;
        std::string subtitle_stream_name (AVStream* s) const;
        boost::optional<ContentTime> frame_time (AVStream* s) const;

-       
+

        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
        boost::optional<ContentTime> _first_video;
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
        boost::optional<ContentTime> _first_video;


@@ -64,4 +64,6 @@ private:
         */
        ContentTime _video_length;
        bool _need_video_length;
         */
        ContentTime _video_length;
        bool _need_video_length;

+
+       boost::optional<ContentTime> _last_subtitle_start;

 };
 };

diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 3d8fd4e8375466710cb51ffd4a6a7a4ac950c75e..66b587209af7c55f2a5958bd3e16af9327e390da 100644 (file)
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -18,6 +18,11 @@
 */
 
 #include "ffmpeg_subtitle_stream.h"
 */
 
 #include "ffmpeg_subtitle_stream.h"

+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+
+using std::string;

 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param t String returned from to_string().


@@ -26,11 +31,24 @@
 FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
        : FFmpegStream (node)
 {
 FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
        : FFmpegStream (node)
 {

-       
+       BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Period")) {
+               periods.push_back (
+                       ContentTimePeriod (
+                               ContentTime (node->number_child<ContentTime::Type> ("From")),
+                               ContentTime (node->number_child<ContentTime::Type> ("To"))
+                               )
+                       );
+       }

 }
 
 void
 FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 {
        FFmpegStream::as_xml (root);
 }
 
 void
 FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
 {
        FFmpegStream::as_xml (root);

+
+       BOOST_FOREACH (ContentTimePeriod const & i, periods) {
+               xmlpp::Node* node = root->add_child ("Period");
+               node->add_child("From")->add_child_text (raw_convert<string> (i.from.get ()));
+               node->add_child("To")->add_child_text (raw_convert<string> (i.to.get ()));
+       }

 }
 }

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 436ae3fe88fb33adaee5aacb1c2f3cfd99799b7f..640253c6d97da8e80ca4bca5b604a5ab3f989b78 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -376,9 +376,11 @@ Player::get_video (DCPTime time, bool accurate)
        list<PositionImage> c = transform_image_subtitles (ps.image);
        copy (c.begin(), c.end(), back_inserter (sub_images));
 
        list<PositionImage> c = transform_image_subtitles (ps.image);
        copy (c.begin(), c.end(), back_inserter (sub_images));
 

-       /* Text subtitles (rendered to images) */
-       sub_images.push_back (render_subtitles (ps.text, _video_container_size));
-       
+       /* Text subtitles (rendered to an image) */
+       if (!ps.text.empty ()) {
+               sub_images.push_back (render_subtitles (ps.text, _video_container_size));
+       }
+

        if (!sub_images.empty ()) {
                for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
                        (*i)->set_subtitle (merge (sub_images));
        if (!sub_images.empty ()) {
                for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
                        (*i)->set_subtitle (merge (sub_images));

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index bc89fd3f88dc85977e2d765227401dde059f0275..9620eacbf5c58ebe4a3dc847262067c6802ea54e 100644 (file)
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -50,10 +50,6 @@ calculate_position (dcp::VAlign v_align, double v_position, int target_height, i
 PositionImage
 render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
 {
 PositionImage
 render_subtitles (list<dcp::SubtitleString> subtitles, dcp::Size target)
 {

-       if (subtitles.empty ()) {
-               return PositionImage ();
-       }
-

        /* Estimate height that the subtitle image needs to be */
        optional<int> top;
        optional<int> bottom;
        /* Estimate height that the subtitle image needs to be */
        optional<int> top;
        optional<int> bottom;

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 552a96b8f325416fe1b2c60ac0470ddb19422276..bef48ba78458203c65c726be0dba341f8e46b34b 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -85,7 +85,13 @@ SubRipDecoder::pass ()
 }
 
 list<ContentTimePeriod>
 }
 
 list<ContentTimePeriod>

-SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+SubRipDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const

 {
        /* XXX: inefficient */
 
 {
        /* XXX: inefficient */
 

diff --git a/src/lib/subrip_decoder.h b/src/lib/subrip_decoder.h
index ad9d04e4003029f6a9b99b62714b4fbdd0a13a6f..876f763d3a5ffe1c39f1952226250eccb95db4c6 100644 (file)
--- a/src/lib/subrip_decoder.h
+++ b/src/lib/subrip_decoder.h
@@ -35,7 +35,8 @@ protected:
        bool pass ();
 
 private:
        bool pass ();
 
 private:

-       std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;

        
        size_t _next;
 };
        
        size_t _next;
 };

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 9b2aa8ab04198f8108606474897c2445973dfc93..ac9a67e33f18405eb0704cc63c587f3fc866f379 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
 /*

-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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
 
     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


@@ -33,7 +33,8 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
 }
 
 /** Called by subclasses when an image subtitle is ready.
 }
 
 /** Called by subclasses when an image subtitle is ready.

- *  Image may be 0 to say that there is no current subtitle.
+ *  @param period Period of the subtitle.
+ *  @param image Subtitle image.

  *  @param rect Area expressed as a fraction of the video frame that this subtitle
  *  is for (e.g. a width of 0.5 means the width of the subtitle is half the width
  *  of the video frame)
  *  @param rect Area expressed as a fraction of the video frame that this subtitle
  *  is for (e.g. a width of 0.5 means the width of the subtitle is half the width
  *  of the video frame)


@@ -50,12 +51,11 @@ SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
        _decoded_text_subtitles.push_back (ContentTextSubtitle (s));
 }
 
        _decoded_text_subtitles.push_back (ContentTextSubtitle (s));
 }
 

+/** @param sp Full periods of subtitles that are showing or starting during the specified period */

 template <class T>
 list<T>
 template <class T>
 list<T>

-SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period, bool starting)
+SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting)

 {
 {

-       /* Get the full periods of the subtitles that are showing or starting during the specified period */
-       list<ContentTimePeriod> sp = subtitles_during (period, starting);

        if (sp.empty ()) {
                /* Nothing in this period */
                return list<T> ();
        if (sp.empty ()) {
                /* Nothing in this period */
                return list<T> ();


@@ -88,13 +88,13 @@ SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period, bool start
 list<ContentTextSubtitle>
 SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
 {
 list<ContentTextSubtitle>
 SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
 {

-       return get<ContentTextSubtitle> (_decoded_text_subtitles, period, starting);
+       return get<ContentTextSubtitle> (_decoded_text_subtitles, text_subtitles_during (period, starting), period, starting);

 }
 
 list<ContentImageSubtitle>
 SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
 {
 }
 
 list<ContentImageSubtitle>
 SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
 {

-       return get<ContentImageSubtitle> (_decoded_image_subtitles, period, starting);
+       return get<ContentImageSubtitle> (_decoded_image_subtitles, image_subtitles_during (period, starting), period, starting);

 }
 
 void
 }
 
 void

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index d7faaa0145900658edb2441597a47b0d5e3af968..8ba74404f2d26dbc3a80c9494c20dd233e9396ef 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -49,12 +49,13 @@ protected:
 
 private:
        template <class T>
 
 private:
        template <class T>

-       std::list<T> get (std::list<T> const & subs, ContentTimePeriod period, bool starting);
+       std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting);

 
        /** @param starting true if we want only subtitles that start during the period, otherwise
         *  we want subtitles that overlap the period.
         */
 
        /** @param starting true if we want only subtitles that start during the period, otherwise
         *  we want subtitles that overlap the period.
         */

-       virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod period, bool starting) const = 0;
+       virtual std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
+       virtual std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const = 0;

        
        boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };
        
        boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };

diff --git a/src/lib/types.h b/src/lib/types.h
index f3877d0d554844775b0163be1138df194322c6d8..e7017a2950c7b79fdfe20ee89d724badf53f4a23 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -22,6 +22,7 @@
 
 #include "dcpomatic_time.h"
 #include "position.h"
 
 #include "dcpomatic_time.h"
 #include "position.h"

+#include "rect.h"

 #include <dcp/util.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <dcp/util.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>

diff --git a/src/lib/util.cc b/src/lib/util.cc
index bffbe90d402b2bca5cf8b74852c58556265c03ea..d8c754607f47a5940b51e95921ead82c11a2daca 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -564,18 +564,21 @@ wrapped_av_malloc (size_t s)
        }
        return p;
 }
        }
        return p;
 }

-               
-ContentTimePeriod
+
+FFmpegSubtitlePeriod

 subtitle_period (AVSubtitle const & sub)
 {
        ContentTime const packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE);
 
 subtitle_period (AVSubtitle const & sub)
 {
        ContentTime const packet_time = ContentTime::from_seconds (static_cast<double> (sub.pts) / AV_TIME_BASE);
 

-       ContentTimePeriod period (
+       if (sub.end_display_time == static_cast<uint32_t> (-1)) {
+               /* End time is not known */
+               return FFmpegSubtitlePeriod (packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3));
+       }
+       
+       return FFmpegSubtitlePeriod (

                packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3),
                packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3)
                );
                packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3),
                packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3)
                );

-
-       return period;

 }
 
 map<string, string>
 }
 
 map<string, string>

diff --git a/src/lib/util.h b/src/lib/util.h
index c1f7a78c745318b33a173627c80f3d664128a0bc..44bd7dcedceab0e48800bd45f9cf0a7418ac5566 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -74,7 +74,24 @@ extern int dcp_audio_frame_rate (int);
 extern int stride_round_up (int, int const *, int);
 extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);
 extern int stride_round_up (int, int const *, int);
 extern int round_to (float n, int r);
 extern void* wrapped_av_malloc (size_t);

-extern ContentTimePeriod subtitle_period (AVSubtitle const &);
+
+class FFmpegSubtitlePeriod
+{
+public:
+       FFmpegSubtitlePeriod (ContentTime f)
+               : from (f)
+       {}
+
+       FFmpegSubtitlePeriod (ContentTime f, ContentTime t)
+               : from (f)
+               , to (t)
+       {}
+
+       ContentTime from;
+       boost::optional<ContentTime> to;
+};
+
+extern FFmpegSubtitlePeriod subtitle_period (AVSubtitle const &);

 extern void set_backtrace_file (boost::filesystem::path);
 extern dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes);
 extern void write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info);
 extern void set_backtrace_file (boost::filesystem::path);
 extern dcp::FrameInfo read_frame_info (FILE* file, int frame, Eyes eyes);
 extern void write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info);