X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.h;h=d83045ab12a6b8e84478be51188111240095f971;hb=2c0478d2b33906845b9d910668b12fe3e8f03a7c;hp=5f7c553a0f9f0bd44b2c6b49c628c59520d9381c;hpb=e8204f55c981493b99814f71a50b3c3d62601032;p=dcpomatic.git diff --git a/src/lib/player.h b/src/lib/player.h index 5f7c553a0..d83045ab1 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 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 @@ -27,9 +27,10 @@ #include "content.h" #include "film.h" #include "rect.h" -#include "audio_merger.h" #include "audio_content.h" -#include "decoded.h" +#include "dcpomatic_time.h" +#include "content_subtitle.h" +#include "position_image.h" class Job; class Film; @@ -37,29 +38,8 @@ class Playlist; class AudioContent; class Piece; class Image; - -/** @class PlayerImage - * @brief A wrapper for an Image which contains some pending operations; these may - * not be necessary if the receiver of the PlayerImage throws it away. - */ -class PlayerImage -{ -public: - PlayerImage (boost::shared_ptr, Crop, libdcp::Size, libdcp::Size, Scaler const *); - - void set_subtitle (boost::shared_ptr, Position); - - boost::shared_ptr image (AVPixelFormat, bool); - -private: - boost::shared_ptr _in; - Crop _crop; - libdcp::Size _inter_size; - libdcp::Size _out_size; - Scaler const * _scaler; - boost::shared_ptr _subtitle_image; - Position _subtitle_position; -}; +class DCPVideo; +class Decoder; class PlayerStatistics { @@ -85,52 +65,47 @@ public: , skip (0) {} - int64_t silence; + DCPTime silence; int64_t good; int64_t skip; } audio; void dump (boost::shared_ptr) const; }; - + +class Piece +{ +public: + Piece (boost::shared_ptr c, boost::shared_ptr d, FrameRateChange f) + : content (c) + , decoder (d) + , frc (f) + {} + + boost::shared_ptr content; + boost::shared_ptr decoder; + FrameRateChange frc; +}; + /** @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 (DCPTime, bool); - - DCPTime video_position () const { - return _video_position; - } + boost::shared_ptr get_video (DCPTime time, bool accurate); + boost::shared_ptr get_audio (DCPTime time, DCPTime length, bool accurate); - void set_video_container_size (libdcp::Size); + void set_video_container_size (dcp::Size); void set_approximate_size (); - - bool repeat_last_video (); + void set_burn_subtitles (bool burn) { + _burn_subtitles = burn; + } PlayerStatistics const & statistics () const; - /** Emitted when a video frame is ready. - * First parameter is the video image. - * Second parameter is the eye(s) that should see this image. - * Third parameter is the colour conversion that should be used for this image. - * Fourth parameter is true if the image is the same as the last one that was emitted. - * Fifth parameter is the time. - */ - boost::signals2::signal, Eyes, ColourConversion, bool, DCPTime)> Video; - - /** Emitted when some audio data is ready */ - boost::signals2::signal, DCPTime)> Audio; - /** 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. @@ -146,61 +121,44 @@ private: void setup_pieces (); void playlist_changed (); void content_changed (boost::weak_ptr, int, bool); - void do_seek (DCPTime, bool); void flush (); - void emit_black (); - void emit_silence (AudioFrame); void film_changed (Film::Property); - void update_subtitle (); - void emit_video (boost::weak_ptr, boost::shared_ptr); - void emit_audio (boost::weak_ptr, boost::shared_ptr); - void step_video_position (boost::shared_ptr); - + std::list process_content_image_subtitles ( + boost::shared_ptr, std::list > + ); + std::list process_content_text_subtitles (std::list >); + void update_subtitle_from_text (); + VideoFrame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; + AudioFrame dcp_to_content_audio (boost::shared_ptr piece, DCPTime t) const; + ContentTime dcp_to_content_subtitle (boost::shared_ptr piece, DCPTime t) const; + boost::shared_ptr black_dcp_video (DCPTime) const; + + template + std::list > + overlaps (DCPTime t) + { + std::list > overlaps; + for (typename std::list >::const_iterator i = _pieces.begin(); i != _pieces.end(); ++i) { + if (boost::dynamic_pointer_cast ((*i)->content) && (*i)->content->position() <= t && t < (*i)->content->end()) { + 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 */ - DCPTime _video_position; - /** The time after the last audio that we emitted */ - DCPTime _audio_position; - - AudioMerger _audio_merger; - - libdcp::Size _video_container_size; - boost::shared_ptr _black_frame; - - struct { - boost::weak_ptr piece; - boost::shared_ptr subtitle; - } _in_subtitle; - - struct { - Position position; - boost::shared_ptr image; - DCPTime from; - DCPTime to; - } _out_subtitle; - -#ifdef DCPOMATIC_DEBUG - boost::shared_ptr _last_video; -#endif - - bool _last_emit_was_black; - - struct { - boost::weak_ptr weak_piece; - boost::shared_ptr video; - } _last_incoming_video; + dcp::Size _video_container_size; + boost::shared_ptr _black_image; - bool _just_did_inaccurate_seek; bool _approximate_size; + bool _burn_subtitles; PlayerStatistics _statistics;