#include "content_video.h"
#include "content_audio.h"
#include "content_subtitle.h"
+#include "audio_stream.h"
+#include "audio_merger.h"
#include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <list>
class Font;
class AudioBuffers;
class ReferencedReelAsset;
+class Resampler;
/** @class Player
* @brief A class which can `play' a Playlist.
*/
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;
void playlist_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int, bool);
std::list<PositionImage> transform_image_subtitles (std::list<ImageSubtitle>) const;
- void update_subtitle_from_text ();
Frame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
DCPTime content_video_to_dcp (boost::shared_ptr<const Piece> piece, Frame f) const;
Frame dcp_to_resampled_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
- ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
- DCPTime content_subtitle_to_dcp (boost::shared_ptr<const Piece> piece, ContentTime t) const;
- boost::shared_ptr<PlayerVideo> black_player_video_frame (DCPTime) const;
+ 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 () 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>, ContentAudio);
- void image_subtitle (boost::weak_ptr<Piece>, ContentImageSubtitle);
- void text_subtitle (boost::weak_ptr<Piece>, ContentTextSubtitle);
+ void audio (boost::weak_ptr<Piece>, AudioStreamPtr, ContentAudio);
+ 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_video (DCPTimePeriod period);
+ 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::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;
- DCPTime _last_video;
+ /** Last PlayerVideo that was emitted */
+ boost::shared_ptr<PlayerVideo> _last_video;
+ /** Time just after the last video frame we emitted, or the last seek time */
+ boost::optional<DCPTime> _last_video_time;
+ /** Time just after the last audio frame we emitted, or the last seek time */
+ boost::optional<DCPTime> _last_audio_time;
+
+ AudioMerger _audio_merger;
+
+ 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;
+
+ typedef std::map<boost::weak_ptr<Piece>, std::pair<PlayerSubtitles, DCPTime> > ActiveSubtitles;
+ 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;
boost::signals2::scoped_connection _film_changed_connection;
boost::signals2::scoped_connection _playlist_changed_connection;