X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=b939995ef7bbaa7c5fdc6953be645da0fe803295;hb=e4dc7972ec35d891287598f33a1b4e1461ddc3fc;hp=6fcf57949d8340e1a225a4c2c7dd2f9a71546a88;hpb=cd810b7658b0f4910c093ac191c2b4ba06ba0677;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 6fcf57949..b939995ef 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -28,7 +28,7 @@ #include "raw_image_proxy.h" #include "ratio.h" #include "log.h" -#include "render_subtitles.h" +#include "render_text.h" #include "config.h" #include "content_video.h" #include "player_video.h" @@ -40,11 +40,10 @@ #include "decoder.h" #include "video_decoder.h" #include "audio_decoder.h" -#include "subtitle_content.h" -#include "subtitle_decoder.h" +#include "text_content.h" +#include "text_decoder.h" #include "ffmpeg_content.h" #include "audio_content.h" -#include "content_subtitle.h" #include "dcp_decoder.h" #include "image_decoder.h" #include "compose.hpp" @@ -53,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -87,22 +87,27 @@ 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_subtitle (false) - , _always_burn_subtitles (false) + , _ignore_audio (false) + , _ignore_text (false) + , _always_burn_open_subtitles (false) , _fast (false) , _play_referenced (false) , _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); } @@ -113,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 (); @@ -126,6 +138,11 @@ Player::setup_pieces () continue; } + if (_ignore_video && _ignore_audio && i->text.empty()) { + /* We're only interested in text and this content has none */ + continue; + } + shared_ptr decoder = decoder_factory (i, _film->log(), _fast); FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate()); @@ -138,8 +155,14 @@ Player::setup_pieces () decoder->video->set_ignore (true); } - if (decoder->subtitle && _ignore_subtitle) { - decoder->subtitle->set_ignore (true); + if (decoder->audio && _ignore_audio) { + decoder->audio->set_ignore (true); + } + + if (_ignore_text) { + BOOST_FOREACH (shared_ptr i, decoder->text) { + i->set_ignore (true); + } } shared_ptr dcp = dynamic_pointer_cast (decoder); @@ -166,10 +189,20 @@ Player::setup_pieces () decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr (piece), _1, _2)); } - if (decoder->subtitle) { - decoder->subtitle->ImageStart.connect (bind (&Player::image_subtitle_start, this, weak_ptr (piece), _1)); - decoder->subtitle->TextStart.connect (bind (&Player::text_subtitle_start, this, weak_ptr (piece), _1)); - decoder->subtitle->Stop.connect (bind (&Player::subtitle_stop, this, weak_ptr (piece), _1)); + list >::const_iterator j = decoder->text.begin(); + + while (j != decoder->text.end()) { + (*j)->BitmapStart.connect ( + bind(&Player::bitmap_text_start, this, weak_ptr(piece), weak_ptr((*j)->content()), _1) + ); + (*j)->PlainStart.connect ( + 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) + ); + + ++j; } } @@ -188,83 +221,63 @@ 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 == DCPContentProperty::NEEDS_ASSETS || - property == DCPContentProperty::NEEDS_KDM || - property == SubtitleContentProperty::COLOUR || - property == SubtitleContentProperty::EFFECT || - property == SubtitleContentProperty::EFFECT_COLOUR || - property == FFmpegContentProperty::SUBTITLE_STREAM || - property == FFmpegContentProperty::FILTERS || - property == VideoContentProperty::COLOUR_CONVERSION - ) { - - _have_valid_pieces = false; - Changed (property, frequent); - - } else if ( - property == SubtitleContentProperty::LINE_SPACING || - property == SubtitleContentProperty::OUTLINE_WIDTH || - property == SubtitleContentProperty::Y_SCALE || - property == SubtitleContentProperty::FADE_IN || - property == SubtitleContentProperty::FADE_OUT || - property == ContentProperty::VIDEO_FRAME_RATE || - property == SubtitleContentProperty::USE || - property == SubtitleContentProperty::X_OFFSET || - property == SubtitleContentProperty::Y_OFFSET || - property == SubtitleContentProperty::X_SCALE || - property == SubtitleContentProperty::FONTS || - 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) { - if (s == _video_container_size) { - return; - } + Change (CHANGE_TYPE_PENDING, PlayerProperty::VIDEO_CONTAINER_SIZE, false); + + { + boost::mutex::scoped_lock lm (_mutex); - _video_container_size = s; + if (s == _video_container_size) { + lm.unlock (); + Change (CHANGE_TYPE_CANCELLED, PlayerProperty::VIDEO_CONTAINER_SIZE, false); + return; + } - _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true)); - _black_image->make_black (); + _video_container_size = s; + + _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true)); + _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) { - _have_valid_pieces = false; - Changed (PlayerProperty::PLAYLIST, false); + if (type == CHANGE_TYPE_DONE) { + setup_pieces (); + } + 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 @@ -272,28 +285,34 @@ 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. */ - _have_valid_pieces = false; - Changed (PlayerProperty::FILM_VIDEO_FRAME_RATE, false); + if (type == CHANGE_TYPE_DONE) { + setup_pieces (); + } + 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) { - _audio_merger.clear (); + if (type == CHANGE_TYPE_DONE) { + boost::mutex::scoped_lock lm (_mutex); + _audio_merger.clear (); + } } } list -Player::transform_image_subtitles (list subs) const +Player::transform_bitmap_texts (list subs) const { list all; - for (list::const_iterator i = subs.begin(); i != subs.end(); ++i) { + for (list::const_iterator i = subs.begin(); i != subs.end(); ++i) { if (!i->image) { continue; } @@ -400,17 +419,15 @@ Player::content_time_to_dcp (shared_ptr piece, ContentTime t) const list > Player::get_subtitle_fonts () { - if (!_have_valid_pieces) { - setup_pieces (); - } + boost::mutex::scoped_lock lm (_mutex); list > fonts; - BOOST_FOREACH (shared_ptr& p, _pieces) { - if (p->content->subtitle) { + BOOST_FOREACH (shared_ptr i, _pieces) { + BOOST_FOREACH (shared_ptr j, i->content->text) { /* XXX: things may go wrong if there are duplicate font IDs with different font files. */ - list > f = p->content->subtitle->fonts (); + list > f = j->fonts (); copy (f.begin(), f.end(), back_inserter (fonts)); } } @@ -422,43 +439,57 @@ Player::get_subtitle_fonts () void Player::set_ignore_video () { + boost::mutex::scoped_lock lm (_mutex); _ignore_video = true; + setup_pieces_unlocked (); } void -Player::set_ignore_subtitle () +Player::set_ignore_audio () { - _ignore_subtitle = true; + boost::mutex::scoped_lock lm (_mutex); + _ignore_audio = true; + setup_pieces_unlocked (); } -/** 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_always_burn_subtitles (bool burn) +Player::set_ignore_text () { - _always_burn_subtitles = burn; + 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 */ +void +Player::set_always_burn_open_subtitles () +{ + boost::mutex::scoped_lock lm (_mutex); + _always_burn_open_subtitles = true; } /** Sets up the player to be faster, possibly at the expense of quality */ void Player::set_fast () { + boost::mutex::scoped_lock lm (_mutex); _fast = true; - _have_valid_pieces = false; + setup_pieces_unlocked (); } void Player::set_play_referenced () { + boost::mutex::scoped_lock lm (_mutex); _play_referenced = true; - _have_valid_pieces = false; + setup_pieces_unlocked (); } list Player::get_reel_assets () { + /* Does not require a lock on _mutex as it's only called from DCPEncoder */ + list a; BOOST_FOREACH (shared_ptr i, _playlist->content ()) { @@ -504,7 +535,7 @@ Player::get_reel_assets () ); } - if (j->reference_subtitle ()) { + if (j->reference_text (TEXT_OPEN_SUBTITLE)) { shared_ptr ra = k->main_subtitle (); DCPOMATIC_ASSERT (ra); ra->set_entry_point (ra->entry_point() + trim_start); @@ -514,6 +545,17 @@ Player::get_reel_assets () ); } + if (j->reference_text (TEXT_CLOSED_CAPTION)) { + 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 */ offset += k->main_picture()->duration (); } @@ -525,8 +567,11 @@ Player::get_reel_assets () bool Player::pass () { - if (!_have_valid_pieces) { - setup_pieces (); + boost::mutex::scoped_lock lm (_mutex); + + if (_suspended) { + /* We can't pass in this state */ + return false; } if (_playlist->length() == DCPTime()) { @@ -545,15 +590,15 @@ Player::pass () continue; } - DCPTime const t = content_time_to_dcp (i, i->decoder->position()); + DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start())); if (t > i->content->end()) { i->done = true; } else { - /* Given two choices at the same time, pick the one with a subtitle so we see it before + /* Given two choices at the same time, pick the one with texts so we see it before the video. */ - if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->decoder->subtitle)) { + if (!earliest_time || t < *earliest_time || (t == *earliest_time && !i->decoder->text.empty())) { earliest_time = t; earliest_content = i; } @@ -656,31 +701,34 @@ Player::pass () return done; } +/** @return Open subtitles for the frame at the given time, converted to images */ optional -Player::subtitles_for_frame (DCPTime time) const +Player::open_subtitles_for_frame (DCPTime time) const { - list subtitles; - + list captions; int const vfr = _film->video_frame_rate(); - BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) { + BOOST_FOREACH ( + PlayerText j, + _active_texts[TEXT_OPEN_SUBTITLE].get_burnt(DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_open_subtitles) + ) { - /* Image subtitles */ - list c = transform_image_subtitles (i.image); - copy (c.begin(), c.end(), back_inserter (subtitles)); + /* Bitmap subtitles */ + list c = transform_bitmap_texts (j.bitmap); + copy (c.begin(), c.end(), back_inserter (captions)); - /* Text subtitles (rendered to an image) */ - if (!i.text.empty ()) { - list s = render_subtitles (i.text, i.fonts, _video_container_size, time, vfr); - copy (s.begin(), s.end(), back_inserter (subtitles)); + /* String subtitles (rendered to an image) */ + if (!j.string.empty ()) { + list s = render_text (j.string, j.fonts, _video_container_size, time, vfr); + copy (s.begin(), s.end(), back_inserter (captions)); } } - if (subtitles.empty ()) { + if (captions.empty ()) { return optional (); } - return merge (subtitles); + return merge (captions); } void @@ -716,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); @@ -839,41 +895,43 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a } void -Player::image_subtitle_start (weak_ptr wp, ContentImageSubtitle subtitle) +Player::bitmap_text_start (weak_ptr wp, weak_ptr wc, ContentBitmapText subtitle) { shared_ptr piece = wp.lock (); - if (!piece) { + shared_ptr text = wc.lock (); + if (!piece || !text) { return; } /* Apply content's subtitle offsets */ - subtitle.sub.rectangle.x += piece->content->subtitle->x_offset (); - subtitle.sub.rectangle.y += piece->content->subtitle->y_offset (); + subtitle.sub.rectangle.x += text->x_offset (); + subtitle.sub.rectangle.y += text->y_offset (); /* Apply a corrective translation to keep the subtitle centred after the scale that is coming up */ - subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * ((piece->content->subtitle->x_scale() - 1) / 2); - subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * ((piece->content->subtitle->y_scale() - 1) / 2); + subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * ((text->x_scale() - 1) / 2); + subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * ((text->y_scale() - 1) / 2); /* Apply content's subtitle scale */ - subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale (); - subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale (); + subtitle.sub.rectangle.width *= text->x_scale (); + subtitle.sub.rectangle.height *= text->y_scale (); - PlayerSubtitles ps; - ps.image.push_back (subtitle.sub); + PlayerText ps; + ps.bitmap.push_back (subtitle.sub); DCPTime from (content_time_to_dcp (piece, subtitle.from())); - _active_subtitles.add_from (wp, ps, from); + _active_texts[text->type()].add_from (wc, ps, from); } void -Player::text_subtitle_start (weak_ptr wp, ContentTextSubtitle subtitle) +Player::plain_text_start (weak_ptr wp, weak_ptr wc, ContentStringText subtitle) { shared_ptr piece = wp.lock (); - if (!piece) { + shared_ptr text = wc.lock (); + if (!piece || !text) { return; } - PlayerSubtitles ps; + PlayerText ps; DCPTime const from (content_time_to_dcp (piece, subtitle.from())); if (from > piece->content->end()) { @@ -881,10 +939,10 @@ Player::text_subtitle_start (weak_ptr wp, ContentTextSubtitle subtitle) } BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) { - s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ()); - s.set_v_position (s.v_position() + piece->content->subtitle->y_offset ()); - float const xs = piece->content->subtitle->x_scale(); - float const ys = piece->content->subtitle->y_scale(); + s.set_h_position (s.h_position() + text->x_offset ()); + s.set_v_position (s.v_position() + text->y_offset ()); + float const xs = text->x_scale(); + float const ys = text->y_scale(); float size = s.size(); /* Adjust size to express the common part of the scaling; @@ -901,17 +959,22 @@ Player::text_subtitle_start (weak_ptr wp, ContentTextSubtitle subtitle) } s.set_in (dcp::Time(from.seconds(), 1000)); - ps.text.push_back (SubtitleString (s, piece->content->subtitle->outline_width())); - ps.add_fonts (piece->content->subtitle->fonts ()); + ps.string.push_back (StringText (s, text->outline_width())); + ps.add_fonts (text->fonts ()); } - _active_subtitles.add_from (wp, ps, from); + _active_texts[text->type()].add_from (wc, ps, from); } void -Player::subtitle_stop (weak_ptr wp, ContentTime to) +Player::subtitle_stop (weak_ptr wp, weak_ptr wc, ContentTime to) { - if (!_active_subtitles.have (wp)) { + shared_ptr text = wc.lock (); + if (!text) { + return; + } + + if (!_active_texts[text->type()].have(wc)) { return; } @@ -926,18 +989,22 @@ Player::subtitle_stop (weak_ptr wp, ContentTime to) return; } - pair from = _active_subtitles.add_to (wp, dcp_to); + pair from = _active_texts[text->type()].add_to (wc, dcp_to); - if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) { - Subtitle (from.first, DCPTimePeriod (from.second, dcp_to)); + bool const always = (text->type() == TEXT_OPEN_SUBTITLE && _always_burn_open_subtitles); + if (text->use() && !always && !text->burn()) { + Text (from.first, text->type(), text->dcp_track().get_value_or(DCPTextTrack()), DCPTimePeriod (from.second, dcp_to)); } } void Player::seek (DCPTime time, bool accurate) { - if (!_have_valid_pieces) { - setup_pieces (); + boost::mutex::scoped_lock lm (_mutex); + + if (_suspended) { + /* We can't seek in this state */ + return; } if (_shuffler) { @@ -951,7 +1018,9 @@ Player::seek (DCPTime time, bool accurate) } _audio_merger.clear (); - _active_subtitles.clear (); + for (int i = 0; i < TEXT_COUNT; ++i) { + _active_texts[i].clear (); + } BOOST_FOREACH (shared_ptr i, _pieces) { if (time < i->content->position()) { @@ -1010,12 +1079,14 @@ void Player::do_emit_video (shared_ptr pv, DCPTime time) { if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) { - _active_subtitles.clear_before (time); + for (int i = 0; i < TEXT_COUNT; ++i) { + _active_texts[i].clear_before (time); + } } - optional subtitles = subtitles_for_frame (time); + optional subtitles = open_subtitles_for_frame (time); if (subtitles) { - pv->set_subtitle (subtitles.get ()); + pv->set_text (subtitles.get ()); } Video (pv, time); @@ -1080,11 +1151,35 @@ Player::discard_audio (shared_ptr audio, DCPTime time, DCPTi void Player::set_dcp_decode_reduction (optional reduction) { - if (reduction == _dcp_decode_reduction) { - return; + 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; + setup_pieces_unlocked (); + } + + Change (CHANGE_TYPE_DONE, PlayerProperty::DCP_DECODE_REDUCTION, false); +} + +optional +Player::content_time_to_dcp (shared_ptr content, ContentTime t) +{ + boost::mutex::scoped_lock lm (_mutex); + + BOOST_FOREACH (shared_ptr i, _pieces) { + if (i->content == content) { + return content_time_to_dcp (i, t); + } } - _dcp_decode_reduction = reduction; - _have_valid_pieces = false; - Changed (PlayerProperty::DCP_DECODE_REDUCTION, false); + /* We couldn't find this content; perhaps things are being changed over */ + return optional(); }