X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=760b54a605f3e1eee868875749ddf8d2d581c187;hb=81b8b8d2e6c548fe0cac006b6551945f5c1d77a9;hp=9bb84a11cac03ad86da1b41684f5e73677869bff;hpb=276a8f49c94cc80a7b29d5ecd8c7584e7ddcd87c;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 9bb84a11c..760b54a60 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,19 +1,20 @@ /* 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 . */ @@ -21,10 +22,16 @@ #define DCPOMATIC_PLAYER_H #include "player_subtitles.h" +#include "active_subtitles.h" #include "film.h" #include "content.h" #include "position_image.h" #include "piece.h" +#include "content_video.h" +#include "content_audio.h" +#include "content_subtitle.h" +#include "audio_stream.h" +#include "audio_merger.h" #include #include #include @@ -37,6 +44,8 @@ class PlayerVideo; class Playlist; class Font; class AudioBuffers; +class ReferencedReelAsset; +class Resampler; /** @class Player * @brief A class which can `play' a Playlist. @@ -46,15 +55,14 @@ class Player : public boost::enable_shared_from_this, public boost::nonc public: 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, bool burnt); + bool pass (); + void seek (DCPTime time, bool accurate); + std::list > get_subtitle_fonts (); - std::list > get_reel_assets (); + std::list get_reel_assets (); 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 (); @@ -68,10 +76,16 @@ public: */ boost::signals2::signal Changed; + boost::signals2::signal, DCPTime)> Video; + boost::signals2::signal, DCPTime)> Audio; + /** Emitted when a subtitle is ready. This signal may be emitted considerably + * after the corresponding Video. + */ + boost::signals2::signal 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; @@ -82,36 +96,28 @@ private: 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; - DCPTime content_subtitle_to_dcp (boost::shared_ptr piece, ContentTime 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 () const; + void video (boost::weak_ptr, ContentVideo); + void audio (boost::weak_ptr, AudioStreamPtr, ContentAudio); + void image_subtitle_start (boost::weak_ptr, ContentImageSubtitle); + void text_subtitle_start (boost::weak_ptr, ContentTextSubtitle); + void subtitle_stop (boost::weak_ptr, ContentTime); + boost::shared_ptr resampler (boost::shared_ptr 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, AudioStreamPtr stream); + void audio_transform (boost::shared_ptr content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time); + std::pair, DCPTime> discard_audio ( + boost::shared_ptr audio, DCPTime time, DCPTime discard_to + ) const; + boost::optional subtitles_for_frame (DCPTime time) const; boost::shared_ptr _film; boost::shared_ptr _playlist; @@ -137,7 +143,38 @@ private: /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ bool _play_referenced; + /** Last PlayerVideo that was emitted */ + boost::shared_ptr _last_video; + /** Time just after the last video frame we emitted, or the last seek time */ + boost::optional _last_video_time; + /** Time just after the last audio frame we emitted, or the last seek time */ + boost::optional _last_audio_time; + boost::optional _last_seek_time; + + AudioMerger _audio_merger; + + 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; + + std::list _no_video; + std::list _no_audio; + + ActiveSubtitles _active_subtitles; boost::shared_ptr _audio_processor; + typedef std::map, AudioStreamPtr>, boost::shared_ptr > ResamplerMap; + ResamplerMap _resamplers; boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_changed_connection;