X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=a40c65cd54027e7a553ea416098793302f490533;hb=1d68fe1e3ad1a9aa85fa7fc6071a0b8c64973953;hp=be1268f48a02fcdafb4985431cfdb1e5e2fff50d;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index be1268f48..a40c65cd5 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -45,6 +45,7 @@ #include "dcp_subtitle_content.h" #include "dcp_subtitle_decoder.h" #include "audio_processor.h" +#include "playlist.h" #include #include #include @@ -68,14 +69,16 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; -Player::Player (shared_ptr film) +Player::Player (shared_ptr film, shared_ptr playlist) : _film (film) + , _playlist (playlist) , _have_valid_pieces (false) , _ignore_video (false) - , _burn_subtitles (film->burn_subtitles ()) + , _always_burn_subtitles (false) { - _film_content_changed_connection = _film->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3)); _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); + _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); + _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::playlist_content_changed, this, _1, _2, _3)); set_video_container_size (_film->frame_size ()); film_changed (Film::AUDIO_PROCESSOR); @@ -87,11 +90,9 @@ Player::setup_pieces () list > old_pieces = _pieces; _pieces.clear (); - ContentList content = _film->content (); + BOOST_FOREACH (shared_ptr i, _playlist->content ()) { - for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { - - if (!(*i)->paths_valid ()) { + if (!i->paths_valid ()) { continue; } @@ -101,13 +102,13 @@ Player::setup_pieces () /* Work out a FrameRateChange for the best overlap video for this content, in case we need it below */ DCPTime best_overlap_t; shared_ptr best_overlap; - for (ContentList::iterator j = content.begin(); j != content.end(); ++j) { - shared_ptr vc = dynamic_pointer_cast (*j); + BOOST_FOREACH (shared_ptr j, _playlist->content ()) { + shared_ptr vc = dynamic_pointer_cast (j); if (!vc) { continue; } - DCPTime const overlap = max (vc->position(), (*i)->position()) - min (vc->end(), (*i)->end()); + DCPTime const overlap = max (vc->position(), i->position()) - min (vc->end(), i->end()); if (overlap > best_overlap_t) { best_overlap = vc; best_overlap_t = overlap; @@ -123,20 +124,20 @@ Player::setup_pieces () } /* FFmpeg */ - shared_ptr fc = dynamic_pointer_cast (*i); + shared_ptr fc = dynamic_pointer_cast (i); if (fc) { decoder.reset (new FFmpegDecoder (fc, _film->log())); frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate()); } - shared_ptr dc = dynamic_pointer_cast (*i); + shared_ptr dc = dynamic_pointer_cast (i); if (dc) { decoder.reset (new DCPDecoder (dc)); frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate()); } /* ImageContent */ - shared_ptr ic = dynamic_pointer_cast (*i); + shared_ptr ic = dynamic_pointer_cast (i); if (ic) { /* See if we can re-use an old ImageDecoder */ for (list >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) { @@ -154,21 +155,21 @@ Player::setup_pieces () } /* SndfileContent */ - shared_ptr sc = dynamic_pointer_cast (*i); + shared_ptr sc = dynamic_pointer_cast (i); if (sc) { decoder.reset (new SndfileDecoder (sc)); frc = best_overlap_frc; } /* SubRipContent */ - shared_ptr rc = dynamic_pointer_cast (*i); + shared_ptr rc = dynamic_pointer_cast (i); if (rc) { decoder.reset (new SubRipDecoder (rc)); frc = best_overlap_frc; } /* DCPSubtitleContent */ - shared_ptr dsc = dynamic_pointer_cast (*i); + shared_ptr dsc = dynamic_pointer_cast (i); if (dsc) { decoder.reset (new DCPSubtitleDecoder (dsc)); frc = best_overlap_frc; @@ -179,14 +180,14 @@ Player::setup_pieces () vd->set_ignore_video (); } - _pieces.push_back (shared_ptr (new Piece (*i, decoder, frc.get ()))); + _pieces.push_back (shared_ptr (new Piece (i, decoder, frc.get ()))); } _have_valid_pieces = true; } void -Player::content_changed (weak_ptr w, int property, bool frequent) +Player::playlist_content_changed (weak_ptr w, int property, bool frequent) { shared_ptr c = w.lock (); if (!c) { @@ -212,11 +213,13 @@ Player::content_changed (weak_ptr w, int property, bool frequent) property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || property == SubtitleContentProperty::SUBTITLE_X_SCALE || property == SubtitleContentProperty::SUBTITLE_Y_SCALE || + property == SubtitleContentProperty::FONTS || property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE || property == VideoContentProperty::VIDEO_FRAME_RATE || property == VideoContentProperty::VIDEO_FADE_IN || - property == VideoContentProperty::VIDEO_FADE_OUT + property == VideoContentProperty::VIDEO_FADE_OUT || + property == VideoContentProperty::COLOUR_CONVERSION ) { Changed (frequent); @@ -232,6 +235,13 @@ Player::set_video_container_size (dcp::Size s) _black_image->make_black (); } +void +Player::playlist_changed () +{ + _have_valid_pieces = false; + Changed (false); +} + void Player::film_changed (Film::Property p) { @@ -240,10 +250,7 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::CONTENT) { - _have_valid_pieces = false; - Changed (false); - } else if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { + if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { Changed (false); } else if (p == Film::AUDIO_PROCESSOR) { if (_film->audio_processor ()) { @@ -286,8 +293,8 @@ Player::transform_image_subtitles (list subs) const true ), Position ( - rint (_video_container_size.width * i->rectangle.x), - rint (_video_container_size.height * i->rectangle.y) + lrint (_video_container_size.width * i->rectangle.x), + lrint (_video_container_size.height * i->rectangle.y) ) ) ); @@ -304,7 +311,7 @@ Player::black_player_video_frame (DCPTime time) const shared_ptr (new RawImageProxy (_black_image)), time, Crop (), - optional (), + optional (), _video_container_size, _video_container_size, EYES_BOTH, @@ -322,6 +329,29 @@ Player::get_video (DCPTime time, bool accurate) setup_pieces (); } + /* Find subtitles for possible burn-in */ + + PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true); + + list sub_images; + + /* Image subtitles */ + list c = transform_image_subtitles (ps.image); + copy (c.begin(), c.end(), back_inserter (sub_images)); + + /* Text subtitles (rendered to an image) */ + if (!ps.text.empty ()) { + list s = render_subtitles (ps.text, ps.fonts, _video_container_size); + copy (s.begin (), s.end (), back_inserter (sub_images)); + } + + optional subtitles; + if (!sub_images.empty ()) { + subtitles = merge (sub_images); + } + + /* Find pieces containing video which is happening now */ + list > ov = overlaps ( time, time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta() @@ -333,60 +363,61 @@ Player::get_video (DCPTime time, bool accurate) /* No video content at this time */ pvf.push_back (black_player_video_frame (time)); } 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); - DCPOMATIC_ASSERT (decoder); - shared_ptr content = dynamic_pointer_cast (piece->content); - DCPOMATIC_ASSERT (content); - - list content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate); - if (content_video.empty ()) { - pvf.push_back (black_player_video_frame (time)); - return pvf; - } - - dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ()); - - for (list::const_iterator i = content_video.begin(); i != content_video.end(); ++i) { - pvf.push_back ( - shared_ptr ( - new PlayerVideo ( - i->image, - content_video_to_dcp (piece, i->frame), - content->crop (), - content->fade (i->frame), - image_size, - _video_container_size, - i->eyes, - i->part, - content->colour_conversion () - ) - ) - ); + /* Some video content at this time */ + shared_ptr last = *(ov.rbegin ()); + VideoFrameType const last_type = dynamic_pointer_cast (last->content)->video_frame_type (); + + /* Get video from appropriate piece(s) */ + BOOST_FOREACH (shared_ptr piece, ov) { + + shared_ptr decoder = dynamic_pointer_cast (piece->decoder); + DCPOMATIC_ASSERT (decoder); + shared_ptr video_content = dynamic_pointer_cast (piece->content); + DCPOMATIC_ASSERT (video_content); + + bool const use = + /* always use the last video */ + piece == last || + /* with a corresponding L/R eye if appropriate */ + (last_type == VIDEO_FRAME_TYPE_3D_LEFT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) || + (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_LEFT); + + if (use) { + /* We want to use this piece */ + list content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate); + if (content_video.empty ()) { + pvf.push_back (black_player_video_frame (time)); + } else { + dcp::Size image_size = video_content->scale().size (video_content, _video_container_size, _film->frame_size ()); + + for (list::const_iterator i = content_video.begin(); i != content_video.end(); ++i) { + pvf.push_back ( + shared_ptr ( + new PlayerVideo ( + i->image, + content_video_to_dcp (piece, i->frame), + video_content->crop (), + video_content->fade (i->frame), + image_size, + _video_container_size, + i->eyes, + i->part, + video_content->colour_conversion () + ) + ) + ); + } + } + } else { + /* Discard unused video */ + decoder->get_video (dcp_to_content_video (piece, time), accurate); + } } } - /* Add subtitles (for possible burn-in) to whatever PlayerVideos we got */ - - PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false); - - list sub_images; - - /* Image subtitles */ - list c = transform_image_subtitles (ps.image); - copy (c.begin(), c.end(), back_inserter (sub_images)); - - /* Text subtitles (rendered to an image) */ - if (_burn_subtitles && !ps.text.empty ()) { - list s = render_subtitles (ps.text, _video_container_size); - copy (s.begin (), s.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)); + if (subtitles) { + BOOST_FOREACH (shared_ptr p, pvf) { + p->set_subtitle (subtitles.get ()); } } @@ -400,7 +431,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) setup_pieces (); } - Frame const length_frames = length.frames (_film->audio_frame_rate ()); + Frame const length_frames = length.frames_round (_film->audio_frame_rate ()); shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); audio->make_silent (); @@ -426,17 +457,22 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) the stuff we get back. */ offset = -request; - request_frames += request.frames (_film->audio_frame_rate ()); + request_frames += request.frames_round (_film->audio_frame_rate ()); if (request_frames < 0) { request_frames = 0; } request = DCPTime (); } - Frame const content_frame = dcp_to_content_audio (*i, request); + Frame const content_frame = dcp_to_resampled_audio (*i, request); BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { + if (j->channels() == 0) { + /* Some content (e.g. DCPs) can have streams with no channels */ + continue; + } + /* Audio from this piece's decoder stream (which might be more or less than what we asked for) */ ContentAudio all = decoder->get_audio (j, content_frame, request_frames, accurate); @@ -473,7 +509,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) audio->accumulate_frames ( all.audio.get(), content_frame - all.frame, - offset.frames (_film->audio_frame_rate()), + offset.frames_round (_film->audio_frame_rate()), min (Frame (all.audio->frames()), request_frames) ); } @@ -485,64 +521,43 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) Frame Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const { - /* s is the offset of t from the start position of this content */ + shared_ptr vc = dynamic_pointer_cast (piece->content); DCPTime s = t - piece->content->position (); - 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 */ - return DCPTime (s + piece->content->trim_start()).frames (_film->video_frame_rate()) / piece->frc.factor (); + s = min (piece->content->length_after_trim(), s); + return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start ()).frames_round (vc->video_frame_rate ()); } DCPTime Player::content_video_to_dcp (shared_ptr piece, Frame f) const { - DCPTime t = DCPTime::from_frames (f * piece->frc.factor (), _film->video_frame_rate()) - piece->content->trim_start () + piece->content->position (); - if (t < DCPTime ()) { - t = DCPTime (); - } - - return t; + shared_ptr vc = dynamic_pointer_cast (piece->content); + ContentTime const c = ContentTime::from_frames (f, vc->video_frame_rate ()) - piece->content->trim_start (); + return max (DCPTime (), DCPTime (c, piece->frc) + piece->content->position ()); } Frame -Player::dcp_to_content_audio (shared_ptr piece, DCPTime t) const +Player::dcp_to_resampled_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 (DCPTime::Type (0), s.get ())); - s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); - - /* Convert this to the content frame */ - return DCPTime (s + piece->content->trim_start()).frames (_film->audio_frame_rate()); + s = min (piece->content->length_after_trim(), s); + /* See notes in dcp_to_content_video */ + return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ()); } ContentTime 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 (DCPTime::Type (0), s.get ())); - s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); - - 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::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 & -Player::statistics () const -{ - return _statistics; + s = min (piece->content->length_after_trim(), s); + return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start()); } +/** @param burnt true to return only subtitles to be burnt, false to return only + * subtitles that should not be burnt. This parameter will be ignored if + * _always_burn_subtitles is true; in this case, all subtitles will be returned. + */ PlayerSubtitles -Player::get_subtitles (DCPTime time, DCPTime length, bool starting) +Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt) { list > subs = overlaps (time, time + length); @@ -550,7 +565,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting) for (list >::const_iterator j = subs.begin(); j != subs.end(); ++j) { shared_ptr subtitle_content = dynamic_pointer_cast ((*j)->content); - if (!subtitle_content->use_subtitles ()) { + if (!subtitle_content->use_subtitles () || (!_always_burn_subtitles && (burnt != subtitle_content->burn_subtitles ()))) { continue; } @@ -590,6 +605,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting) s.set_aspect_adjust (xs / ys); } ps.text.push_back (s); + ps.add_fonts (subtitle_content->fonts ()); } } } @@ -626,11 +642,12 @@ Player::set_ignore_video () _ignore_video = true; } -/** Set whether or not this player should burn text subtitles into the image. - * @param burn true to burn subtitles, false to not. +/** Set whether or not this player should always burn text subtitles into the image, + * regardless of the content settings. + * @param burn true to always burn subtitles, false to obey content settings. */ void -Player::set_burn_subtitles (bool burn) +Player::set_always_burn_subtitles (bool burn) { - _burn_subtitles = burn; + _always_burn_subtitles = burn; }