X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=3451b892c8857a0e990b7519dd84260d7dc78203;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=c484ecc9a2de03243ebf2bbd3e091615ee4751a0;hpb=f9068dcbfbb09082e29e2a779ef1a7a2f6ee849e;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index c484ecc9a..3451b892c 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,34 +1,27 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "player.h" #include "film.h" -#include "ffmpeg_decoder.h" #include "audio_buffers.h" -#include "ffmpeg_content.h" -#include "image_decoder.h" -#include "image_content.h" -#include "sndfile_decoder.h" -#include "sndfile_content.h" -#include "subtitle_content.h" -#include "subrip_decoder.h" -#include "subrip_content.h" +#include "content_audio.h" #include "dcp_content.h" #include "job.h" #include "image.h" @@ -40,13 +33,20 @@ #include "content_video.h" #include "player_video.h" #include "frame_rate_change.h" -#include "dcp_content.h" -#include "dcp_decoder.h" -#include "dcp_subtitle_content.h" -#include "dcp_subtitle_decoder.h" #include "audio_processor.h" #include "playlist.h" #include "referenced_reel_asset.h" +#include "decoder_factory.h" +#include "decoder.h" +#include "video_decoder.h" +#include "audio_decoder.h" +#include "subtitle_content.h" +#include "subtitle_decoder.h" +#include "ffmpeg_content.h" +#include "audio_content.h" +#include "content_subtitle.h" +#include "dcp_decoder.h" +#include "image_decoder.h" #include #include #include @@ -74,6 +74,25 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using boost::scoped_ptr; + +static bool +has_video (Content* c) +{ + return static_cast(c->video); +} + +static bool +has_audio (Content* c) +{ + return static_cast(c->audio); +} + +static bool +has_subtitle (Content* c) +{ + return static_cast(c->subtitle); +} Player::Player (shared_ptr film, shared_ptr playlist) : _film (film) @@ -96,7 +115,6 @@ Player::Player (shared_ptr film, shared_ptr playlist void Player::setup_pieces () { - list > old_pieces = _pieces; _pieces.clear (); BOOST_FOREACH (shared_ptr i, _playlist->content ()) { @@ -105,99 +123,46 @@ Player::setup_pieces () continue; } - shared_ptr decoder; - optional frc; + shared_ptr decoder = decoder_factory (i, _film->log()); + FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate()); - /* FFmpeg */ - shared_ptr fc = dynamic_pointer_cast (i); - if (fc) { - decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast)); - frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate()); + if (!decoder) { + /* Not something that we can decode; e.g. Atmos content */ + continue; } - shared_ptr dc = dynamic_pointer_cast (i); - if (dc) { - decoder.reset (new DCPDecoder (dc, _fast)); - frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate()); + if (decoder->video && _ignore_video) { + decoder->video->set_ignore (); } - /* ImageContent */ - shared_ptr ic = dynamic_pointer_cast (i); - if (ic) { - /* See if we can re-use an old ImageDecoder */ - for (list >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) { - shared_ptr imd = dynamic_pointer_cast ((*j)->decoder); - if (imd && imd->content() == ic) { - decoder = imd; - } - } - - if (!decoder) { - decoder.reset (new ImageDecoder (ic)); - } - - frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate()); + if (decoder->audio && _ignore_audio) { + decoder->audio->set_ignore (); } - /* SndfileContent */ - shared_ptr sc = dynamic_pointer_cast (i); - if (sc) { - decoder.reset (new SndfileDecoder (sc, _fast)); - - /* 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 ()); - } + if (decoder->audio && _fast) { + decoder->audio->set_fast (); } - /* 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 = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate()); + shared_ptr dcp = dynamic_pointer_cast (decoder); + if (dcp && _play_referenced) { + dcp->set_decode_referenced (); } - /* DCPSubtitleContent */ - shared_ptr dsc = dynamic_pointer_cast (i); - if (dsc) { - decoder.reset (new DCPSubtitleDecoder (dsc)); - frc = FrameRateChange (dsc->subtitle_video_frame_rate(), _film->video_frame_rate()); - } + shared_ptr piece (new Piece (i, decoder, frc)); + _pieces.push_back (piece); - shared_ptr vd = dynamic_pointer_cast (decoder); - if (vd && _ignore_video) { - vd->set_ignore_video (); + if (decoder->video) { + decoder->video->Data.connect (bind (&Player::video, this, weak_ptr (piece), _1)); } - shared_ptr ad = dynamic_pointer_cast (decoder); - if (ad && _ignore_audio) { - ad->set_ignore_audio (); + if (decoder->audio) { + decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr (piece), _1)); } - _pieces.push_back (shared_ptr (new Piece (i, decoder, frc.get ()))); + if (decoder->subtitle) { + decoder->subtitle->ImageData.connect (bind (&Player::image_subtitle, this, weak_ptr (piece), _1)); + decoder->subtitle->TextData.connect (bind (&Player::text_subtitle, this, weak_ptr (piece), _1)); + } } _have_valid_pieces = true; @@ -217,26 +182,36 @@ Player::playlist_content_changed (weak_ptr w, int property, bool freque property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || property == ContentProperty::PATH || - property == VideoContentProperty::VIDEO_FRAME_TYPE || - property == DCPContentProperty::CAN_BE_PLAYED + property == VideoContentProperty::FRAME_TYPE || + property == DCPContentProperty::NEEDS_ASSETS || + property == DCPContentProperty::NEEDS_KDM || + property == SubtitleContentProperty::COLOUR || + property == SubtitleContentProperty::OUTLINE || + property == SubtitleContentProperty::SHADOW || + property == SubtitleContentProperty::EFFECT_COLOUR || + property == FFmpegContentProperty::SUBTITLE_STREAM || + property == VideoContentProperty::COLOUR_CONVERSION ) { _have_valid_pieces = false; Changed (frequent); } else if ( - property == SubtitleContentProperty::USE_SUBTITLES || - property == SubtitleContentProperty::SUBTITLE_X_OFFSET || - property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || - property == SubtitleContentProperty::SUBTITLE_X_SCALE || - property == SubtitleContentProperty::SUBTITLE_Y_SCALE || + 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::VIDEO_CROP || - property == VideoContentProperty::VIDEO_SCALE || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FADE_IN || - property == VideoContentProperty::VIDEO_FADE_OUT || - property == VideoContentProperty::COLOUR_CONVERSION + property == VideoContentProperty::CROP || + property == VideoContentProperty::SCALE || + property == VideoContentProperty::FADE_IN || + property == VideoContentProperty::FADE_OUT ) { Changed (frequent); @@ -248,7 +223,7 @@ Player::set_video_container_size (dcp::Size s) { _video_container_size = s; - _black_image.reset (new Image (PIX_FMT_RGB24, _video_container_size, true)); + _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true)); _black_image->make_black (); } @@ -313,7 +288,8 @@ Player::transform_image_subtitles (list subs) const scaled_size, dcp::YUV_TO_RGB_REC601, i->image->pixel_format (), - true + true, + _fast ), Position ( lrint (_video_container_size.width * i->rectangle.x), @@ -344,230 +320,9 @@ Player::black_player_video_frame (DCPTime time) const ); } -/** @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) -{ - if (!_have_valid_pieces) { - 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, ps.fonts, _video_container_size); - copy (s.begin (), s.end (), back_inserter (sub_images)); - } - - optional subtitles; - if (!sub_images.empty ()) { - subtitles = merge (sub_images); - } - - /* Find pieces containing video which is happening now */ - - list > ov = overlaps ( - time, - time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta() - ); - - list > pvf; - - if (ov.empty ()) { - /* No video content at this time */ - pvf.push_back (black_player_video_frame (time)); - } else { - /* Some video content at this time */ - shared_ptr last = *(ov.rbegin ()); - VideoFrameType const last_type = dynamic_pointer_cast (last->content)->video_frame_type (); - - /* Get video from appropriate piece(s) */ - BOOST_FOREACH (shared_ptr piece, ov) { - - shared_ptr decoder = dynamic_pointer_cast (piece->decoder); - DCPOMATIC_ASSERT (decoder); - 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 || - /* with a corresponding L/R eye if appropriate */ - (last_type == VIDEO_FRAME_TYPE_3D_LEFT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) || - (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_LEFT); - - if (use) { - /* We want to use this piece */ - 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)); - } else { - 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 ( - shared_ptr ( - new PlayerVideo ( - i->image, - content_video_to_dcp (piece, i->frame), - video_content->crop (), - video_content->fade (i->frame), - image_size, - _video_container_size, - i->eyes, - i->part, - video_content->colour_conversion () - ) - ) - ); - } - } - } else { - /* Discard unused video */ - decoder->get_video (dcp_to_content_video (piece, time), accurate); - } - } - } - - if (subtitles) { - BOOST_FOREACH (shared_ptr p, pvf) { - p->set_subtitle (subtitles.get ()); - } - } - - 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) -{ - if (!_have_valid_pieces) { - setup_pieces (); - } - - Frame const length_frames = length.frames_round (_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; - } - - 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); - DCPOMATIC_ASSERT (content); - shared_ptr decoder = dynamic_pointer_cast (i->decoder); - DCPOMATIC_ASSERT (decoder); - - /* The time that we should request from the content */ - DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0); - Frame request_frames = length_frames; - DCPTime offset; - if (request < DCPTime ()) { - /* We went off the start of the content, so we will need to offset - the stuff we get back. - */ - offset = -request; - request_frames += request.frames_round (_film->audio_frame_rate ()); - if (request_frames < 0) { - request_frames = 0; - } - request = DCPTime (); - } - - Frame const content_frame = dcp_to_resampled_audio (i, request); - - BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { - - if (j->channels() == 0) { - /* Some content (e.g. DCPs) can have streams with no channels */ - continue; - } - - /* 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 = 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, _film->audio_channels ()); - } - - all.audio = dcp_mapped; - - audio->accumulate_frames ( - all.audio.get(), - content_frame - all.frame, - offset.frames_round (_film->audio_frame_rate()), - min (Frame (all.audio->frames()), request_frames) - ); - } - } - - return audio; -} - Frame Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const { - shared_ptr vc = dynamic_pointer_cast (piece->content); DCPTime s = t - piece->content->position (); s = min (piece->content->length_after_trim(), s); s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc)); @@ -585,7 +340,6 @@ Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const DCPTime Player::content_video_to_dcp (shared_ptr piece, Frame f) const { - shared_ptr vc = dynamic_pointer_cast (piece->content); /* See comment in dcp_to_content_video */ DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc); return max (DCPTime (), d + piece->content->position ()); @@ -614,74 +368,6 @@ Player::content_subtitle_to_dcp (shared_ptr piece, ContentTime t) c 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. - */ -PlayerSubtitles -Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt) -{ - list > subs = overlaps (time, time + length); - - PlayerSubtitles ps (time, length); - - 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 () || (!_always_burn_subtitles && (burnt != subtitle_content->burn_subtitles ()))) { - 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 */ - ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ()); - - 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 (); - - /* Apply content's subtitle scale */ - i->sub.rectangle.width *= subtitle_content->subtitle_x_scale (); - i->sub.rectangle.height *= subtitle_content->subtitle_y_scale (); - - /* 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 ()); - 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); - } - 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 ()); - } - } - } - - return ps; -} - list > Player::get_subtitle_fonts () { @@ -691,12 +377,11 @@ Player::get_subtitle_fonts () list > fonts; BOOST_FOREACH (shared_ptr& p, _pieces) { - shared_ptr sc = dynamic_pointer_cast (p->content); - if (sc) { + if (p->content->subtitle) { /* XXX: things may go wrong if there are duplicate font IDs with different font files. */ - list > f = sc->fonts (); + list > f = p->content->subtitle->fonts (); copy (f.begin(), f.end(), back_inserter (fonts)); } } @@ -752,34 +437,51 @@ Player::get_reel_assets () if (!j) { continue; } - DCPDecoder decoder (j, false); + + scoped_ptr decoder; + try { + decoder.reset (new DCPDecoder (j, _film->log())); + } catch (...) { + return a; + } + int64_t offset = 0; - BOOST_FOREACH (shared_ptr k, decoder.reels()) { + BOOST_FOREACH (shared_ptr k, decoder->reels()) { + + DCPOMATIC_ASSERT (j->video_frame_rate ()); + double const cfr = j->video_frame_rate().get(); + Frame const trim_start = j->trim_start().frames_round (cfr); + Frame const trim_end = j->trim_end().frames_round (cfr); + int const ffr = _film->video_frame_rate (); + DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate()); if (j->reference_video ()) { + shared_ptr ra = k->main_picture (); + 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 ( - k->main_picture (), - DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate())) - ) + ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr))) ); } if (j->reference_audio ()) { + shared_ptr ra = k->main_sound (); + 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 ( - k->main_sound (), - DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate())) - ) + ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr))) ); } if (j->reference_subtitle ()) { + shared_ptr ra = k->main_subtitle (); + 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 ( - k->main_subtitle (), - DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate())) - ) + ReferencedReelAsset (ra, DCPTimePeriod (from, from + DCPTime::from_frames (ra->duration(), ffr))) ); } @@ -790,3 +492,101 @@ Player::get_reel_assets () return a; } + +list > +Player::overlaps (DCPTime from, DCPTime to, boost::function valid) +{ + if (!_have_valid_pieces) { + setup_pieces (); + } + + list > overlaps; + BOOST_FOREACH (shared_ptr i, _pieces) { + if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) { + overlaps.push_back (i); + } + } + + return overlaps; +} + +bool +Player::pass () +{ + if (!_have_valid_pieces) { + setup_pieces (); + } + + shared_ptr earliest; + DCPTime earliest_position; + BOOST_FOREACH (shared_ptr i, _pieces) { + /* Convert i->decoder->position() to DCPTime and work out the earliest */ + } + + earliest->decoder->pass (); + + /* XXX: collect audio and maybe emit some */ +} + +void +Player::video (weak_ptr wp, ContentVideo video) +{ + shared_ptr piece = wp.lock (); + if (!piece) { + return; + } + + /* Get subs to burn in and burn them in */ + + + /* Fill gaps */ + + DCPTime time = content_video_to_dcp (piece, video.frame.index()); + + dcp::Size image_size = piece->content->video->scale().size ( + piece->content->video, _video_container_size, _film->frame_size () + ); + + Video ( + shared_ptr ( + new PlayerVideo ( + video.image, + time, + piece->content->video->crop (), + piece->content->video->fade (video.frame.index()), + image_size, + _video_container_size, + video.frame.eyes(), + video.part, + piece->content->video->colour_conversion () + ) + ) + ); + +} + +void +Player::audio (weak_ptr piece, ContentAudio video) +{ + /* Put into merge buffer */ +} + +void +Player::image_subtitle (weak_ptr piece, ContentImageSubtitle subtitle) +{ + /* Store for video to see */ +} + +void +Player::text_subtitle (weak_ptr piece, ContentTextSubtitle subtitle) +{ + /* Store for video to see, or emit */ +} + +void +Player::seek (DCPTime time, bool accurate) +{ + if (accurate) { + _last_video = time - DCPTime::from_frames (1, _film->video_frame_rate ()); + } +}