X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=cb3403c3d5ae4c9cabe90f865d38bbe3032e5fe5;hp=a3b745c8e4ca69acd641cb106be7b733ca19e7da;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a diff --git a/src/lib/player.h b/src/lib/player.h index a3b745c8e..cb3403c3d 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,82 +1,44 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include -#include -#include -#include "playlist.h" -#include "content.h" +#include "player_subtitles.h" #include "film.h" -#include "rect.h" -#include "audio_content.h" -#include "dcpomatic_time.h" -#include "content_subtitle.h" +#include "content.h" #include "position_image.h" #include "piece.h" -#include "content_video.h" -#include "player_subtitles.h" +#include +#include +#include + +namespace dcp { + class ReelAsset; +} -class Job; -class Film; -class Playlist; -class AudioContent; -class Piece; -class Image; -class Decoder; -class Resampler; class PlayerVideo; -class ImageProxy; - -class PlayerStatistics -{ -public: - struct Video { - Video () - : black (0) - , repeat (0) - , good (0) - , skip (0) - {} - - int black; - int repeat; - int good; - int skip; - } video; - - struct Audio { - Audio () - : silence (0) - , good (0) - , skip (0) - {} - - DCPTime silence; - int64_t good; - int64_t skip; - } audio; - - void dump (boost::shared_ptr) const; -}; +class Playlist; +class Font; +class AudioBuffers; +class ReferencedReelAsset; /** @class Player * @brief A class which can `play' a Playlist. @@ -84,17 +46,22 @@ public: class Player : public boost::enable_shared_from_this, public boost::noncopyable { public: - Player (boost::shared_ptr, boost::shared_ptr); + Player (boost::shared_ptr, boost::shared_ptr playlist); 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); + PlayerSubtitles get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate); + std::list > get_subtitle_fonts (); + std::list get_reel_assets (); void set_video_container_size (dcp::Size); - void set_approximate_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 (); - PlayerStatistics const & statistics () const; - /** 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 * a seek. @@ -107,43 +74,26 @@ 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 setup_pieces (); - void playlist_changed (); - void content_changed (boost::weak_ptr, int, bool); + void reset_pieces (); void flush (); void film_changed (Film::Property); + 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 (); - VideoFrame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; - DCPTime content_video_to_dcp (boost::shared_ptr piece, VideoFrame f) const; - AudioFrame dcp_to_content_audio (boost::shared_ptr piece, DCPTime t) const; + 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; + DCPTime content_subtitle_to_dcp (boost::shared_ptr piece, ContentTime t) const; boost::shared_ptr black_player_video_frame (DCPTime) const; + std::list > overlaps (DCPTime from, DCPTime to, boost::function valid); - /** @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; @@ -151,17 +101,28 @@ private: bool _have_valid_pieces; std::list > _pieces; + /** Size of the image in the DCP (e.g. 1990x1080 for flat) */ dcp::Size _video_container_size; boost::shared_ptr _black_image; - bool _approximate_size; - bool _burn_subtitles; - - PlayerStatistics _statistics; + /** true if the player should ignore all video; i.e. never produce any */ + bool _ignore_video; + /** true if the player should ignore all audio; i.e. never produce any */ + bool _ignore_audio; + /** true if the player should always burn subtitles into the video regardless + of content settings + */ + bool _always_burn_subtitles; + /** true if we should try to be fast rather than high quality */ + bool _fast; + /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ + bool _play_referenced; + + 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