X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=12c03e3066ad4c47ed311ee454f2c482c0eabe5e;hb=64e7d484e2a481ff87fc6d80f092c310c3eae67e;hp=c1a6c0f3c92f3a665f598f96d70d42ee59667b4c;hpb=3a7b6acdb993864f319a6ceb3bc4c3fb7d4aaefd;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index c1a6c0f3c..12c03e306 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -87,7 +87,7 @@ int const PlayerProperty::DCP_DECODE_REDUCTION = 704; Player::Player (shared_ptr film, shared_ptr playlist) : _film (film) , _playlist (playlist) - , _have_valid_pieces (false) + , _suspended (false) , _ignore_video (false) , _ignore_audio (false) , _ignore_text (false) @@ -97,13 +97,17 @@ Player::Player (shared_ptr film, shared_ptr playlist , _audio_merger (_film->audio_frame_rate()) , _shuffler (0) { - _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)); + _film_changed_connection = _film->Change.connect (bind (&Player::film_change, this, _1, _2)); + /* The butler must hear about this first, so since we are proxying this through to the butler we must + be first. + */ + _playlist_change_connection = _playlist->Change.connect (bind (&Player::playlist_change, this, _1), boost::signals2::at_front); + _playlist_content_change_connection = _playlist->ContentChange.connect (bind(&Player::playlist_content_change, this, _1, _3, _4)); set_video_container_size (_film->frame_size ()); - film_changed (Film::AUDIO_PROCESSOR); + film_change (CHANGE_TYPE_DONE, Film::AUDIO_PROCESSOR); + setup_pieces (); seek (DCPTime (), true); } @@ -114,6 +118,13 @@ Player::~Player () void Player::setup_pieces () +{ + boost::mutex::scoped_lock lm (_mutex); + setup_pieces_unlocked (); +} + +void +Player::setup_pieces_unlocked () { _pieces.clear (); @@ -188,7 +199,7 @@ Player::setup_pieces () bind(&Player::plain_text_start, this, weak_ptr(piece), weak_ptr((*j)->content()), _1) ); (*j)->Stop.connect ( - bind(&Player::subtitle_stop, this, weak_ptr(piece), weak_ptr((*j)->content()), _1, _2) + bind(&Player::subtitle_stop, this, weak_ptr(piece), weak_ptr((*j)->content()), _1) ); ++j; @@ -210,72 +221,40 @@ Player::setup_pieces () _last_video_time = DCPTime (); _last_video_eyes = EYES_BOTH; _last_audio_time = DCPTime (); - _have_valid_pieces = true; + _suspended = false; } void -Player::playlist_content_changed (weak_ptr w, int property, bool frequent) +Player::playlist_content_change (ChangeType type, int property, bool frequent) { - shared_ptr c = w.lock (); - if (!c) { - return; + if (type == CHANGE_TYPE_PENDING) { + boost::mutex::scoped_lock lm (_mutex); + /* The player content is probably about to change, so we can't carry on + until that has happened and we've rebuilt our pieces. Stop pass() + and seek() from working until then. + */ + _suspended = true; + } else if (type == CHANGE_TYPE_DONE) { + /* A change in our content has gone through. Re-build our pieces. */ + setup_pieces (); + } else if (type == CHANGE_TYPE_CANCELLED) { + _suspended = false; } - if ( - property == ContentProperty::POSITION || - property == ContentProperty::LENGTH || - property == ContentProperty::TRIM_START || - property == ContentProperty::TRIM_END || - property == ContentProperty::PATH || - property == VideoContentProperty::FRAME_TYPE || - property == VideoContentProperty::COLOUR_CONVERSION || - property == AudioContentProperty::STREAMS || - property == DCPContentProperty::NEEDS_ASSETS || - property == DCPContentProperty::NEEDS_KDM || - property == TextContentProperty::COLOUR || - property == TextContentProperty::EFFECT || - property == TextContentProperty::EFFECT_COLOUR || - property == FFmpegContentProperty::SUBTITLE_STREAM || - property == FFmpegContentProperty::FILTERS - ) { - - { - boost::mutex::scoped_lock lm (_mutex); - _have_valid_pieces = false; - } - - Changed (property, frequent); - - } else if ( - property == TextContentProperty::LINE_SPACING || - property == TextContentProperty::OUTLINE_WIDTH || - property == TextContentProperty::Y_SCALE || - property == TextContentProperty::FADE_IN || - property == TextContentProperty::FADE_OUT || - property == ContentProperty::VIDEO_FRAME_RATE || - property == TextContentProperty::USE || - property == TextContentProperty::X_OFFSET || - property == TextContentProperty::Y_OFFSET || - property == TextContentProperty::X_SCALE || - property == TextContentProperty::FONTS || - property == TextContentProperty::TYPE || - property == VideoContentProperty::CROP || - property == VideoContentProperty::SCALE || - property == VideoContentProperty::FADE_IN || - property == VideoContentProperty::FADE_OUT - ) { - - Changed (property, frequent); - } + Change (type, property, frequent); } void Player::set_video_container_size (dcp::Size s) { + Change (CHANGE_TYPE_PENDING, PlayerProperty::VIDEO_CONTAINER_SIZE, false); + { boost::mutex::scoped_lock lm (_mutex); if (s == _video_container_size) { + lm.unlock (); + Change (CHANGE_TYPE_CANCELLED, PlayerProperty::VIDEO_CONTAINER_SIZE, false); return; } @@ -285,22 +264,20 @@ Player::set_video_container_size (dcp::Size s) _black_image->make_black (); } - Changed (PlayerProperty::VIDEO_CONTAINER_SIZE, false); + Change (CHANGE_TYPE_DONE, PlayerProperty::VIDEO_CONTAINER_SIZE, false); } void -Player::playlist_changed () +Player::playlist_change (ChangeType type) { - { - boost::mutex::scoped_lock lm (_mutex); - _have_valid_pieces = false; + if (type == CHANGE_TYPE_DONE) { + setup_pieces (); } - - Changed (PlayerProperty::PLAYLIST, false); + Change (type, PlayerProperty::PLAYLIST, false); } void -Player::film_changed (Film::Property p) +Player::film_change (ChangeType type, Film::Property p) { /* Here we should notice Film properties that affect our output, and alert listeners that our output now would be different to how it was @@ -308,24 +285,25 @@ Player::film_changed (Film::Property p) */ if (p == Film::CONTAINER) { - Changed (PlayerProperty::FILM_CONTAINER, false); + Change (type, PlayerProperty::FILM_CONTAINER, false); } else if (p == Film::VIDEO_FRAME_RATE) { /* Pieces contain a FrameRateChange which contains the DCP frame rate, so we need new pieces here. */ - { - boost::mutex::scoped_lock lm (_mutex); - _have_valid_pieces = false; + if (type == CHANGE_TYPE_DONE) { + setup_pieces (); } - Changed (PlayerProperty::FILM_VIDEO_FRAME_RATE, false); + Change (type, PlayerProperty::FILM_VIDEO_FRAME_RATE, false); } else if (p == Film::AUDIO_PROCESSOR) { - if (_film->audio_processor ()) { + if (type == CHANGE_TYPE_DONE && _film->audio_processor ()) { boost::mutex::scoped_lock lm (_mutex); _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ()); } } else if (p == Film::AUDIO_CHANNELS) { - boost::mutex::scoped_lock lm (_mutex); - _audio_merger.clear (); + if (type == CHANGE_TYPE_DONE) { + boost::mutex::scoped_lock lm (_mutex); + _audio_merger.clear (); + } } } @@ -441,11 +419,7 @@ Player::content_time_to_dcp (shared_ptr piece, ContentTime t) const list > Player::get_subtitle_fonts () { - /* Does not require a lock on _mutex as it's only called from DCPEncoder */ - - if (!_have_valid_pieces) { - setup_pieces (); - } + boost::mutex::scoped_lock lm (_mutex); list > fonts; BOOST_FOREACH (shared_ptr i, _pieces) { @@ -467,7 +441,7 @@ Player::set_ignore_video () { boost::mutex::scoped_lock lm (_mutex); _ignore_video = true; - _have_valid_pieces = false; + setup_pieces_unlocked (); } void @@ -475,7 +449,7 @@ Player::set_ignore_audio () { boost::mutex::scoped_lock lm (_mutex); _ignore_audio = true; - _have_valid_pieces = false; + setup_pieces_unlocked (); } void @@ -483,6 +457,7 @@ Player::set_ignore_text () { boost::mutex::scoped_lock lm (_mutex); _ignore_text = true; + setup_pieces_unlocked (); } /** Set the player to always burn open texts into the image regardless of the content settings */ @@ -499,7 +474,7 @@ Player::set_fast () { boost::mutex::scoped_lock lm (_mutex); _fast = true; - _have_valid_pieces = false; + setup_pieces_unlocked (); } void @@ -507,7 +482,7 @@ Player::set_play_referenced () { boost::mutex::scoped_lock lm (_mutex); _play_referenced = true; - _have_valid_pieces = false; + setup_pieces_unlocked (); } list @@ -571,13 +546,14 @@ Player::get_reel_assets () } if (j->reference_text (TEXT_CLOSED_CAPTION)) { - shared_ptr ra = k->closed_caption (); - DCPOMATIC_ASSERT (ra); - ra->set_entry_point (ra->entry_point() + trim_start); - ra->set_duration (ra->duration() - trim_start - trim_end); - a.push_back ( - ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr))) - ); + BOOST_FOREACH (shared_ptr l, k->closed_captions()) { + DCPOMATIC_ASSERT (l); + l->set_entry_point (l->entry_point() + trim_start); + l->set_duration (l->duration() - trim_start - trim_end); + a.push_back ( + ReferencedReelAsset (l, DCPTimePeriod (from, from + DCPTime::from_frames (l->duration(), ffr))) + ); + } } /* Assume that main picture duration is the length of the reel */ @@ -593,8 +569,9 @@ Player::pass () { boost::mutex::scoped_lock lm (_mutex); - if (!_have_valid_pieces) { - setup_pieces (); + if (_suspended) { + /* We can't pass in this state */ + return false; } if (_playlist->length() == DCPTime()) { @@ -787,12 +764,20 @@ Player::video (weak_ptr wp, ContentVideo video) DCPTime fill_from = max (*_last_video_time, piece->content->position()); LastVideoMap::const_iterator last = _last_video.find (wp); if (_film->three_d()) { + Eyes fill_to_eyes = video.eyes; + if (fill_to_eyes == EYES_BOTH) { + fill_to_eyes = EYES_LEFT; + } + if (fill_to == piece->content->end()) { + /* Don't fill after the end of the content */ + fill_to_eyes = EYES_LEFT; + } DCPTime j = fill_from; Eyes eyes = _last_video_eyes.get_value_or(EYES_LEFT); if (eyes == EYES_BOTH) { eyes = EYES_LEFT; } - while (j < fill_to || eyes != video.eyes) { + while (j < fill_to || eyes != fill_to_eyes) { if (last != _last_video.end()) { shared_ptr copy = last->second->shallow_copy(); copy->set_eyes (eyes); @@ -931,10 +916,13 @@ Player::bitmap_text_start (weak_ptr wp, weak_ptr wc, C subtitle.sub.rectangle.height *= text->y_scale (); PlayerText ps; - ps.bitmap.push_back (subtitle.sub); + shared_ptr image = subtitle.sub.image; + /* We will scale the subtitle up to fit _video_container_size */ + dcp::Size scaled_size (subtitle.sub.rectangle.width * _video_container_size.width, subtitle.sub.rectangle.height * _video_container_size.height); + ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUV_TO_RGB_REC601, image->pixel_format(), true, _fast), subtitle.sub.rectangle)); DCPTime from (content_time_to_dcp (piece, subtitle.from())); - _active_texts[subtitle.type()].add_from (wc, ps, from); + _active_texts[text->type()].add_from (wc, ps, from); } void @@ -978,19 +966,23 @@ Player::plain_text_start (weak_ptr wp, weak_ptr wc, Co ps.add_fonts (text->fonts ()); } - _active_texts[subtitle.type()].add_from (wc, ps, from); + _active_texts[text->type()].add_from (wc, ps, from); } void -Player::subtitle_stop (weak_ptr wp, weak_ptr wc, ContentTime to, TextType type) +Player::subtitle_stop (weak_ptr wp, weak_ptr wc, ContentTime to) { - if (!_active_texts[type].have (wc)) { + shared_ptr text = wc.lock (); + if (!text) { + return; + } + + if (!_active_texts[text->type()].have(wc)) { return; } shared_ptr piece = wp.lock (); - shared_ptr text = wc.lock (); - if (!piece || !text) { + if (!piece) { return; } @@ -1000,11 +992,11 @@ Player::subtitle_stop (weak_ptr wp, weak_ptr wc, Conte return; } - pair from = _active_texts[type].add_to (wc, dcp_to); + pair from = _active_texts[text->type()].add_to (wc, dcp_to); - bool const always = (type == TEXT_OPEN_SUBTITLE && _always_burn_open_subtitles); + bool const always = (text->type() == TEXT_OPEN_SUBTITLE && _always_burn_open_subtitles); if (text->use() && !always && !text->burn()) { - Text (from.first, type, DCPTimePeriod (from.second, dcp_to)); + Text (from.first, text->type(), text->dcp_track().get_value_or(DCPTextTrack()), DCPTimePeriod (from.second, dcp_to)); } } @@ -1013,8 +1005,9 @@ Player::seek (DCPTime time, bool accurate) { boost::mutex::scoped_lock lm (_mutex); - if (!_have_valid_pieces) { - setup_pieces (); + if (_suspended) { + /* We can't seek in this state */ + return; } if (_shuffler) { @@ -1161,35 +1154,35 @@ Player::discard_audio (shared_ptr audio, DCPTime time, DCPTi void Player::set_dcp_decode_reduction (optional reduction) { + Change (CHANGE_TYPE_PENDING, PlayerProperty::DCP_DECODE_REDUCTION, false); + { boost::mutex::scoped_lock lm (_mutex); if (reduction == _dcp_decode_reduction) { + lm.unlock (); + Change (CHANGE_TYPE_CANCELLED, PlayerProperty::DCP_DECODE_REDUCTION, false); return; } _dcp_decode_reduction = reduction; - _have_valid_pieces = false; + setup_pieces_unlocked (); } - Changed (PlayerProperty::DCP_DECODE_REDUCTION, false); + Change (CHANGE_TYPE_DONE, PlayerProperty::DCP_DECODE_REDUCTION, false); } -DCPTime +optional Player::content_time_to_dcp (shared_ptr content, ContentTime t) { boost::mutex::scoped_lock lm (_mutex); - if (_have_valid_pieces) { - setup_pieces (); - } - BOOST_FOREACH (shared_ptr i, _pieces) { if (i->content == content) { return content_time_to_dcp (i, t); } } - DCPOMATIC_ASSERT (false); - return DCPTime (); + /* We couldn't find this content; perhaps things are being changed over */ + return optional(); }