X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=a795f8174323002900ece524f1cffcad88309cdd;hb=44c918a83e1e64922448ba20b5dfdcf30d026f84;hp=6e70ad707cf79052cd24a64cbc0c1344020a2e1c;hpb=82926443230084739cb673a83b2ab1f9d733a07b;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 6e70ad707..a795f8174 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington 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 @@ -20,59 +20,48 @@ #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include -#include -#include -#include "playlist.h" #include "content.h" #include "film.h" #include "rect.h" -#include "audio_merger.h" #include "audio_content.h" +#include "dcpomatic_time.h" +#include "content_subtitle.h" +#include "position_image.h" #include "piece.h" -#include "subtitle.h" +#include "content_video.h" +#include "player_subtitles.h" +#include +#include +#include class Job; class Film; -class Playlist; class AudioContent; class Piece; class Image; +class Decoder; class Resampler; -class PlayerVideoFrame; +class PlayerVideo; class ImageProxy; - +class Font; + /** @class Player - * @brief A class which can `play' a Playlist; emitting its audio and video. + * @brief A class which can `play' a Playlist. */ class Player : public boost::enable_shared_from_this, public boost::noncopyable { public: - Player (boost::shared_ptr, boost::shared_ptr); - - void disable_video (); - void disable_audio (); - - bool pass (); - void seek (Time, bool); + Player (boost::shared_ptr, boost::shared_ptr playlist); - Time video_position () const { - return _video_position; - } - - void set_video_container_size (libdcp::Size); + std::list > get_video (DCPTime time, bool accurate); + boost::shared_ptr get_audio (DCPTime time, DCPTime length, bool accurate); + PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt); + std::list > get_subtitle_fonts (); - bool repeat_last_video (); - - /** Emitted when a video frame is ready. - * First parameter is the video image. - * Second parameter is true if the frame is the same as the last one that was emitted. - * Third parameter is the time. - */ - boost::signals2::signal, bool, Time)> Video; - - /** Emitted when some audio data is ready */ - boost::signals2::signal, Time)> Audio; + void set_video_container_size (dcp::Size); + void set_ignore_video (); + void set_enable_subtitles (bool enable); + void set_always_burn_subtitles (bool burn); /** Emitted when something has changed such that if we went back and emitted * the last frame again it would look different. This is not emitted after @@ -85,55 +74,70 @@ public: 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; - void process_video (boost::weak_ptr, boost::shared_ptr, Eyes, Part, bool, VideoContent::Frame, Time); - void process_audio (boost::weak_ptr, boost::shared_ptr, AudioContent::Frame, bool); - void process_subtitle (boost::weak_ptr, boost::shared_ptr, dcpomatic::Rect, Time, Time); void setup_pieces (); - void playlist_changed (); - void content_changed (boost::weak_ptr, int, bool); - void do_seek (Time, bool); void flush (); - void emit_black (); - void emit_silence (OutputAudioFrame); - boost::shared_ptr resampler (boost::shared_ptr, bool); void film_changed (Film::Property); - void update_subtitle (); + void playlist_changed (); + void playlist_content_changed (boost::weak_ptr, int, bool); + std::list transform_image_subtitles (std::list) const; + void update_subtitle_from_text (); + Frame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; + DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; + Frame dcp_to_resampled_audio (boost::shared_ptr piece, DCPTime t) const; + ContentTime dcp_to_content_subtitle (boost::shared_ptr piece, DCPTime t) const; + boost::shared_ptr black_player_video_frame (DCPTime) const; + + /** @return Pieces of content type C that overlap a specified time range in the DCP */ + template + std::list > + overlaps (DCPTime from, DCPTime to) + { + if (!_have_valid_pieces) { + setup_pieces (); + } + + std::list > overlaps; + for (typename std::list >::const_iterator i = _pieces.begin(); i != _pieces.end(); ++i) { + if (!boost::dynamic_pointer_cast ((*i)->content)) { + continue; + } + + if ((*i)->content->position() <= to && (*i)->content->end() >= from) { + overlaps.push_back (*i); + } + } + + return overlaps; + } boost::shared_ptr _film; boost::shared_ptr _playlist; - - bool _video; - bool _audio; /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */ bool _have_valid_pieces; std::list > _pieces; - /** The time after the last video that we emitted */ - Time _video_position; - /** The time after the last audio that we emitted */ - Time _audio_position; - - AudioMerger _audio_merger; + /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ + dcp::Size _video_container_size; + boost::shared_ptr _black_image; - libdcp::Size _video_container_size; - boost::shared_ptr _black_frame; - std::map, boost::shared_ptr > _resamplers; + /** true if the player should ignore all video; i.e. never produce any */ + bool _ignore_video; + /** true if the player should always burn subtitles into the video regardless + of content settings + */ + bool _always_burn_subtitles; - std::list _subtitles; - -#ifdef DCPOMATIC_DEBUG - boost::shared_ptr _last_video; -#endif - - bool _last_emit_was_black; - - IncomingVideo _last_incoming_video; + boost::shared_ptr _audio_processor; + boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_changed_connection; boost::signals2::scoped_connection _playlist_content_changed_connection; - boost::signals2::scoped_connection _film_changed_connection; }; #endif