Fix up black-filling logic.

[dcpomatic.git] / src / lib / player.h

diff --git a/src/lib/player.h b/src/lib/player.h
index 69149d0393aefe2b8863eca73f0661fe8d34f37f..ffc578c711fffe50410231b07042695dcaa7f8a2 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -22,6 +22,7 @@
 #define DCPOMATIC_PLAYER_H
 
 #include "player_subtitles.h"
+#include "active_subtitles.h"
 #include "film.h"
 #include "content.h"
 #include "position_image.h"
@@ -62,7 +63,6 @@ public:
 
        void set_video_container_size (dcp::Size);
        void set_ignore_video ();
-       void set_ignore_audio ();
        void set_enable_subtitles (bool enable);
        void set_always_burn_subtitles (bool burn);
        void set_fast ();
@@ -78,12 +78,14 @@ public:
 
        boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
        boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
+       /** Emitted when a subtitle is ready.  This signal may be emitted considerably
+        *  after the corresponding Video.
+        */
        boost::signals2::signal<void (PlayerSubtitles, DCPTimePeriod)> Subtitle;
 
 private:
        friend class PlayerWrapper;
        friend class Piece;
-       friend struct player_overlaps_test;
        friend struct player_time_calculation_test1;
        friend struct player_time_calculation_test2;
        friend struct player_time_calculation_test3;
@@ -101,12 +103,21 @@ private:
        ContentTime dcp_to_content_time (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        DCPTime content_time_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
        boost::shared_ptr<PlayerVideo> black_player_video_frame () const;
-       std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid);
        void video (boost::weak_ptr<Piece>, ContentVideo);
        void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
-       void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
-       void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
+       void image_subtitle_start (boost::weak_ptr<Piece>, ContentImageSubtitle);
+       void text_subtitle_start (boost::weak_ptr<Piece>, ContentTextSubtitle);
+       void subtitle_stop (boost::weak_ptr<Piece>, ContentTime);
        boost::shared_ptr<Resampler> resampler (boost::shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create);
+       DCPTime one_video_frame () const;
+       void fill_audio (DCPTimePeriod period);
+       void audio_flush (boost::shared_ptr<Piece>, AudioStreamPtr stream);
+       void audio_transform (boost::shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time);
+       std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
+               boost::shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to
+               ) const;
+       boost::optional<PositionImage> subtitles_for_frame (DCPTime time) const;
+       void emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
 
        boost::shared_ptr<const Film> _film;
        boost::shared_ptr<const Playlist> _playlist;
@@ -134,13 +145,17 @@ private:
 
        /** Last PlayerVideo that was emitted */
        boost::shared_ptr<PlayerVideo> _last_video;
-       /** Time of the last thing we emitted, or the last seek time */
-       boost::optional<DCPTime> _last_time;
+       /** Time just after the last video frame we emitted, or empty if we have just seeked */
+       boost::optional<DCPTime> _last_video_time;
+       /** Time just after the last audio frame we emitted, or empty if we have just seeked */
+       boost::optional<DCPTime> _last_audio_time;
+       boost::optional<DCPTime> _last_seek_time;
+       bool _last_seek_accurate;
 
        AudioMerger _audio_merger;
-       DCPTime _last_audio_time;
 
-       class StreamState {
+       class StreamState
+       {
        public:
                StreamState () {}
 
@@ -154,8 +169,10 @@ private:
        };
        std::map<AudioStreamPtr, StreamState> _stream_states;
 
-       std::list<std::pair<PlayerSubtitles, DCPTimePeriod> > _subtitles;
+       std::list<DCPTimePeriod> _no_video;
+       std::list<DCPTimePeriod> _no_audio;
 
+       ActiveSubtitles _active_subtitles;
        boost::shared_ptr<AudioProcessor> _audio_processor;
        typedef std::map<std::pair<boost::shared_ptr<const AudioContent>, AudioStreamPtr>, boost::shared_ptr<Resampler> > ResamplerMap;
        ResamplerMap _resamplers;