X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplayer.cc;h=b634028ba3a99ab6b8455041882c8b7eaa6c01fb;hb=15f23b356b757a9697bf1a9ec30c243ab8070404;hp=5fe35e34d736ed455cada873eac294d925c5f6fa;hpb=c98c87afe29d9ef74bdced8a9c96d7752f3fe80f;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 5fe35e34d..b634028ba 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -34,13 +34,17 @@ #include "playlist.h" #include "job.h" #include "image.h" +#include "image_proxy.h" #include "ratio.h" #include "log.h" #include "scaler.h" #include "render_subtitles.h" -#include "dcp_video.h" #include "config.h" #include "content_video.h" +#include "player_video.h" +#include "frame_rate_change.h" + +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); using std::list; using std::cout; @@ -61,7 +65,6 @@ Player::Player (shared_ptr f, shared_ptr p) , _playlist (p) , _have_valid_pieces (false) , _approximate_size (false) - , _burn_subtitles (false) { _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3)); @@ -176,6 +179,7 @@ Player::content_changed (weak_ptr w, int property, bool frequent) Changed (frequent); } else if ( + property == SubtitleContentProperty::SUBTITLE_USE || property == SubtitleContentProperty::SUBTITLE_X_OFFSET || property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE || @@ -188,6 +192,7 @@ Player::content_changed (weak_ptr w, int property, bool frequent) } } +/** @param already_resampled true if this data has already been through the chain up to the resampler */ void Player::playlist_changed () { @@ -212,7 +217,7 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { + if (p == Film::SCALER || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { Changed (false); } } @@ -287,83 +292,25 @@ Player::set_approximate_size () _approximate_size = true; } -shared_ptr -Player::black_dcp_video (DCPTime time) const +shared_ptr +Player::black_player_video_frame () const { - return shared_ptr ( - new DCPVideo ( - _black_image, - EYES_BOTH, + return shared_ptr ( + new PlayerVideo ( + shared_ptr (new RawImageProxy (_black_image, _film->log ())), Crop (), _video_container_size, _video_container_size, Scaler::from_id ("bicubic"), - Config::instance()->colour_conversions().front().conversion, - time + EYES_BOTH, + PART_WHOLE, + Config::instance()->colour_conversions().front().conversion ) ); } -shared_ptr -Player::content_to_dcp ( - shared_ptr content, - ContentVideo content_video, - list > subs, - DCPTime time, - dcp::Size image_size) const -{ - shared_ptr dcp_video ( - new DCPVideo ( - content_video.image, - content_video.eyes, - content->crop (), - image_size, - _video_container_size, - _film->scaler(), - content->colour_conversion (), - time - ) - ); - - - /* Add subtitles */ - - list sub_images; - - for (list >::const_iterator i = subs.begin(); i != subs.end(); ++i) { - shared_ptr subtitle_decoder = dynamic_pointer_cast ((*i)->decoder); - shared_ptr subtitle_content = dynamic_pointer_cast ((*i)->content); - ContentTime const from = dcp_to_content_subtitle (*i, time); - ContentTime const to = from + ContentTime::from_frames (1, content->video_frame_rate ()); - - list > image_subtitles = subtitle_decoder->get_image_subtitles (from, to); - if (!image_subtitles.empty ()) { - list im = process_content_image_subtitles ( - subtitle_content, - image_subtitles - ); - - copy (im.begin(), im.end(), back_inserter (sub_images)); - } - - if (_burn_subtitles) { - list > text_subtitles = subtitle_decoder->get_text_subtitles (from, to); - if (!text_subtitles.empty ()) { - list im = process_content_text_subtitles (text_subtitles); - copy (im.begin(), im.end(), back_inserter (sub_images)); - } - } - } - - if (!sub_images.empty ()) { - dcp_video->set_subtitle (merge (sub_images)); - } - - return dcp_video; -} - -/** @return All DCPVideo at the given time (there may be two frames for 3D) */ -list > +/** @return All PlayerVideos at the given time (there may be two frames for 3D) */ +list > Player::get_video (DCPTime time, bool accurate) { if (!_have_valid_pieces) { @@ -375,44 +322,94 @@ Player::get_video (DCPTime time, bool accurate) time + DCPTime::from_frames (1, _film->video_frame_rate ()) ); - list > dcp_video; - + list > pvf; + if (ov.empty ()) { /* No video content at this time */ - dcp_video.push_back (black_dcp_video (time)); - return dcp_video; - } - - /* Create a DCPVideo from the content's video at this time */ + pvf.push_back (black_player_video_frame ()); + } else { + /* Create a PlayerVideo from the content's video at this time */ - shared_ptr piece = ov.back (); - shared_ptr decoder = dynamic_pointer_cast (piece->decoder); - assert (decoder); - shared_ptr content = dynamic_pointer_cast (piece->content); - assert (content); + shared_ptr piece = ov.back (); + shared_ptr decoder = dynamic_pointer_cast (piece->decoder); + assert (decoder); + shared_ptr content = dynamic_pointer_cast (piece->content); + assert (content); - list content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate); - if (content_video.empty ()) { - dcp_video.push_back (black_dcp_video (time)); - return dcp_video; + list content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate); + if (content_video.empty ()) { + pvf.push_back (black_player_video_frame ()); + return pvf; + } + + dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ()); + if (_approximate_size) { + image_size.width &= ~3; + image_size.height &= ~3; + } + + for (list::const_iterator i = content_video.begin(); i != content_video.end(); ++i) { + pvf.push_back ( + shared_ptr ( + new PlayerVideo ( + i->image, + content->crop (), + image_size, + _video_container_size, + _film->scaler(), + i->eyes, + i->part, + content->colour_conversion () + ) + ) + ); + } } - dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ()); - if (_approximate_size) { - image_size.width &= ~3; - image_size.height &= ~3; - } + /* Add subtitles to whatever PlayerVideos we got */ + + list > subs = overlaps ( + time, + time + DCPTime::from_frames (1, _film->video_frame_rate ()) + ); - for (list::const_iterator i = content_video.begin(); i != content_video.end(); ++i) { - list > subs = overlaps ( - time, - time + DCPTime::from_frames (1, _film->video_frame_rate ()) - ); + list sub_images; + + for (list >::const_iterator j = subs.begin(); j != subs.end(); ++j) { + shared_ptr subtitle_content = dynamic_pointer_cast ((*j)->content); + if (!subtitle_content->subtitle_use ()) { + continue; + } + + shared_ptr subtitle_decoder = dynamic_pointer_cast ((*j)->decoder); + ContentTime const from = dcp_to_content_subtitle (*j, time); + /* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */ + ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ()); + + list > image_subtitles = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to)); + if (!image_subtitles.empty ()) { + list im = process_content_image_subtitles ( + subtitle_content, + image_subtitles + ); + + copy (im.begin(), im.end(), back_inserter (sub_images)); + } - dcp_video.push_back (content_to_dcp (content, *i, subs, time, image_size)); + list > text_subtitles = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to)); + if (!text_subtitles.empty ()) { + list im = process_content_text_subtitles (text_subtitles); + copy (im.begin(), im.end(), back_inserter (sub_images)); + } } + + if (!sub_images.empty ()) { + for (list >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) { + (*i)->set_subtitle (merge (sub_images)); + } + } - return dcp_video; + return pvf; } shared_ptr @@ -439,7 +436,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) shared_ptr decoder = dynamic_pointer_cast ((*i)->decoder); assert (decoder); - if (content->content_audio_frame_rate() == 0) { + if (content->audio_frame_rate() == 0) { /* This AudioContent has no audio (e.g. if it is an FFmpegContent with no * audio stream). */ @@ -504,7 +501,7 @@ Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ DCPTime s = t - piece->content->position (); - s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (max (DCPTime::Type (0), s.get ())); s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); /* Convert this to the content frame */ @@ -516,7 +513,7 @@ Player::dcp_to_content_audio (shared_ptr piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ DCPTime s = t - piece->content->position (); - s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (max (DCPTime::Type (0), s.get ())); s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); /* Convert this to the content frame */ @@ -528,17 +525,17 @@ Player::dcp_to_content_subtitle (shared_ptr piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ DCPTime s = t - piece->content->position (); - s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (max (DCPTime::Type (0), s.get ())); s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); - return ContentTime (s, piece->frc); + return ContentTime (s + piece->content->trim_start(), piece->frc); } void PlayerStatistics::dump (shared_ptr log) const { - log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat)); - log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence.seconds())); + log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat), Log::TYPE_GENERAL); + log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence.seconds()), Log::TYPE_GENERAL); } PlayerStatistics const &