, _playlist (playlist)
, _have_valid_pieces (false)
, _ignore_video (false)
- , _ignore_audio (false)
+ , _ignore_subtitle (false)
, _always_burn_subtitles (false)
, _fast (false)
, _play_referenced (false)
decoder->video->set_ignore ();
}
- if (decoder->audio && _ignore_audio) {
- decoder->audio->set_ignore ();
+ if (decoder->subtitle && _ignore_subtitle) {
+ decoder->subtitle->set_ignore ();
}
shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
}
}
- if (!_play_referenced) {
- BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
- shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (i->content);
- if (dc) {
- if (dc->reference_video()) {
- _no_video.push_back (DCPTimePeriod (dc->position(), dc->end()));
- }
- if (dc->reference_audio()) {
- _no_audio.push_back (DCPTimePeriod (dc->position(), dc->end()));
- }
- }
- }
- }
+ _black = Empty (_film, bind(&Content::video, _1));
+ _silent = Empty (_film, bind(&Content::audio, _1));
_last_video_time = DCPTime ();
_last_audio_time = 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 ());
+ return DCPTime::from_frames (f, _film->audio_frame_rate())
+ - DCPTime (piece->content->trim_start(), piece->frc)
+ + piece->content->position();
}
ContentTime
_ignore_video = true;
}
+void
+Player::set_ignore_subtitle ()
+{
+ _ignore_subtitle = true;
+}
+
/** Set whether or not this player should always burn text subtitles into the image,
* regardless of the content settings.
* @param burn true to always burn subtitles, false to obey content settings.
setup_pieces ();
}
+ /* Find the decoder or empty which is farthest behind where we are and make it emit some data */
+
shared_ptr<Piece> earliest;
DCPTime earliest_content;
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
if (!i->done) {
DCPTime const t = content_time_to_dcp (i, i->decoder->position());
- if (!earliest || t < earliest_content) {
+ /* Given two choices at the same time, pick the one with a subtitle so we see it before
+ the video.
+ */
+ if (!earliest || t < earliest_content || (t == earliest_content && i->decoder->subtitle)) {
earliest_content = t;
earliest = i;
}
}
}
- /* Fill towards the next thing that might happen (or the end of the playlist). This is to fill gaps between content,
- NOT to fill gaps within content (the latter is done in ::video())
- */
- DCPTime fill_towards = earliest ? earliest_content : _playlist->length().ceil(_film->video_frame_rate());
-
- /* Work out where to fill video from */
- optional<DCPTime> video_fill_from;
- if (_last_video_time) {
- /* Fill from the last video or seek time */
- video_fill_from = _last_video_time;
- }
+ bool done = false;
- bool filled = false;
- /* Fill some black if we would emit before the earliest piece of content. This is so we act like a phantom
- Piece which emits black in spaces (we only emit if we are the earliest thing)
- */
- if (video_fill_from && (!earliest || *video_fill_from < earliest_content) && ((fill_towards - *video_fill_from)) >= one_video_frame()) {
- list<DCPTimePeriod> p = subtract(DCPTimePeriod(*video_fill_from, *video_fill_from + one_video_frame()), _no_video);
- if (!p.empty ()) {
- emit_video (black_player_video_frame(), p.front().from);
- filled = true;
+ if (!_black.done() && (!earliest || _black.position() < earliest_content)) {
+ /* There is some black that must be emitted */
+ emit_video (black_player_video_frame(), _black.position());
+ _black.set_position (_black.position() + one_video_frame());
+ } else if (!_silent.done() && (!earliest || _silent.position() < earliest_content)) {
+ /* There is some silence that must be emitted */
+ DCPTimePeriod period (_silent.period_at_position());
+ if (period.duration() > one_video_frame()) {
+ period.to = period.from + one_video_frame();
}
+ fill_audio (period);
+ _silent.set_position (period.to);
} else if (_playlist->length() == DCPTime()) {
/* Special case of an empty Film; just give one black frame */
emit_video (black_player_video_frame(), DCPTime());
- filled = true;
- }
-
- optional<DCPTime> audio_fill_from;
- if (_last_audio_time) {
- /* Fill from the last audio or seek time */
- audio_fill_from = _last_audio_time;
- }
-
- DCPTime audio_fill_towards = fill_towards;
- if (earliest && earliest->content->audio) {
- audio_fill_towards += DCPTime::from_seconds (earliest->content->audio->delay() / 1000.0);
- }
-
- if (audio_fill_from && audio_fill_from < audio_fill_towards && ((audio_fill_towards - *audio_fill_from) >= one_video_frame())) {
- DCPTimePeriod period (*audio_fill_from, audio_fill_towards);
- if (period.duration() > one_video_frame()) {
- period.to = period.from + one_video_frame();
- }
- list<DCPTimePeriod> p = subtract(period, _no_audio);
- if (!p.empty ()) {
- fill_audio (p.front());
- filled = true;
- }
- }
-
- if (earliest) {
+ } else if (earliest) {
earliest->done = earliest->decoder->pass ();
+ } else {
+ done = true;
}
/* Emit any audio that is ready */
- DCPTime pull_to = _playlist->length ();
+ DCPTime pull_to = _film->length ();
for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) {
if (!i->second.piece->done && i->second.last_push_end < pull_to) {
pull_to = i->second.last_push_end;
*i = cut;
}
- if (_last_audio_time) {
- fill_audio (DCPTimePeriod (*_last_audio_time, i->second));
- }
-
emit_audio (i->first, i->second);
}
- return !earliest && !filled;
+ return done;
}
optional<PositionImage>
DCPTime const time = content_video_to_dcp (piece, video.frame);
DCPTimePeriod const period (time, time + one_video_frame());
- /* Discard if it's outside the content's period or if it's before the last accurate seek */
- if (
- time < piece->content->position() ||
- time >= piece->content->end() ||
- (_last_video_time && time < *_last_video_time)) {
- return;
- }
-
/* Fill gaps that we discover now that we have some video which needs to be emitted */
- optional<DCPTime> fill_to;
if (_last_video_time) {
- fill_to = _last_video_time;
- }
-
- if (fill_to) {
/* XXX: this may not work for 3D */
- BOOST_FOREACH (DCPTimePeriod i, subtract(DCPTimePeriod (*fill_to, time), _no_video)) {
- for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
- LastVideoMap::const_iterator k = _last_video.find (wp);
- if (k != _last_video.end ()) {
- emit_video (k->second, j);
- } else {
- emit_video (black_player_video_frame(), j);
- }
+ DCPTime fill_from = max (*_last_video_time, piece->content->position());
+ for (DCPTime j = fill_from; j < time; j += one_video_frame()) {
+ LastVideoMap::const_iterator k = _last_video.find (wp);
+ if (k != _last_video.end ()) {
+ emit_video (k->second, j);
+ } else {
+ emit_video (black_player_video_frame(), j);
}
}
}
+ /* Discard if it's outside the content's period or if it's before the last accurate seek */
+ if (
+ time < piece->content->position() ||
+ time >= piece->content->end() ||
+ (_last_video_time && time < *_last_video_time)) {
+ return;
+ }
+
_last_video[wp].reset (
new PlayerVideo (
video.image,
emit_video (_last_video[wp], time);
}
-/** Do our common processing on some audio */
-void
-Player::audio_transform (shared_ptr<AudioContent> content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time)
-{
- DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
-
- /* Gain */
-
- if (content->gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
- gain->apply_gain (content->gain ());
- content_audio.audio = gain;
- }
-
- /* Remap */
-
- content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping());
-
- /* Process */
-
- if (_audio_processor) {
- content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
- }
-
- /* Push */
-
- _audio_merger.push (content_audio.audio, time);
- DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
- _stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
-}
-
void
Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_audio)
{
DCPOMATIC_ASSERT (content);
/* Compute time in the DCP */
- DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0);
+ DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame);
/* And the end of this block in the DCP */
DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate());
content_audio.audio = cut;
}
- audio_transform (content, stream, content_audio, time);
+ DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
+
+ /* Gain */
+
+ if (content->gain() != 0) {
+ shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
+ gain->apply_gain (content->gain ());
+ content_audio.audio = gain;
+ }
+
+ /* Remap */
+
+ content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping());
+
+ /* Process */
+
+ if (_audio_processor) {
+ content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
+ }
+
+ /* Push */
+
+ _audio_merger.push (content_audio.audio, time);
+ DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
+ _stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
}
void
_last_audio_time = optional<DCPTime>();
}
+ _black.set_position (time);
+ _silent.set_position (time);
+
_last_video.clear ();
}
DCPOMATIC_ASSERT (period.from < period.to);
- BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) {
- DCPTime t = i.from;
- while (t < i.to) {
- DCPTime block = min (DCPTime::from_seconds (0.5), i.to - t);
- Frame const samples = block.frames_round(_film->audio_frame_rate());
- if (samples) {
- shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
- silence->make_silent ();
- emit_audio (silence, t);
- }
- t += block;
+ DCPTime t = period.from;
+ while (t < period.to) {
+ DCPTime block = min (DCPTime::from_seconds (0.5), period.to - t);
+ Frame const samples = block.frames_round(_film->audio_frame_rate());
+ if (samples) {
+ shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
+ silence->make_silent ();
+ emit_audio (silence, t);
}
+ t += block;
}
}