X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=361f41c92cf07263a083bdd872136cfb68e4ce3c;hb=89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac;hp=1a55a84728c886549ba8eaf518c8904297e45374;hpb=c157cd97740a2ba55d3e87bd9844429cc7d49ce7;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 1a55a8472..361f41c92 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -30,7 +30,6 @@ #include "subrip_decoder.h" #include "subrip_content.h" #include "dcp_content.h" -#include "playlist.h" #include "job.h" #include "image.h" #include "raw_image_proxy.h" @@ -63,19 +62,19 @@ using std::vector; using std::pair; using std::map; using std::make_pair; +using std::copy; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; -Player::Player (shared_ptr f, shared_ptr p) - : _film (f) - , _playlist (p) +Player::Player (shared_ptr film) + : _film (film) , _have_valid_pieces (false) , _ignore_video (false) + , _always_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)); + _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)); set_video_container_size (_film->frame_size ()); @@ -88,14 +87,14 @@ Player::setup_pieces () list > old_pieces = _pieces; _pieces.clear (); - ContentList content = _playlist->content (); + ContentList content = _film->content (); for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { if (!(*i)->paths_valid ()) { continue; } - + shared_ptr decoder; optional frc; @@ -107,7 +106,7 @@ Player::setup_pieces () if (!vc) { continue; } - + DCPTime const overlap = max (vc->position(), (*i)->position()) - min (vc->end(), (*i)->end()); if (overlap > best_overlap_t) { best_overlap = vc; @@ -203,7 +202,7 @@ Player::content_changed (weak_ptr w, int property, bool frequent) property == VideoContentProperty::VIDEO_FRAME_TYPE || property == DCPContentProperty::CAN_BE_PLAYED ) { - + _have_valid_pieces = false; Changed (frequent); @@ -219,18 +218,11 @@ Player::content_changed (weak_ptr w, int property, bool frequent) property == VideoContentProperty::VIDEO_FADE_IN || property == VideoContentProperty::VIDEO_FADE_OUT ) { - + Changed (frequent); } } -void -Player::playlist_changed () -{ - _have_valid_pieces = false; - Changed (false); -} - void Player::set_video_container_size (dcp::Size s) { @@ -248,7 +240,10 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { + if (p == Film::CONTENT) { + _have_valid_pieces = false; + Changed (false); + } else if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { Changed (false); } else if (p == Film::AUDIO_PROCESSOR) { if (_film->audio_processor ()) { @@ -261,7 +256,7 @@ list Player::transform_image_subtitles (list subs) const { list all; - + for (list::const_iterator i = subs.begin(); i != subs.end(); ++i) { if (!i->image) { continue; @@ -269,7 +264,7 @@ Player::transform_image_subtitles (list subs) const /* We will scale the subtitle up to fit _video_container_size */ dcp::Size scaled_size (i->rectangle.width * _video_container_size.width, i->rectangle.height * _video_container_size.height); - + /* Then we need a corrective translation, consisting of two parts: * * 1. that which is the result of the scaling of the subtitle by _video_container_size; this will be @@ -327,9 +322,32 @@ 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, _video_container_size); + copy (s.begin (), s.end (), back_inserter (sub_images)); + } + + optional subtitles; + if (!sub_images.empty ()) { + subtitles = merge (sub_images); + } + + /* Find video */ + list > ov = overlaps ( time, - time + DCPTime::from_frames (1, _film->video_frame_rate ()) + time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta() ); list > pvf; @@ -343,16 +361,16 @@ Player::get_video (DCPTime time, bool accurate) 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); + shared_ptr video_content = dynamic_pointer_cast (piece->content); + DCPOMATIC_ASSERT (video_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 ()); + + 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 ( @@ -360,40 +378,25 @@ Player::get_video (DCPTime time, bool accurate) new PlayerVideo ( i->image, content_video_to_dcp (piece, i->frame), - content->crop (), - content->fade (i->frame), + video_content->crop (), + video_content->fade (i->frame), image_size, _video_container_size, i->eyes, i->part, - content->colour_conversion () + video_content->colour_conversion () ) ) ); } } - /* 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 (!ps.text.empty ()) { - sub_images.push_back (render_subtitles (ps.text, _video_container_size)); + if (subtitles) { + BOOST_FOREACH (shared_ptr p, pvf) { + p->set_subtitle (subtitles.get ()); + } } - if (!sub_images.empty ()) { - for (list >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) { - (*i)->set_subtitle (merge (sub_images)); - } - } - return pvf; } @@ -408,7 +411,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); audio->make_silent (); - + list > ov = overlaps (time, time + length); if (ov.empty ()) { return audio; @@ -440,7 +443,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) Frame const content_frame = dcp_to_content_audio (*i, request); BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { - + /* 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); @@ -455,14 +458,14 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames())); dcp_mapped->make_silent (); AudioMapping map = j->mapping (); - for (int i = 0; i < map.content_channels(); ++i) { + for (int i = 0; i < map.input_channels(); ++i) { for (int j = 0; j < _film->audio_channels(); ++j) { - if (map.get (i, static_cast (j)) > 0) { + if (map.get (i, j) > 0) { dcp_mapped->accumulate_channel ( all.audio.get(), i, j, - map.get (i, static_cast (j)) + map.get (i, j) ); } } @@ -471,7 +474,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) if (_audio_processor) { dcp_mapped = _audio_processor->run (dcp_mapped); } - + all.audio = dcp_mapped; audio->accumulate_frames ( @@ -545,8 +548,12 @@ Player::statistics () const return _statistics; } +/** @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); @@ -554,7 +561,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; } @@ -565,7 +572,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting) list image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting); for (list::iterator i = image.begin(); i != image.end(); ++i) { - + /* Apply content's subtitle offsets */ i->sub.rectangle.x += subtitle_content->subtitle_x_offset (); i->sub.rectangle.y += subtitle_content->subtitle_y_offset (); @@ -577,15 +584,22 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting) /* Apply a corrective translation to keep the subtitle centred after that scale */ i->sub.rectangle.x -= i->sub.rectangle.width * (subtitle_content->subtitle_x_scale() - 1); i->sub.rectangle.y -= i->sub.rectangle.height * (subtitle_content->subtitle_y_scale() - 1); - + ps.image.push_back (i->sub); } list text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting); BOOST_FOREACH (ContentTextSubtitle& ts, text) { BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) { + s.set_h_position (s.h_position() + subtitle_content->subtitle_x_offset ()); s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ()); - s.set_size (s.size() * max (subtitle_content->subtitle_x_scale(), subtitle_content->subtitle_y_scale())); + float const xs = subtitle_content->subtitle_x_scale(); + float const ys = subtitle_content->subtitle_y_scale(); + float const average = s.size() * (xs + ys) / 2; + s.set_size (average); + if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) { + s.set_aspect_adjust (xs / ys); + } ps.text.push_back (s); } } @@ -622,3 +636,13 @@ Player::set_ignore_video () { _ignore_video = true; } + +/** 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) +{ + _always_burn_subtitles = burn; +}