X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=16e9d57a5b38d92af5a0431b988a3c5413275d9a;hp=e52ad59c2f6014554bfaace206149a6494914e81;hb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;hpb=dd59755d86cdb1892bb0ba4d69af520cee4aa964 diff --git a/src/lib/player.h b/src/lib/player.h index e52ad59c2..16e9d57a5 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,30 +1,38 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 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 "player_subtitles.h" +#include "player_caption.h" +#include "active_captions.h" +#include "content_text.h" #include "film.h" #include "content.h" #include "position_image.h" #include "piece.h" +#include "content_video.h" +#include "content_audio.h" +#include "audio_stream.h" +#include "audio_merger.h" +#include "empty.h" #include #include #include @@ -37,6 +45,18 @@ class PlayerVideo; class Playlist; class Font; class AudioBuffers; +class ReferencedReelAsset; +class Shuffler; + +class PlayerProperty +{ +public: + static int const VIDEO_CONTAINER_SIZE; + static int const PLAYLIST; + static int const FILM_CONTAINER; + static int const FILM_VIDEO_FRAME_RATE; + static int const DCP_DECODE_REDUCTION; +}; /** @class Player * @brief A class which can `play' a Playlist. @@ -45,72 +65,79 @@ class Player : public boost::enable_shared_from_this, public boost::nonc { public: Player (boost::shared_ptr, boost::shared_ptr playlist); + ~Player (); + + bool pass (); + void seek (DCPTime time, bool accurate); - 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 (); - std::list > get_reel_assets (); + std::list get_reel_assets (); + dcp::Size video_container_size () const { + return _video_container_size; + } void set_video_container_size (dcp::Size); void set_ignore_video (); - void set_ignore_audio (); - void set_enable_subtitles (bool enable); + void set_ignore_subtitle (); void set_always_burn_subtitles (bool burn); void set_fast (); void set_play_referenced (); + void set_dcp_decode_reduction (boost::optional reduction); + + DCPTime content_time_to_dcp (boost::shared_ptr content, ContentTime t); /** 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. * - * The parameter is true if these signals are currently likely to be frequent. + * The first parameter is what changed. + * The second parameter is true if these signals are currently likely to be frequent. */ - boost::signals2::signal Changed; + boost::signals2::signal Changed; + + /** Emitted when a video frame is ready. These emissions happen in the correct order. */ + boost::signals2::signal, DCPTime)> Video; + boost::signals2::signal, DCPTime)> Audio; + /** Emitted when a caption is ready. This signal may be emitted considerably + * after the corresponding Video. + */ + boost::signals2::signal Text; 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; + friend struct player_subframe_test; void setup_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 (); + std::list transform_bitmap_texts (std::list) 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; - 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; - } + DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; + ContentTime dcp_to_content_time (boost::shared_ptr piece, DCPTime t) const; + DCPTime content_time_to_dcp (boost::shared_ptr piece, ContentTime t) const; + boost::shared_ptr black_player_video_frame (Eyes eyes) const; + void video (boost::weak_ptr, ContentVideo); + void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); + void bitmap_text_start (boost::weak_ptr, ContentBitmapCaption); + void plain_text_start (boost::weak_ptr, ContentTextCaption); + void subtitle_stop (boost::weak_ptr, ContentTime, TextType); + DCPTime one_video_frame () const; + void fill_audio (DCPTimePeriod period); + std::pair, DCPTime> discard_audio ( + boost::shared_ptr audio, DCPTime time, DCPTime discard_to + ) const; + boost::optional subtitles_for_frame (DCPTime time) const; + void emit_video (boost::shared_ptr pv, DCPTime time); + void do_emit_video (boost::shared_ptr pv, DCPTime time); + void emit_audio (boost::shared_ptr data, DCPTime time); boost::shared_ptr _film; boost::shared_ptr _playlist; @@ -126,7 +153,7 @@ private: /** 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; + bool _ignore_subtitle; /** true if the player should always burn subtitles into the video regardless of content settings */ @@ -136,6 +163,40 @@ private: /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ bool _play_referenced; + /** Time just after the last video frame we emitted, or the time of the last accurate seek */ + boost::optional _last_video_time; + boost::optional _last_video_eyes; + /** Time just after the last audio frame we emitted, or the time of the last accurate seek */ + boost::optional _last_audio_time; + + boost::optional _dcp_decode_reduction; + + typedef std::map, boost::shared_ptr > LastVideoMap; + LastVideoMap _last_video; + + AudioMerger _audio_merger; + Shuffler* _shuffler; + std::list, DCPTime> > _delay; + + class StreamState + { + public: + StreamState () {} + + StreamState (boost::shared_ptr p, DCPTime l) + : piece(p) + , last_push_end(l) + {} + + boost::shared_ptr piece; + DCPTime last_push_end; + }; + std::map _stream_states; + + Empty _black; + Empty _silent; + + ActiveCaptions _active_text[TEXT_COUNT]; boost::shared_ptr _audio_processor; boost::signals2::scoped_connection _film_changed_connection;