using boost::optional;
using boost::scoped_ptr;
-static bool
-has_video (Content* c)
-{
- return static_cast<bool>(c->video);
-}
-
-static bool
-has_audio (Content* c)
-{
- return static_cast<bool>(c->audio);
-}
-
-static bool
-has_subtitle (Content* c)
-{
- return static_cast<bool>(c->subtitle);
-}
-
Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
: _film (film)
, _playlist (playlist)
, _always_burn_subtitles (false)
, _fast (false)
, _play_referenced (false)
+ , _audio_merger (_film->audio_channels(), _film->audio_frame_rate())
{
_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
dcp->set_decode_referenced ();
}
- _pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc)));
+ shared_ptr<Piece> piece (new Piece (i, decoder, frc));
+ _pieces.push_back (piece);
+
+ if (decoder->video) {
+ decoder->video->Data.connect (bind (&Player::video, this, weak_ptr<Piece> (piece), _1));
+ }
+
+ if (decoder->audio) {
+ decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr<Piece> (piece), _1, _2));
+ }
+
+ if (decoder->subtitle) {
+ decoder->subtitle->ImageData.connect (bind (&Player::image_subtitle, this, weak_ptr<Piece> (piece), _1));
+ decoder->subtitle->TextData.connect (bind (&Player::text_subtitle, this, weak_ptr<Piece> (piece), _1));
+ }
}
_have_valid_pieces = true;
property == SubtitleContentProperty::OUTLINE_WIDTH ||
property == SubtitleContentProperty::Y_SCALE ||
property == SubtitleContentProperty::FADE_IN ||
- property == SubtitleContentProperty::FADE_OUT
- ) {
-
- /* These changes just need the pieces' decoders to be reset.
- It's quite possible that other changes could be handled by
- this branch rather than the _have_valid_pieces = false branch
- above. This would make things a lot faster.
- */
-
- reset_pieces ();
- Changed (frequent);
-
- } else if (
+ property == SubtitleContentProperty::FADE_OUT ||
property == ContentProperty::VIDEO_FRAME_RATE ||
property == SubtitleContentProperty::USE ||
property == SubtitleContentProperty::X_OFFSET ||
}
shared_ptr<PlayerVideo>
-Player::black_player_video_frame (DCPTime time) const
+Player::black_player_video_frame () const
{
return shared_ptr<PlayerVideo> (
new PlayerVideo (
shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
- time,
Crop (),
optional<double> (),
_video_container_size,
);
}
-/** @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<shared_ptr<PlayerVideo> >
-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, accurate);
-
- list<PositionImage> sub_images;
-
- /* Image subtitles */
- list<PositionImage> 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<PositionImage> s = render_subtitles (ps.text, ps.fonts, _video_container_size, time);
- copy (s.begin (), s.end (), back_inserter (sub_images));
- }
-
- optional<PositionImage> subtitles;
- if (!sub_images.empty ()) {
- subtitles = merge (sub_images);
- }
-
- /* Find pieces containing video which is happening now */
-
- list<shared_ptr<Piece> > ov = overlaps (
- time,
- time + DCPTime::from_frames (1, _film->video_frame_rate ()),
- &has_video
- );
-
- list<shared_ptr<PlayerVideo> > 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<Piece> last = *(ov.rbegin ());
- VideoFrameType const last_type = last->content->video->frame_type ();
-
- /* Get video from appropriate piece(s) */
- BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
-
- shared_ptr<VideoDecoder> decoder = piece->decoder->video;
- DCPOMATIC_ASSERT (decoder);
-
- shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (piece->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 && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) ||
- (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT);
-
- if (use) {
- /* We want to use this piece */
- list<ContentVideo> content_video = decoder->get (dcp_to_content_video (piece, time), accurate);
- if (content_video.empty ()) {
- pvf.push_back (black_player_video_frame (time));
- } else {
- dcp::Size image_size = piece->content->video->scale().size (
- piece->content->video, _video_container_size, _film->frame_size ()
- );
-
- for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
- pvf.push_back (
- shared_ptr<PlayerVideo> (
- new PlayerVideo (
- i->image,
- time,
- piece->content->video->crop (),
- piece->content->video->fade (i->frame.index()),
- image_size,
- _video_container_size,
- i->frame.eyes(),
- i->part,
- piece->content->video->colour_conversion ()
- )
- )
- );
- }
- }
- } else {
- /* Discard unused video */
- decoder->get (dcp_to_content_video (piece, time), accurate);
- }
- }
- }
-
- if (subtitles) {
- BOOST_FOREACH (shared_ptr<PlayerVideo> 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<AudioBuffers>
-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<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
- audio->make_silent ();
-
- list<shared_ptr<Piece> > ov = overlaps (time, time + length, has_audio);
- if (ov.empty ()) {
- return audio;
- }
-
- bool all_referenced = true;
- BOOST_FOREACH (shared_ptr<Piece> i, ov) {
- shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> (i->content);
- if (i->content->audio && (!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<AudioBuffers> ();
- }
-
- BOOST_FOREACH (shared_ptr<Piece> i, ov) {
-
- DCPOMATIC_ASSERT (i->content->audio);
- shared_ptr<AudioDecoder> decoder = i->decoder->audio;
- DCPOMATIC_ASSERT (decoder);
-
- /* The time that we should request from the content */
- DCPTime request = time - DCPTime::from_seconds (i->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, i->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 (j, content_frame, request_frames, accurate);
-
- /* Gain */
- if (i->content->audio->gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
- gain->apply_gain (i->content->audio->gain ());
- all.audio = gain;
- }
-
- /* Remap channels */
- shared_ptr<AudioBuffers> 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<const Piece> piece, DCPTime t) const
{
return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ());
}
+DCPTime
+Player::resampled_audio_to_dcp (shared_ptr<const Piece> piece, Frame f) const
+{
+ /* See comment in dcp_to_content_video */
+ DCPTime const d = DCPTime::from_frames (f, _film->audio_frame_rate()) - DCPTime (piece->content->trim_start (), piece->frc);
+ return max (DCPTime (), d + piece->content->position ());
+}
+
ContentTime
-Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
+Player::dcp_to_content_time (shared_ptr<const Piece> piece, DCPTime t) const
{
DCPTime s = t - piece->content->position ();
s = min (piece->content->length_after_trim(), s);
}
DCPTime
-Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
+Player::content_time_to_dcp (shared_ptr<const Piece> 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.
- */
-PlayerSubtitles
-Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate)
-{
- list<shared_ptr<Piece> > subs = overlaps (time, time + length, has_subtitle);
-
- PlayerSubtitles ps (time);
-
- for (list<shared_ptr<Piece> >::const_iterator j = subs.begin(); j != subs.end(); ++j) {
- if (!(*j)->content->subtitle->use () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn ()))) {
- continue;
- }
-
- shared_ptr<DCPContent> dcp_content = dynamic_pointer_cast<DCPContent> ((*j)->content);
- if (dcp_content && dcp_content->reference_subtitle () && !_play_referenced) {
- continue;
- }
-
- shared_ptr<SubtitleDecoder> subtitle_decoder = (*j)->decoder->subtitle;
- 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<ContentImageSubtitle> image = subtitle_decoder->get_image (ContentTimePeriod (from, to), starting, accurate);
- for (list<ContentImageSubtitle>::iterator i = image.begin(); i != image.end(); ++i) {
-
- /* Apply content's subtitle offsets */
- i->sub.rectangle.x += (*j)->content->subtitle->x_offset ();
- i->sub.rectangle.y += (*j)->content->subtitle->y_offset ();
-
- /* Apply content's subtitle scale */
- i->sub.rectangle.width *= (*j)->content->subtitle->x_scale ();
- i->sub.rectangle.height *= (*j)->content->subtitle->y_scale ();
-
- /* Apply a corrective translation to keep the subtitle centred after that scale */
- i->sub.rectangle.x -= i->sub.rectangle.width * ((*j)->content->subtitle->x_scale() - 1);
- i->sub.rectangle.y -= i->sub.rectangle.height * ((*j)->content->subtitle->y_scale() - 1);
-
- ps.image.push_back (i->sub);
- }
-
- list<ContentTextSubtitle> text = subtitle_decoder->get_text (ContentTimePeriod (from, to), starting, accurate);
- BOOST_FOREACH (ContentTextSubtitle& ts, text) {
- BOOST_FOREACH (dcp::SubtitleString s, ts.subs) {
- s.set_h_position (s.h_position() + (*j)->content->subtitle->x_offset ());
- s.set_v_position (s.v_position() + (*j)->content->subtitle->y_offset ());
- float const xs = (*j)->content->subtitle->x_scale();
- float const ys = (*j)->content->subtitle->y_scale();
- float size = s.size();
-
- /* Adjust size to express the common part of the scaling;
- e.g. if xs = ys = 0.5 we scale size by 2.
- */
- if (xs > 1e-5 && ys > 1e-5) {
- size *= 1 / min (1 / xs, 1 / ys);
- }
- s.set_size (size);
-
- /* Then express aspect ratio changes */
- 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(), 1000));
- s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000));
- ps.text.push_back (SubtitleString (s, (*j)->content->subtitle->outline_width()));
- ps.add_fonts ((*j)->content->subtitle->fonts ());
- }
- }
- }
-
- return ps;
-}
-
list<shared_ptr<Font> >
Player::get_subtitle_fonts ()
{
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 ()) {
- DCPOMATIC_ASSERT (k->main_picture ());
- k->main_picture()->set_entry_point (trim_start);
- k->main_picture()->set_duration (k->main_picture()->intrinsic_duration() - trim_start - trim_end);
+ shared_ptr<dcp::ReelAsset> 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 ()) {
- DCPOMATIC_ASSERT (k->main_sound ());
- k->main_sound()->set_entry_point (trim_start);
- k->main_sound()->set_duration (k->main_sound()->intrinsic_duration() - trim_start - trim_end);
+ shared_ptr<dcp::ReelAsset> 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 ()) {
- DCPOMATIC_ASSERT (k->main_subtitle ());
- k->main_subtitle()->set_entry_point (trim_start);
- k->main_subtitle()->set_duration (k->main_subtitle()->intrinsic_duration() - trim_start - trim_end);
+ shared_ptr<dcp::ReelAsset> 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)))
);
}
return overlaps;
}
+bool
+Player::pass ()
+{
+ if (!_have_valid_pieces) {
+ setup_pieces ();
+ }
+
+ shared_ptr<Piece> earliest;
+ DCPTime earliest_position;
+ BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+ DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
+ if (!earliest || t < earliest_position) {
+ earliest_position = t;
+ earliest = i;
+ }
+ }
+
+ if (!earliest) {
+ return true;
+ }
+
+ cout << "Pass " << earliest->content->path(0) << "\n";
+ earliest->decoder->pass ();
+
+ /* Emit any audio that is ready */
+
+ pair<shared_ptr<AudioBuffers>, DCPTime> audio = _audio_merger.pull (earliest_position);
+ if (audio.first->frames() > 0) {
+ DCPOMATIC_ASSERT (audio.second >= _last_audio_time);
+ DCPTime t = _last_audio_time;
+ while (t < audio.second) {
+ /* Silence up to the time of this new audio */
+ DCPTime block = min (DCPTime::from_seconds (0.5), audio.second - t);
+ shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), block.frames_round(_film->audio_frame_rate())));
+ silence->make_silent ();
+ Audio (silence, t);
+ t += block;
+ }
+
+ Audio (audio.first, audio.second);
+ _last_audio_time = audio.second;
+ }
+
+ return false;
+}
+
+void
+Player::video (weak_ptr<Piece> wp, ContentVideo video)
+{
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ /* Time and period of the frame we will emit */
+ DCPTime const time = content_video_to_dcp (piece, video.frame.index());
+ DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate()));
+
+ /* Get any subtitles */
+
+ optional<PositionImage> subtitles;
+
+ for (list<pair<PlayerSubtitles, DCPTimePeriod> >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+
+ if (!i->second.overlap (period)) {
+ continue;
+ }
+
+ list<PositionImage> sub_images;
+
+ /* Image subtitles */
+ list<PositionImage> c = transform_image_subtitles (i->first.image);
+ copy (c.begin(), c.end(), back_inserter (sub_images));
+
+ /* Text subtitles (rendered to an image) */
+ if (!i->first.text.empty ()) {
+ list<PositionImage> s = render_subtitles (i->first.text, i->first.fonts, _video_container_size, time);
+ copy (s.begin (), s.end (), back_inserter (sub_images));
+ }
+
+ if (!sub_images.empty ()) {
+ subtitles = merge (sub_images);
+ }
+ }
+
+ /* Fill gaps */
+
+ if (_last_video_time) {
+ for (DCPTime i = _last_video_time.get(); i < time; i += DCPTime::from_frames (1, _film->video_frame_rate())) {
+ if (_playlist->video_content_at(i) && _last_video) {
+ Video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), i);
+ } else {
+ Video (black_player_video_frame (), i);
+ }
+ }
+ }
+
+ _last_video.reset (
+ new PlayerVideo (
+ video.image,
+ piece->content->video->crop (),
+ piece->content->video->fade (video.frame.index()),
+ piece->content->video->scale().size (
+ piece->content->video, _video_container_size, _film->frame_size ()
+ ),
+ _video_container_size,
+ video.frame.eyes(),
+ video.part,
+ piece->content->video->colour_conversion ()
+ )
+ );
+
+ if (subtitles) {
+ _last_video->set_subtitle (subtitles.get ());
+ }
+
+ _last_video_time = time;
+
+ cout << "Video @ " << to_string(_last_video_time.get()) << "\n";
+ Video (_last_video, *_last_video_time);
+
+ /* Discard any subtitles we no longer need */
+
+ for (list<pair<PlayerSubtitles, DCPTimePeriod> >::iterator i = _subtitles.begin (); i != _subtitles.end(); ) {
+ list<pair<PlayerSubtitles, DCPTimePeriod> >::iterator tmp = i;
+ ++tmp;
+
+ if (i->second.to < time) {
+ _subtitles.erase (i);
+ }
+
+ i = tmp;
+ }
+}
+
+void
+Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_audio)
+{
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ shared_ptr<AudioContent> content = piece->content->audio;
+ DCPOMATIC_ASSERT (content);
+
+ shared_ptr<AudioBuffers> audio = content_audio.audio;
+
+ /* Gain */
+ if (content->gain() != 0) {
+ shared_ptr<AudioBuffers> gain (new AudioBuffers (audio));
+ gain->apply_gain (content->gain ());
+ audio = gain;
+ }
+
+ /* XXX: end-trimming used to be checked here */
+
+ /* Compute time in the DCP */
+ DCPTime const time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000);
+
+ /* Remap channels */
+ shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
+ dcp_mapped->make_silent ();
+
+ AudioMapping map = stream->mapping ();
+ for (int i = 0; i < map.input_channels(); ++i) {
+ for (int j = 0; j < dcp_mapped->channels(); ++j) {
+ if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
+ dcp_mapped->accumulate_channel (
+ audio.get(),
+ i,
+ static_cast<dcp::Channel> (j),
+ map.get (i, static_cast<dcp::Channel> (j))
+ );
+ }
+ }
+ }
+
+ audio = dcp_mapped;
+
+ if (_audio_processor) {
+ audio = _audio_processor->run (audio, _film->audio_channels ());
+ }
+
+ _audio_merger.push (audio, time);
+}
+
+void
+Player::image_subtitle (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
+{
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ /* Apply content's subtitle offsets */
+ subtitle.sub.rectangle.x += piece->content->subtitle->x_offset ();
+ subtitle.sub.rectangle.y += piece->content->subtitle->y_offset ();
+
+ /* Apply content's subtitle scale */
+ subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale ();
+ subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale ();
+
+ /* Apply a corrective translation to keep the subtitle centred after that scale */
+ subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * (piece->content->subtitle->x_scale() - 1);
+ subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * (piece->content->subtitle->y_scale() - 1);
+
+ PlayerSubtitles ps;
+ ps.image.push_back (subtitle.sub);
+ DCPTimePeriod period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to));
+
+ if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) {
+ _subtitles.push_back (make_pair (ps, period));
+ } else {
+ Subtitle (ps, period);
+ }
+}
+
+void
+Player::text_subtitle (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
+{
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ PlayerSubtitles ps;
+ DCPTimePeriod const period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to));
+
+ 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();
+ float size = s.size();
+
+ /* Adjust size to express the common part of the scaling;
+ e.g. if xs = ys = 0.5 we scale size by 2.
+ */
+ if (xs > 1e-5 && ys > 1e-5) {
+ size *= 1 / min (1 / xs, 1 / ys);
+ }
+ s.set_size (size);
+
+ /* Then express aspect ratio changes */
+ if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
+ s.set_aspect_adjust (xs / ys);
+ }
+
+ s.set_in (dcp::Time(period.from.seconds(), 1000));
+ s.set_out (dcp::Time(period.to.seconds(), 1000));
+ ps.text.push_back (SubtitleString (s, piece->content->subtitle->outline_width()));
+ ps.add_fonts (piece->content->subtitle->fonts ());
+ }
+
+ if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) {
+ _subtitles.push_back (make_pair (ps, period));
+ } else {
+ Subtitle (ps, period);
+ }
+}
+
void
-Player::reset_pieces ()
+Player::seek (DCPTime time, bool accurate)
{
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
- i->decoder->reset ();
+ if (i->content->position() <= time && time < i->content->end()) {
+ i->decoder->seek (dcp_to_content_time (i, time), accurate);
+ }
+ }
+
+ if (accurate) {
+ _last_video_time = time - DCPTime::from_frames (1, _film->video_frame_rate ());
+ } else {
+ _last_video_time = optional<DCPTime> ();
}
}