X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=f3d78ab323803b396186ba928b5688c129b469a3;hp=0bdf46f4abe33532f2edc7f14e7ad0f29bcb219f;hb=b7a57184200d340bebcf81552aa1f05f220a8ec5;hpb=981ffdc9db4a84c614b3186a0fb27136fe6feb37 diff --git a/src/lib/player.cc b/src/lib/player.cc index 0bdf46f4a..f3d78ab32 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -20,46 +20,48 @@ #include "atmos_decoder.h" -#include "player.h" -#include "film.h" #include "audio_buffers.h" +#include "audio_content.h" +#include "audio_decoder.h" +#include "audio_processor.h" +#include "compose.hpp" +#include "config.h" #include "content_audio.h" +#include "content_video.h" #include "dcp_content.h" +#include "dcp_decoder.h" #include "dcpomatic_log.h" -#include "job.h" +#include "decoder.h" +#include "decoder_factory.h" +#include "ffmpeg_content.h" +#include "film.h" +#include "frame_rate_change.h" #include "image.h" -#include "raw_image_proxy.h" -#include "ratio.h" +#include "image_decoder.h" +#include "job.h" #include "log.h" -#include "render_text.h" -#include "config.h" -#include "content_video.h" +#include "maths_util.h" +#include "piece.h" +#include "player.h" #include "player_video.h" -#include "frame_rate_change.h" -#include "audio_processor.h" #include "playlist.h" +#include "ratio.h" +#include "raw_image_proxy.h" #include "referenced_reel_asset.h" -#include "decoder_factory.h" -#include "decoder.h" -#include "video_decoder.h" -#include "audio_decoder.h" +#include "render_text.h" +#include "shuffler.h" #include "text_content.h" #include "text_decoder.h" -#include "ffmpeg_content.h" -#include "audio_content.h" -#include "dcp_decoder.h" -#include "image_decoder.h" -#include "compose.hpp" -#include "shuffler.h" #include "timer.h" +#include "video_decoder.h" #include +#include +#include #include #include -#include -#include -#include #include #include +#include #include "i18n.h" @@ -70,7 +72,7 @@ using std::dynamic_pointer_cast; using std::list; using std::make_pair; using std::make_shared; -using std::map; +using std::make_shared; using std::max; using std::min; using std::min; @@ -78,7 +80,6 @@ using std::pair; using std::shared_ptr; using std::vector; using std::weak_ptr; -using std::make_shared; using boost::optional; using boost::scoped_ptr; #if BOOST_VERSION >= 106100 @@ -95,11 +96,12 @@ int const PlayerProperty::DCP_DECODE_REDUCTION = 704; int const PlayerProperty::PLAYBACK_LENGTH = 705; -Player::Player (shared_ptr film) +Player::Player (shared_ptr film, Image::Alignment subtitle_alignment) : _film (film) , _suspended (0) , _tolerant (film->tolerant()) , _audio_merger (_film->audio_frame_rate()) + , _subtitle_alignment (subtitle_alignment) { construct (); } @@ -134,12 +136,6 @@ Player::construct () } -Player::~Player () -{ - delete _shuffler; -} - - void Player::setup_pieces () { @@ -151,7 +147,7 @@ Player::setup_pieces () bool have_video (shared_ptr content) { - return static_cast(content->video) && content->video->use(); + return static_cast(content->video) && content->video->use() && content->can_be_played(); } @@ -170,9 +166,19 @@ Player::setup_pieces_unlocked () auto old_pieces = _pieces; _pieces.clear (); - delete _shuffler; - _shuffler = new Shuffler(); - _shuffler->Video.connect(bind(&Player::video, this, _1, _2)); + auto playlist_content = playlist()->content(); + bool const have_threed = std::any_of( + playlist_content.begin(), + playlist_content.end(), + [](shared_ptr c) { + return c->video && (c->video->frame_type() == VideoFrameType::THREE_D_LEFT || c->video->frame_type() == VideoFrameType::THREE_D_RIGHT); + }); + + + if (have_threed) { + _shuffler.reset(new Shuffler()); + _shuffler->Video.connect(bind(&Player::video, this, _1, _2)); + } for (auto i: playlist()->content()) { @@ -224,9 +230,9 @@ Player::setup_pieces_unlocked () _pieces.push_back (piece); if (decoder->video) { - if (i->video->frame_type() == VideoFrameType::THREE_D_LEFT || i->video->frame_type() == VideoFrameType::THREE_D_RIGHT) { + if (have_threed) { /* We need a Shuffler to cope with 3D L/R video data arriving out of sequence */ - decoder->video->Data.connect (bind(&Shuffler::video, _shuffler, weak_ptr(piece), _1)); + decoder->video->Data.connect (bind(&Shuffler::video, _shuffler.get(), weak_ptr(piece), _1)); } else { decoder->video->Data.connect (bind(&Player::video, this, weak_ptr(piece), _1)); } @@ -266,17 +272,17 @@ Player::setup_pieces_unlocked () } } + auto ignore_overlap = [](shared_ptr v) { + return v && v->use() && v->frame_type() != VideoFrameType::THREE_D_LEFT && v->frame_type() != VideoFrameType::THREE_D_RIGHT; + }; + for (auto i = _pieces.begin(); i != _pieces.end(); ++i) { - if (auto video = (*i)->content->video) { - if (video->use() && video->frame_type() != VideoFrameType::THREE_D_LEFT && video->frame_type() != VideoFrameType::THREE_D_RIGHT) { - /* Look for content later in the content list with in-use video that overlaps this */ - auto period = DCPTimePeriod((*i)->content->position(), (*i)->content->end(_film)); - auto j = i; - ++j; - for (; j != _pieces.end(); ++j) { - if ((*j)->content->video && (*j)->content->video->use()) { - (*i)->ignore_video = DCPTimePeriod((*j)->content->position(), (*j)->content->end(_film)).overlap(period); - } + if (ignore_overlap((*i)->content->video)) { + /* Look for content later in the content list with in-use video that overlaps this */ + auto const period = DCPTimePeriod((*i)->content->position(), (*i)->content->end(_film)); + for (auto j = std::next(i); j != _pieces.end(); ++j) { + if ((*j)->content->video && ignore_overlap((*j)->content->video)) { + (*i)->ignore_video = DCPTimePeriod((*j)->content->position(), (*j)->content->end(_film)).overlap(period); } } } @@ -285,9 +291,9 @@ Player::setup_pieces_unlocked () _black = Empty (_film, playlist(), bind(&have_video, _1), _playback_length); _silent = Empty (_film, playlist(), bind(&have_audio, _1), _playback_length); - _last_video_time = boost::optional(); - _last_video_eyes = Eyes::BOTH; - _last_audio_time = boost::optional(); + _next_video_time = boost::none; + _next_video_eyes = Eyes::BOTH; + _next_audio_time = boost::none; } @@ -338,7 +344,7 @@ Player::set_video_container_size (dcp::Size s) _video_container_size = s; - _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true)); + _black_image = make_shared(AV_PIX_FMT_RGB24, _video_container_size, Image::Alignment::PADDED); _black_image->make_black (); } @@ -564,61 +570,67 @@ Player::get_reel_assets () { /* Does not require a lock on _mutex as it's only called from DCPEncoder */ - list a; + list reel_assets; - for (auto i: playlist()->content()) { - auto j = dynamic_pointer_cast (i); - if (!j) { + for (auto content: playlist()->content()) { + auto dcp = dynamic_pointer_cast(content); + if (!dcp) { + continue; + } + + if (!dcp->reference_video() && !dcp->reference_audio() && !dcp->reference_text(TextType::OPEN_SUBTITLE) && !dcp->reference_text(TextType::CLOSED_CAPTION)) { continue; } scoped_ptr decoder; try { - decoder.reset (new DCPDecoder(_film, j, false, false, shared_ptr())); + decoder.reset (new DCPDecoder(_film, dcp, false, false, shared_ptr())); } catch (...) { - return a; + return reel_assets; } - 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 (); + auto const frame_rate = _film->video_frame_rate(); + DCPOMATIC_ASSERT (dcp->video_frame_rate()); + /* We should only be referencing if the DCP rate is the same as the film rate */ + DCPOMATIC_ASSERT (std::round(dcp->video_frame_rate().get()) == frame_rate); + + Frame const trim_start = dcp->trim_start().frames_round(frame_rate); + Frame const trim_end = dcp->trim_end().frames_round(frame_rate); /* position in the asset from the start */ int64_t offset_from_start = 0; - /* position in the asset from the end */ + /* position i the asset from the end */ int64_t offset_from_end = 0; - for (auto k: decoder->reels()) { + for (auto reel: decoder->reels()) { /* Assume that main picture duration is the length of the reel */ - offset_from_end += k->main_picture()->actual_duration(); + offset_from_end += reel->main_picture()->actual_duration(); } - for (auto k: decoder->reels()) { + for (auto reel: decoder->reels()) { /* Assume that main picture duration is the length of the reel */ - int64_t const reel_duration = k->main_picture()->actual_duration(); + int64_t const reel_duration = reel->main_picture()->actual_duration(); /* See doc/design/trim_reels.svg */ Frame const reel_trim_start = min(reel_duration, max(int64_t(0), trim_start - offset_from_start)); Frame const reel_trim_end = min(reel_duration, max(int64_t(0), reel_duration - (offset_from_end - trim_end))); - auto const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate()); - if (j->reference_video ()) { - maybe_add_asset (a, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr); + auto const from = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, frame_rate) - DCPTime::from_frames(trim_start, frame_rate)); + if (dcp->reference_video()) { + maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, frame_rate); } - if (j->reference_audio ()) { - maybe_add_asset (a, k->main_sound(), reel_trim_start, reel_trim_end, from, ffr); + if (dcp->reference_audio()) { + maybe_add_asset (reel_assets, reel->main_sound(), reel_trim_start, reel_trim_end, from, frame_rate); } - if (j->reference_text (TextType::OPEN_SUBTITLE)) { - maybe_add_asset (a, k->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr); + if (dcp->reference_text(TextType::OPEN_SUBTITLE)) { + maybe_add_asset (reel_assets, reel->main_subtitle(), reel_trim_start, reel_trim_end, from, frame_rate); } - if (j->reference_text (TextType::CLOSED_CAPTION)) { - for (auto l: k->closed_captions()) { - maybe_add_asset (a, l, reel_trim_start, reel_trim_end, from, ffr); + if (dcp->reference_text(TextType::CLOSED_CAPTION)) { + for (auto caption: reel->closed_captions()) { + maybe_add_asset (reel_assets, caption, reel_trim_start, reel_trim_end, from, frame_rate); } } @@ -627,7 +639,7 @@ Player::get_reel_assets () } } - return a; + return reel_assets; } @@ -703,11 +715,11 @@ Player::pass () earliest_content->done = earliest_content->decoder->pass (); auto dcp = dynamic_pointer_cast(earliest_content->content); if (dcp && !_play_referenced && dcp->reference_audio()) { - /* We are skipping some referenced DCP audio content, so we need to update _last_audio_time + /* We are skipping some referenced DCP audio content, so we need to update _next_audio_time to `hide' the fact that no audio was emitted during the referenced DCP (though we need to behave as though it was). */ - _last_audio_time = dcp->end (_film); + _next_audio_time = dcp->end (_film); } break; } @@ -720,20 +732,20 @@ Player::pass () { LOG_DEBUG_PLAYER ("Emit silence for gap at %1", to_string(_silent.position())); DCPTimePeriod period (_silent.period_at_position()); - if (_last_audio_time) { + if (_next_audio_time) { /* Sometimes the thing that happened last finishes fractionally before or after this silence. Bodge the start time of the silence to fix it. I think this is nothing to worry about since we will just add or remove a little silence at the end of some content. */ - int64_t const error = labs(period.from.get() - _last_audio_time->get()); + int64_t const error = labs(period.from.get() - _next_audio_time->get()); /* Let's not worry about less than a frame at 24fps */ int64_t const too_much_error = DCPTime::from_frames(1, 24).get(); if (error >= too_much_error) { _film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR); } DCPOMATIC_ASSERT (error < too_much_error); - period.from = *_last_audio_time; + period.from = *_next_audio_time; } if (period.duration() > one_video_frame()) { period.to = period.from + one_video_frame(); @@ -750,10 +762,38 @@ Player::pass () /* Emit any audio that is ready */ /* Work out the time before which the audio is definitely all here. This is the earliest last_push_end of one - of our streams, or the position of the _silent. + of our streams, or the position of the _silent. First, though we choose only streams that are less than + ignore_streams_behind seconds behind the furthest ahead (we assume that if a stream has fallen that far + behind it has finished). This is so that we don't withhold audio indefinitely awaiting data from a stream + that will never come, causing bugs like #2101. */ - auto pull_to = _playback_length; + constexpr int ignore_streams_behind = 5; + + using state_pair = std::pair; + + /* Find the 'leading' stream (i.e. the one that pushed data most recently) */ + auto latest_last_push_end = std::max_element( + _stream_states.begin(), + _stream_states.end(), + [](state_pair const& a, state_pair const& b) { return a.second.last_push_end < b.second.last_push_end; } + ); + + if (latest_last_push_end != _stream_states.end()) { + LOG_DEBUG_PLAYER("Leading stream is in %1 at %2", latest_last_push_end->second.piece->content->path(0), to_string(latest_last_push_end->second.last_push_end)); + } + + /* Now make a list of those streams that are less than ignore_streams_behind behind the leader */ + std::map alive_stream_states; for (auto const& i: _stream_states) { + if ((latest_last_push_end->second.last_push_end - i.second.last_push_end) < dcpomatic::DCPTime::from_seconds(ignore_streams_behind)) { + alive_stream_states.insert(i); + } else { + LOG_DEBUG_PLAYER("Ignoring stream %1 because it is too far behind", i.second.piece->content->path(0)); + } + } + + auto pull_to = _playback_length; + for (auto const& i: alive_stream_states) { if (!i.second.piece->done && i.second.last_push_end < pull_to) { pull_to = i.second.last_push_end; } @@ -765,26 +805,41 @@ Player::pass () LOG_DEBUG_PLAYER("Emitting audio up to %1", to_string(pull_to)); auto audio = _audio_merger.pull (pull_to); for (auto i = audio.begin(); i != audio.end(); ++i) { - if (_last_audio_time && i->second < *_last_audio_time) { + if (_next_audio_time && i->second < *_next_audio_time) { /* This new data comes before the last we emitted (or the last seek); discard it */ - auto cut = discard_audio (i->first, i->second, *_last_audio_time); + auto cut = discard_audio (i->first, i->second, *_next_audio_time); if (!cut.first) { continue; } *i = cut; - } else if (_last_audio_time && i->second > *_last_audio_time) { + } else if (_next_audio_time && i->second > *_next_audio_time) { /* There's a gap between this data and the last we emitted; fill with silence */ - fill_audio (DCPTimePeriod (*_last_audio_time, i->second)); + fill_audio (DCPTimePeriod (*_next_audio_time, i->second)); } emit_audio (i->first, i->second); } if (done) { - _shuffler->flush (); + if (_shuffler) { + _shuffler->flush (); + } for (auto const& i: _delay) { do_emit_video(i.first, i.second); } + + /* Perhaps we should have Empty entries for both eyes in the 3D case (somehow). + * However, if we have L and R video files, and one is shorter than the other, + * the fill code in ::video mostly takes care of filling in the gaps. + * However, since it fills at the point when it knows there is more video coming + * at time t (so it should fill any gap up to t) it can't do anything right at the + * end. This is particularly bad news if the last frame emitted is a LEFT + * eye, as the MXF writer will complain about the 3D sequence being wrong. + * Here's a hack to workaround that particular case. + */ + if (_next_video_eyes && _next_video_time && *_next_video_eyes == Eyes::RIGHT) { + do_emit_video (black_player_video_frame(Eyes::RIGHT), *_next_video_time); + } } return done; @@ -834,14 +889,18 @@ Player::open_subtitles_for_frame (DCPTime time) const return {}; } - return merge (captions); + return merge (captions, _subtitle_alignment); } void -Player::video (weak_ptr wp, ContentVideo video) +Player::video (weak_ptr weak_piece, ContentVideo video) { - auto piece = wp.lock (); + if (_suspended) { + return; + } + + auto piece = weak_piece.lock (); if (!piece) { return; } @@ -863,7 +922,7 @@ Player::video (weak_ptr wp, ContentVideo video) if it's after the content's period here as in that case we still need to fill any gap between `now' and the end of the content's period. */ - if (time < piece->content->position() || (_last_video_time && time < *_last_video_time)) { + if (time < piece->content->position() || (_next_video_time && time < *_next_video_time)) { return; } @@ -876,12 +935,12 @@ Player::video (weak_ptr wp, ContentVideo video) */ DCPTime fill_to = min (time, piece->content->end(_film)); - if (_last_video_time) { - DCPTime fill_from = max (*_last_video_time, piece->content->position()); + if (_next_video_time) { + DCPTime fill_from = max (*_next_video_time, piece->content->position()); /* Fill if we have more than half a frame to do */ if ((fill_to - fill_from) > one_video_frame() / 2) { - auto last = _last_video.find (wp); + auto last = _last_video.find (weak_piece); if (_film->three_d()) { auto fill_to_eyes = video.eyes; if (fill_to_eyes == Eyes::BOTH) { @@ -892,7 +951,7 @@ Player::video (weak_ptr wp, ContentVideo video) fill_to_eyes = Eyes::LEFT; } auto j = fill_from; - auto eyes = _last_video_eyes.get_value_or(Eyes::LEFT); + auto eyes = _next_video_eyes.get_value_or(Eyes::LEFT); if (eyes == Eyes::BOTH) { eyes = Eyes::LEFT; } @@ -923,16 +982,23 @@ Player::video (weak_ptr wp, ContentVideo video) } } - _last_video[wp] = std::make_shared( + auto const content_video = piece->content->video; + + _last_video[weak_piece] = std::make_shared( video.image, - piece->content->video->crop (), - piece->content->video->fade (_film, video.frame), - scale_for_display(piece->content->video->scaled_size(_film->frame_size()), _video_container_size, _film->frame_size()), + content_video->actual_crop(), + content_video->fade (_film, video.frame), + scale_for_display( + content_video->scaled_size(_film->frame_size()), + _video_container_size, + _film->frame_size(), + content_video->pixel_quanta() + ), _video_container_size, video.eyes, video.part, - piece->content->video->colour_conversion(), - piece->content->video->range(), + content_video->colour_conversion(), + content_video->range(), piece->content, video.frame, false @@ -941,7 +1007,7 @@ Player::video (weak_ptr wp, ContentVideo video) DCPTime t = time; for (int i = 0; i < frc.repeat; ++i) { if (t < piece->content->end(_film)) { - emit_video (_last_video[wp], t); + emit_video (_last_video[weak_piece], t); } t += one_video_frame (); } @@ -949,11 +1015,15 @@ Player::video (weak_ptr wp, ContentVideo video) void -Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_audio) +Player::audio (weak_ptr weak_piece, AudioStreamPtr stream, ContentAudio content_audio) { + if (_suspended) { + return; + } + DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); - auto piece = wp.lock (); + auto piece = weak_piece.lock (); if (!piece) { return; } @@ -992,12 +1062,28 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); - /* Gain */ - - if (content->gain() != 0) { - auto gain = make_shared(content_audio.audio); - gain->apply_gain (content->gain()); - content_audio.audio = gain; + /* Gain and fade */ + + auto const fade_coeffs = content->fade (stream, content_audio.frame, content_audio.audio->frames(), rfr); + if (content->gain() != 0 || !fade_coeffs.empty()) { + auto gain_buffers = make_shared(content_audio.audio); + if (!fade_coeffs.empty()) { + /* Apply both fade and gain */ + DCPOMATIC_ASSERT (fade_coeffs.size() == static_cast(gain_buffers->frames())); + auto const channels = gain_buffers->channels(); + auto const frames = fade_coeffs.size(); + auto data = gain_buffers->data(); + auto const gain = db_to_linear (content->gain()); + for (auto channel = 0; channel < channels; ++channel) { + for (auto frame = 0U; frame < frames; ++frame) { + data[channel][frame] *= gain * fade_coeffs[frame]; + } + } + } else { + /* Just apply gain */ + gain_buffers->apply_gain (content->gain()); + } + content_audio.audio = gain_buffers; } /* Remap */ @@ -1019,50 +1105,61 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a void -Player::bitmap_text_start (weak_ptr wp, weak_ptr wc, ContentBitmapText subtitle) +Player::bitmap_text_start (weak_ptr weak_piece, weak_ptr weak_content, ContentBitmapText subtitle) { - auto piece = wp.lock (); - auto text = wc.lock (); - if (!piece || !text) { + if (_suspended) { return; } - /* Apply content's subtitle offsets */ - subtitle.sub.rectangle.x += text->x_offset (); - subtitle.sub.rectangle.y += text->y_offset (); + auto piece = weak_piece.lock (); + auto content = weak_content.lock (); + if (!piece || !content) { + return; + } + + PlayerText ps; + for (auto& sub: subtitle.subs) + { + /* Apply content's subtitle offsets */ + sub.rectangle.x += content->x_offset (); + sub.rectangle.y += content->y_offset (); - /* Apply a corrective translation to keep the subtitle centred after the scale that is coming up */ - subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * ((text->x_scale() - 1) / 2); - subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * ((text->y_scale() - 1) / 2); + /* Apply a corrective translation to keep the subtitle centred after the scale that is coming up */ + sub.rectangle.x -= sub.rectangle.width * ((content->x_scale() - 1) / 2); + sub.rectangle.y -= sub.rectangle.height * ((content->y_scale() - 1) / 2); - /* Apply content's subtitle scale */ - subtitle.sub.rectangle.width *= text->x_scale (); - subtitle.sub.rectangle.height *= text->y_scale (); + /* Apply content's subtitle scale */ + sub.rectangle.width *= content->x_scale (); + sub.rectangle.height *= content->y_scale (); - PlayerText ps; - auto image = subtitle.sub.image; + auto image = sub.image; - /* We will scale the subtitle up to fit _video_container_size */ - int const width = subtitle.sub.rectangle.width * _video_container_size.width; - int const height = subtitle.sub.rectangle.height * _video_container_size.height; - if (width == 0 || height == 0) { - return; - } + /* We will scale the subtitle up to fit _video_container_size */ + int const width = sub.rectangle.width * _video_container_size.width; + int const height = sub.rectangle.height * _video_container_size.height; + if (width == 0 || height == 0) { + return; + } - dcp::Size scaled_size (width, height); - ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUVToRGB::REC601, image->pixel_format(), true, _fast), subtitle.sub.rectangle)); - DCPTime from (content_time_to_dcp (piece, subtitle.from())); + dcp::Size scaled_size (width, height); + ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUVToRGB::REC601, image->pixel_format(), Image::Alignment::PADDED, _fast), sub.rectangle)); + } - _active_texts[static_cast(text->type())].add_from (wc, ps, from); + DCPTime from(content_time_to_dcp(piece, subtitle.from())); + _active_texts[static_cast(content->type())].add_from(weak_content, ps, from); } void -Player::plain_text_start (weak_ptr wp, weak_ptr wc, ContentStringText subtitle) +Player::plain_text_start (weak_ptr weak_piece, weak_ptr weak_content, ContentStringText subtitle) { - auto piece = wp.lock (); - auto text = wc.lock (); - if (!piece || !text) { + if (_suspended) { + return; + } + + auto piece = weak_piece.lock (); + auto content = weak_content.lock (); + if (!piece || !content) { return; } @@ -1074,10 +1171,10 @@ Player::plain_text_start (weak_ptr wp, weak_ptr wc, Co } for (auto s: subtitle.subs) { - s.set_h_position (s.h_position() + text->x_offset ()); - s.set_v_position (s.v_position() + text->y_offset ()); - float const xs = text->x_scale(); - float const ys = text->y_scale(); + s.set_h_position (s.h_position() + content->x_offset()); + s.set_v_position (s.v_position() + content->y_offset()); + float const xs = content->x_scale(); + float const ys = content->y_scale(); float size = s.size(); /* Adjust size to express the common part of the scaling; @@ -1094,27 +1191,31 @@ Player::plain_text_start (weak_ptr wp, weak_ptr wc, Co } s.set_in (dcp::Time(from.seconds(), 1000)); - ps.string.push_back (StringText (s, text->outline_width())); - ps.add_fonts (text->fonts ()); + ps.string.push_back (StringText (s, content->outline_width())); + ps.add_fonts (content->fonts ()); } - _active_texts[static_cast(text->type())].add_from (wc, ps, from); + _active_texts[static_cast(content->type())].add_from(weak_content, ps, from); } void -Player::subtitle_stop (weak_ptr wp, weak_ptr wc, ContentTime to) +Player::subtitle_stop (weak_ptr weak_piece, weak_ptr weak_content, ContentTime to) { - auto text = wc.lock (); - if (!text) { + if (_suspended) { return; } - if (!_active_texts[static_cast(text->type())].have(wc)) { + auto content = weak_content.lock (); + if (!content) { return; } - shared_ptr piece = wp.lock (); + if (!_active_texts[static_cast(content->type())].have(weak_content)) { + return; + } + + auto piece = weak_piece.lock (); if (!piece) { return; } @@ -1125,11 +1226,11 @@ Player::subtitle_stop (weak_ptr wp, weak_ptr wc, Conte return; } - auto from = _active_texts[static_cast(text->type())].add_to (wc, dcp_to); + auto from = _active_texts[static_cast(content->type())].add_to(weak_content, dcp_to); - bool const always = (text->type() == TextType::OPEN_SUBTITLE && _always_burn_open_subtitles); - if (text->use() && !always && !text->burn()) { - Text (from.first, text->type(), text->dcp_track().get_value_or(DCPTextTrack()), DCPTimePeriod (from.second, dcp_to)); + bool const always = (content->type() == TextType::OPEN_SUBTITLE && _always_burn_open_subtitles); + if (content->use() && !always && !content->burn()) { + Text (from.first, content->type(), content->dcp_track().get_value_or(DCPTextTrack()), DCPTimePeriod(from.second, dcp_to)); } } @@ -1180,13 +1281,13 @@ Player::seek (DCPTime time, bool accurate) } if (accurate) { - _last_video_time = time; - _last_video_eyes = Eyes::LEFT; - _last_audio_time = time; + _next_video_time = time; + _next_video_eyes = Eyes::LEFT; + _next_audio_time = time; } else { - _last_video_time = optional(); - _last_video_eyes = optional(); - _last_audio_time = optional(); + _next_video_time = boost::none; + _next_video_eyes = boost::none; + _next_audio_time = boost::none; } _black.set_position (time); @@ -1209,15 +1310,15 @@ Player::emit_video (shared_ptr pv, DCPTime time) } } - /* We need a delay to give a little wiggle room to ensure that relevent subtitles arrive at the + /* We need a delay to give a little wiggle room to ensure that relevant subtitles arrive at the player before the video that requires them. */ _delay.push_back (make_pair (pv, time)); if (pv->eyes() == Eyes::BOTH || pv->eyes() == Eyes::RIGHT) { - _last_video_time = time + one_video_frame(); + _next_video_time = time + one_video_frame(); } - _last_video_eyes = increment_eyes (pv->eyes()); + _next_video_eyes = increment_eyes (pv->eyes()); if (_delay.size() < 3) { return; @@ -1251,14 +1352,14 @@ void Player::emit_audio (shared_ptr data, DCPTime time) { /* Log if the assert below is about to fail */ - if (_last_audio_time && labs(time.get() - _last_audio_time->get()) > 1) { - _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_last_audio_time)), LogEntry::TYPE_WARNING); + if (_next_audio_time && labs(time.get() - _next_audio_time->get()) > 1) { + _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_next_audio_time)), LogEntry::TYPE_WARNING); } /* This audio must follow on from the previous, allowing for half a sample (at 48kHz) leeway */ - DCPOMATIC_ASSERT (!_last_audio_time || labs(time.get() - _last_audio_time->get()) < 2); + DCPOMATIC_ASSERT (!_next_audio_time || labs(time.get() - _next_audio_time->get()) < 2); Audio (data, time, _film->audio_frame_rate()); - _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); + _next_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); } @@ -1329,7 +1430,7 @@ Player::set_dcp_decode_reduction (optional reduction) optional -Player::content_time_to_dcp (shared_ptr content, ContentTime t) +Player::content_time_to_dcp (shared_ptr content, ContentTime t) { boost::mutex::scoped_lock lm (_mutex); @@ -1344,6 +1445,22 @@ Player::content_time_to_dcp (shared_ptr content, ContentTime t) } +optional +Player::dcp_to_content_time (shared_ptr content, DCPTime t) +{ + boost::mutex::scoped_lock lm (_mutex); + + for (auto i: _pieces) { + if (i->content == content) { + return dcp_to_content_time (i, t); + } + } + + /* We couldn't find this content; perhaps things are being changed over */ + return {}; +} + + shared_ptr Player::playlist () const { @@ -1352,8 +1469,22 @@ Player::playlist () const void -Player::atmos (weak_ptr, ContentAtmos data) +Player::atmos (weak_ptr weak_piece, ContentAtmos data) { - Atmos (data.data, DCPTime::from_frames(data.frame, _film->video_frame_rate()), data.metadata); + if (_suspended) { + return; + } + + auto piece = weak_piece.lock (); + DCPOMATIC_ASSERT (piece); + + auto const vfr = _film->video_frame_rate(); + + DCPTime const dcp_time = DCPTime::from_frames(data.frame, vfr) - DCPTime(piece->content->trim_start(), FrameRateChange(vfr, vfr)); + if (dcp_time < piece->content->position() || dcp_time >= (piece->content->end(_film))) { + return; + } + + Atmos (data.data, dcp_time, data.metadata); }