#define DCPOMATIC_PLAYER_H
#include "player_subtitles.h"
+#include "active_subtitles.h"
#include "film.h"
#include "content.h"
#include "position_image.h"
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 ();
void set_play_referenced ();
*/
boost::signals2::signal<void (bool)> Changed;
- boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>)> Video;
+ boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video;
boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio;
- boost::signals2::signal<void (PlayerSubtitles)> Subtitle;
+ /** 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;
DCPTime resampled_audio_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
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 (DCPTime) const;
- std::list<boost::shared_ptr<Piece> > overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid);
+ boost::shared_ptr<PlayerVideo> black_player_video_frame () const;
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);
+ DCPTime one_video_frame () const;
+ void fill_audio (DCPTimePeriod period);
+ 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);
+ void emit_audio (boost::shared_ptr<AudioBuffers> data, DCPTime time);
boost::shared_ptr<const Film> _film;
boost::shared_ptr<const Playlist> _playlist;
/** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */
bool _play_referenced;
- boost::shared_ptr<PlayerVideo> _last_video;
+ /** Time just after the last video frame we emitted, or the time of the last accurate seek */
boost::optional<DCPTime> _last_video_time;
+ /** Time just after the last audio frame we emitted, or the time of the last accurate seek */
+ boost::optional<DCPTime> _last_audio_time;
+
+ typedef std::map<boost::weak_ptr<Piece>, boost::shared_ptr<PlayerVideo> > LastVideoMap;
+ LastVideoMap _last_video;
AudioMerger _audio_merger;
- DCPTime _last_audio_time;
- std::list<PlayerSubtitles> _subtitles;
+ class StreamState
+ {
+ public:
+ StreamState () {}
+
+ StreamState (boost::shared_ptr<Piece> p, DCPTime l)
+ : piece(p)
+ , last_push_end(l)
+ {}
+
+ boost::shared_ptr<Piece> piece;
+ DCPTime last_push_end;
+ };
+ std::map<AudioStreamPtr, StreamState> _stream_states;
+
+ std::list<DCPTimePeriod> _no_video;
+ std::list<DCPTimePeriod> _no_audio;
+ ActiveSubtitles _active_subtitles;
boost::shared_ptr<AudioProcessor> _audio_processor;
boost::signals2::scoped_connection _film_changed_connection;