, _playlist (playlist)
, _have_valid_pieces (false)
, _ignore_video (false)
- , _ignore_audio (false)
+ , _ignore_subtitle (false)
, _always_burn_subtitles (false)
, _fast (false)
, _play_referenced (false)
continue;
}
- shared_ptr<Decoder> decoder = decoder_factory (i, _film->log());
+ shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
if (!decoder) {
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 (dcp && _play_referenced) {
- dcp->set_decode_referenced ();
+ if (_play_referenced) {
+ dcp->set_decode_referenced ();
+ }
+ dcp->set_forced_reduction (_dcp_decode_reduction);
}
shared_ptr<Piece> piece (new Piece (i, decoder, frc));
}
}
+ _stream_states.clear ();
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
if (i->content->audio) {
BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) {
}
}
+ _black = Empty (_film->content(), _film->length(), bind(&Content::video, _1));
+ _silent = Empty (_film->content(), _film->length(), bind(&Content::audio, _1));
+
_last_video_time = DCPTime ();
_last_audio_time = DCPTime ();
_have_valid_pieces = true;
property == DCPContentProperty::NEEDS_ASSETS ||
property == DCPContentProperty::NEEDS_KDM ||
property == SubtitleContentProperty::COLOUR ||
- property == SubtitleContentProperty::OUTLINE ||
- property == SubtitleContentProperty::SHADOW ||
+ property == SubtitleContentProperty::EFFECT ||
property == SubtitleContentProperty::EFFECT_COLOUR ||
property == FFmpegContentProperty::SUBTITLE_STREAM ||
+ property == FFmpegContentProperty::FILTERS ||
property == VideoContentProperty::COLOUR_CONVERSION
) {
Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
{
/* 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 ());
+ DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc);
+ return d + piece->content->position();
}
Frame
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.
_always_burn_subtitles = burn;
}
+/** Sets up the player to be faster, possibly at the expense of quality */
void
Player::set_fast ()
{
scoped_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (j, _film->log()));
+ decoder.reset (new DCPDecoder (j, _film->log(), false));
} catch (...) {
return a;
}
setup_pieces ();
}
- bool filled = false;
-
- if (_last_video_time && !_playlist->video_content_at(*_last_video_time) && *_last_video_time < _playlist->length()) {
- /* _last_video_time is the time just after the last video we emitted, and there is no video content
- at this time so we need to emit some black.
- */
- emit_video (black_player_video_frame(), *_last_video_time);
- filled = true;
- } else if (_playlist->length() == DCPTime()) {
+ if (_playlist->length() == DCPTime()) {
/* Special case of an empty Film; just give one black frame */
emit_video (black_player_video_frame(), DCPTime());
- filled = true;
+ return true;
}
- if (_last_audio_time && !_playlist->audio_content_at(*_last_audio_time) && *_last_audio_time < _playlist->length()) {
- /* _last_audio_time is the time just after the last audio we emitted. There is no audio here
- so we need to emit some silence.
- */
- shared_ptr<Content> next = _playlist->next_audio_content(*_last_audio_time);
- DCPTimePeriod period (*_last_audio_time, next ? next->position() : _playlist->length());
- if (period.duration() > one_video_frame()) {
- period = DCPTimePeriod (*_last_audio_time, *_last_audio_time + one_video_frame());
- }
- fill_audio (period);
- filled = true;
- }
-
- /* Now pass() the decoder which is farthest behind where we are */
+ /* 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;
+ shared_ptr<Piece> earliest_content;
+ optional<DCPTime> earliest_time;
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) {
- earliest_content = t;
- earliest = i;
+ if (i->done) {
+ continue;
+ }
+
+ DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+ if (t > i->content->end()) {
+ i->done = true;
+ } else {
+ /* Given two choices at the same time, pick the one with a subtitle so we see it before
+ the video.
+ */
+ if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->decoder->subtitle)) {
+ earliest_time = t;
+ earliest_content = i;
}
}
}
- if (!filled && earliest) {
- earliest->done = earliest->decoder->pass ();
+ bool done = false;
+
+ enum {
+ NONE,
+ CONTENT,
+ BLACK,
+ SILENT
+ } which = NONE;
+
+ if (earliest_content) {
+ which = CONTENT;
+ }
+
+ if (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) {
+ earliest_time = _black.position ();
+ which = BLACK;
+ }
+
+ if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) {
+ earliest_time = _silent.position ();
+ which = SILENT;
+ }
+
+ switch (which) {
+ case CONTENT:
+ earliest_content->done = earliest_content->decoder->pass ();
+ break;
+ case BLACK:
+ emit_video (black_player_video_frame(), _black.position());
+ _black.set_position (_black.position() + one_video_frame());
+ break;
+ case SILENT:
+ {
+ 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);
+ break;
+ }
+ case NONE:
+ done = true;
+ break;
}
/* 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;
list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_to);
for (list<pair<shared_ptr<AudioBuffers>, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) {
if (_last_audio_time && i->second < *_last_audio_time) {
- /* There has been an accurate seek and we have received some audio before the seek time;
- discard it.
- */
+ /* This new data comes before the last we emitted (or the last seek); discard it */
pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time);
if (!cut.first) {
continue;
}
*i = cut;
- }
-
- if (_last_audio_time) {
- /* Fill in the gap before delayed audio; this doesn't need to take into account
- periods with no audio as it should only occur in delayed audio case.
- */
+ } else if (_last_audio_time && i->second > *_last_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));
}
emit_audio (i->first, i->second);
}
- return !earliest && !filled;
+ return done;
}
optional<PositionImage>
return;
}
- /* Time and period of the frame we will emit */
+ /* Time of the first frame we will emit */
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 */
}
}
- /* 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;
+ DCPTime t = time;
+ for (int i = 0; i < frc.repeat; ++i) {
+ emit_video (_last_video[wp], t);
+ t += one_video_frame ();
}
-
- /* 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
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
void
Player::seek (DCPTime time, bool accurate)
{
+ if (!_have_valid_pieces) {
+ setup_pieces ();
+ }
+
if (_audio_processor) {
_audio_processor->flush ();
}
_last_audio_time = optional<DCPTime>();
}
+ _black.set_position (time);
+ _silent.set_position (time);
+
_last_video.clear ();
}
cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
return make_pair(cut, time + discard_time);
}
+
+void
+Player::set_dcp_decode_reduction (optional<int> reduction)
+{
+ if (reduction == _dcp_decode_reduction) {
+ return;
+ }
+
+ _dcp_decode_reduction = reduction;
+ _have_valid_pieces = false;
+ Changed (false);
+}
projects / dcpomatic.git / blobdiff