X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=be1268f48a02fcdafb4985431cfdb1e5e2fff50d;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=436ae3fe88fb33adaee5aacb1c2f3cfd99799b7f;hpb=ae15eeca8588c6928d7671894db98c2e289fa601;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 436ae3fe8..be1268f48 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" @@ -45,6 +44,7 @@ #include "dcp_decoder.h" #include "dcp_subtitle_content.h" #include "dcp_subtitle_decoder.h" +#include "audio_processor.h" #include #include #include @@ -62,21 +62,23 @@ 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) + , _burn_subtitles (film->burn_subtitles ()) { - _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 ()); + + film_changed (Film::AUDIO_PROCESSOR); } void @@ -85,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; @@ -104,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; @@ -200,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); @@ -216,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) { @@ -245,8 +240,15 @@ 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 ()) { + _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ()); + } } } @@ -254,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; @@ -262,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 @@ -307,7 +309,7 @@ Player::black_player_video_frame (DCPTime time) const _video_container_size, EYES_BOTH, PART_WHOLE, - Config::instance()->colour_conversions().front().conversion + PresetColourConversion::all().front().conversion ) ); } @@ -322,7 +324,7 @@ Player::get_video (DCPTime time, bool accurate) 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; @@ -344,7 +346,7 @@ Player::get_video (DCPTime time, bool accurate) 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) { @@ -376,15 +378,18 @@ Player::get_video (DCPTime time, bool accurate) list c = transform_image_subtitles (ps.image); copy (c.begin(), c.end(), back_inserter (sub_images)); - /* Text subtitles (rendered to images) */ - sub_images.push_back (render_subtitles (ps.text, _video_container_size)); - + /* 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)); } - } - + } + return pvf; } @@ -395,11 +400,11 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) setup_pieces (); } - AudioFrame const length_frames = length.frames (_film->audio_frame_rate ()); + Frame const length_frames = length.frames (_film->audio_frame_rate ()); shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); audio->make_silent (); - + list > ov = overlaps (time, time + length); if (ov.empty ()) { return audio; @@ -412,16 +417,9 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) shared_ptr decoder = dynamic_pointer_cast ((*i)->decoder); DCPOMATIC_ASSERT (decoder); - if (content->audio_frame_rate() == 0) { - /* This AudioContent has no audio (e.g. if it is an FFmpegContent with no - * audio stream). - */ - continue; - } - /* The time that we should request from the content */ DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0); - AudioFrame request_frames = length_frames; + Frame request_frames = length_frames; DCPTime offset; if (request < DCPTime ()) { /* We went off the start of the content, so we will need to offset @@ -435,49 +433,56 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) request = DCPTime (); } - AudioFrame const content_frame = dcp_to_content_audio (*i, request); + Frame const content_frame = dcp_to_content_audio (*i, request); - /* Audio from this piece's decoder (which might be more or less than what we asked for) */ - shared_ptr all = decoder->get_audio (content_frame, request_frames, accurate); + BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { - /* Gain */ - if (content->audio_gain() != 0) { - shared_ptr gain (new AudioBuffers (all->audio)); - gain->apply_gain (content->audio_gain ()); - all->audio = gain; - } + /* 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); + + /* Gain */ + if (content->audio_gain() != 0) { + shared_ptr gain (new AudioBuffers (all.audio)); + gain->apply_gain (content->audio_gain ()); + all.audio = gain; + } - /* Remap channels */ - shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), all->audio->frames())); - dcp_mapped->make_silent (); - AudioMapping map = content->audio_mapping (); - for (int i = 0; i < map.content_channels(); ++i) { - for (int j = 0; j < _film->audio_channels(); ++j) { - if (map.get (i, static_cast (j)) > 0) { - dcp_mapped->accumulate_channel ( - all->audio.get(), - i, - j, - map.get (i, static_cast (j)) - ); + /* Remap channels */ + 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.input_channels(); ++i) { + for (int j = 0; j < _film->audio_channels(); ++j) { + if (map.get (i, j) > 0) { + dcp_mapped->accumulate_channel ( + all.audio.get(), + i, + j, + map.get (i, j) + ); + } } } + + if (_audio_processor) { + dcp_mapped = _audio_processor->run (dcp_mapped); + } + + all.audio = dcp_mapped; + + audio->accumulate_frames ( + all.audio.get(), + content_frame - all.frame, + offset.frames (_film->audio_frame_rate()), + min (Frame (all.audio->frames()), request_frames) + ); } - - all->audio = dcp_mapped; - - audio->accumulate_frames ( - all->audio.get(), - content_frame - all->frame, - offset.frames (_film->audio_frame_rate()), - min (AudioFrame (all->audio->frames()), request_frames) - ); } return audio; } -VideoFrame +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 */ @@ -490,7 +495,7 @@ Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const } DCPTime -Player::content_video_to_dcp (shared_ptr piece, VideoFrame f) const +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 ()) { @@ -500,7 +505,7 @@ Player::content_video_to_dcp (shared_ptr piece, VideoFrame f) const return t; } -AudioFrame +Frame Player::dcp_to_content_audio (shared_ptr piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ @@ -556,7 +561,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 (); @@ -568,15 +573,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); } } @@ -613,3 +625,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. + */ +void +Player::set_burn_subtitles (bool burn) +{ + _burn_subtitles = burn; +}