X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplayer.cc;h=0606a9340c9d1d6e51cd3f4e0d2ac906a090edf5;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hp=acf977def557f4b9873a0117d9b92d88f889138f;hpb=b9842263a402b5ce1d2f85a1346ca11a419f816e;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index acf977def..0606a9340 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -46,13 +46,18 @@ #include "dcp_subtitle_decoder.h" #include "audio_processor.h" #include "playlist.h" +#include +#include +#include +#include #include #include #include +#include #include "i18n.h" -#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); using std::list; using std::cout; @@ -77,6 +82,7 @@ Player::Player (shared_ptr film, shared_ptr playlist , _ignore_audio (false) , _always_burn_subtitles (false) , _fast (false) + , _play_referenced (false) { _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); @@ -101,30 +107,6 @@ Player::setup_pieces () shared_ptr decoder; optional frc; - /* 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; - 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()); - if (overlap > best_overlap_t) { - best_overlap = vc; - best_overlap_t = overlap; - } - } - - optional best_overlap_frc; - if (best_overlap) { - best_overlap_frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ()); - } else { - /* No video overlap; e.g. if the DCP is just audio */ - best_overlap_frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ()); - } - /* FFmpeg */ shared_ptr fc = dynamic_pointer_cast (i); if (fc) { @@ -160,21 +142,48 @@ Player::setup_pieces () shared_ptr sc = dynamic_pointer_cast (i); if (sc) { decoder.reset (new SndfileDecoder (sc, _fast)); - frc = best_overlap_frc; + + /* Work out a FrameRateChange for the best overlap video for this content */ + DCPTime best_overlap_t; + shared_ptr best_overlap; + BOOST_FOREACH (shared_ptr j, _playlist->content ()) { + shared_ptr vc = dynamic_pointer_cast (j); + if (!vc) { + continue; + } + + DCPTime const overlap = min (vc->end(), i->end()) - max (vc->position(), i->position()); + if (overlap > best_overlap_t) { + best_overlap = vc; + best_overlap_t = overlap; + } + } + + if (best_overlap) { + frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ()); + } else { + /* No video overlap; e.g. if the DCP is just audio */ + frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ()); + } } + /* It's questionable whether subtitle content should have a video frame rate; perhaps + it should be assumed that any subtitle content has been prepared at the same rate + as simultaneous video content (like we do with audio). + */ + /* SubRipContent */ shared_ptr rc = dynamic_pointer_cast (i); if (rc) { decoder.reset (new SubRipDecoder (rc)); - frc = best_overlap_frc; + frc = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate()); } /* DCPSubtitleContent */ shared_ptr dsc = dynamic_pointer_cast (i); if (dsc) { decoder.reset (new DCPSubtitleDecoder (dsc)); - frc = best_overlap_frc; + frc = FrameRateChange (dsc->subtitle_video_frame_rate(), _film->video_frame_rate()); } shared_ptr vd = dynamic_pointer_cast (decoder); @@ -257,7 +266,13 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { + if (p == Film::CONTAINER) { + Changed (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 (false); } else if (p == Film::AUDIO_PROCESSOR) { if (_film->audio_processor ()) { @@ -328,7 +343,10 @@ Player::black_player_video_frame (DCPTime time) const ); } -/** @return All PlayerVideos at the given time (there may be two frames for 3D) */ +/** @return All PlayerVideos at the given time. There may be none if the content + * at `time' is a DCP which we are passing through (i.e. referring to by reference) + * or 2 if we have 3D. + */ list > Player::get_video (DCPTime time, bool accurate) { @@ -382,6 +400,11 @@ Player::get_video (DCPTime time, bool accurate) shared_ptr video_content = dynamic_pointer_cast (piece->content); DCPOMATIC_ASSERT (video_content); + shared_ptr dcp_content = dynamic_pointer_cast (video_content); + if (dcp_content && dcp_content->reference_video () && !_play_referenced) { + continue; + } + bool const use = /* always use the last video */ piece == last || @@ -431,6 +454,7 @@ Player::get_video (DCPTime time, bool accurate) return pvf; } +/** @return Audio data or 0 if the only audio data here is referenced DCP data */ shared_ptr Player::get_audio (DCPTime time, DCPTime length, bool accurate) { @@ -448,11 +472,25 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) return audio; } - for (list >::iterator i = ov.begin(); i != ov.end(); ++i) { + bool all_referenced = true; + BOOST_FOREACH (shared_ptr i, ov) { + shared_ptr audio_content = dynamic_pointer_cast (i->content); + shared_ptr dcp_content = dynamic_pointer_cast (i->content); + if (audio_content && (!dcp_content || !dcp_content->reference_audio ())) { + /* There is audio content which is not from a DCP or not set to be referenced */ + all_referenced = false; + } + } + + if (all_referenced && !_play_referenced) { + return shared_ptr (); + } + + BOOST_FOREACH (shared_ptr i, ov) { - shared_ptr content = dynamic_pointer_cast ((*i)->content); + shared_ptr content = dynamic_pointer_cast (i->content); DCPOMATIC_ASSERT (content); - shared_ptr decoder = dynamic_pointer_cast ((*i)->decoder); + shared_ptr decoder = dynamic_pointer_cast (i->decoder); DCPOMATIC_ASSERT (decoder); /* The time that we should request from the content */ @@ -471,7 +509,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) request = DCPTime (); } - Frame const content_frame = dcp_to_resampled_audio (*i, request); + Frame const content_frame = dcp_to_resampled_audio (i, request); BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { @@ -569,6 +607,12 @@ Player::dcp_to_content_subtitle (shared_ptr piece, DCPTime t) const return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start()); } +DCPTime +Player::content_subtitle_to_dcp (shared_ptr piece, ContentTime t) const +{ + return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position()); +} + /** @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. @@ -586,6 +630,11 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt) continue; } + shared_ptr dcp_content = dynamic_pointer_cast (subtitle_content); + if (dcp_content && dcp_content->reference_subtitle () && !_play_referenced) { + continue; + } + shared_ptr subtitle_decoder = dynamic_pointer_cast ((*j)->decoder); ContentTime const from = dcp_to_content_subtitle (*j, time); /* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */ @@ -611,7 +660,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt) list text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting); BOOST_FOREACH (ContentTextSubtitle& ts, text) { - BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) { + 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 ()); float const xs = subtitle_content->subtitle_x_scale(); @@ -621,6 +670,8 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt) if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) { s.set_aspect_adjust (xs / ys); } + s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds())); + s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds())); ps.text.push_back (s); ps.add_fonts (subtitle_content->fonts ()); } @@ -682,3 +733,36 @@ Player::set_fast () _fast = true; _have_valid_pieces = false; } + +void +Player::set_play_referenced () +{ + _play_referenced = true; + _have_valid_pieces = false; +} + +list > +Player::get_reel_assets () +{ + list > a; + + BOOST_FOREACH (shared_ptr i, _playlist->content ()) { + shared_ptr j = dynamic_pointer_cast (i); + if (!j) { + continue; + } + /* XXX: hack hack hack */ + DCPDecoder decoder (j, false); + if (j->reference_video ()) { + a.push_back (decoder.reels().front()->main_picture ()); + } + if (j->reference_audio ()) { + a.push_back (decoder.reels().front()->main_sound ()); + } + if (j->reference_subtitle ()) { + a.push_back (decoder.reels().front()->main_subtitle ()); + } + } + + return a; +}