}
}
- _last_video_time = optional<DCPTime> ();
- _last_audio_time = optional<DCPTime> ();
+ _last_video_time = DCPTime ();
+ _last_audio_time = DCPTime ();
_have_valid_pieces = true;
}
}
}
- bool filled = false;
+ /* 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();
+
+ /* Work out where to fill video from */
+ optional<DCPTime> video_fill_from;
if (_last_video_time) {
- filled = fill_video (DCPTimePeriod (_last_video_time.get(), earliest ? earliest_content : _playlist->length()));
- } else if (_last_seek_time) {
- filled = fill_video (DCPTimePeriod (_last_seek_time.get(), _last_seek_time.get() + one_video_frame ()));
+ /* Fill from the last video or seek time */
+ video_fill_from = _last_video_time;
}
- if (!earliest && !filled) {
- return true;
+ 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;
+ }
+ } 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;
+ }
+
+ /* XXX: _no_audio */
+ if (audio_fill_from && audio_fill_from < fill_towards) {
+ DCPTimePeriod period (*audio_fill_from, fill_towards);
+ if (period.duration() > one_video_frame()) {
+ period.to = period.from + one_video_frame();
+ }
+ list<DCPTimePeriod> p = subtract(period, _no_video);
+ if (!p.empty ()) {
+ fill_audio (period);
+ }
+ filled = true;
}
/* Emit any audio that is ready */
- DCPTime pull_from = _playlist->length ();
+ DCPTime pull_to = _playlist->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_from) {
- pull_from = i->second.last_push_end;
+ 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_from);
+ 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.get()) {
+ 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.
*/
}
if (_last_audio_time) {
- fill_audio (DCPTimePeriod (_last_audio_time.get(), i->second));
+ fill_audio (DCPTimePeriod (*_last_audio_time, i->second));
}
- Audio (i->first, i->second);
- _last_audio_time = i->second + DCPTime::from_frames(i->first->frames(), _film->audio_frame_rate());
+ emit_audio (i->first, i->second);
}
- return false;
+ return !earliest && !filled;
}
optional<PositionImage>
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)) {
+ if (
+ time < piece->content->position() ||
+ time >= piece->content->end() ||
+ (_last_video_time && time < *_last_video_time)) {
return;
}
- /* Fill gaps caused by (the hopefully rare event of) a decoder not emitting contiguous video. We have to do this here
- as in the problematic case we are about to emit a frame which is not contiguous with the previous.
- */
+ /* 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_video (DCPTimePeriod (_last_video_time.get(), 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);
+ }
+ }
+ }
}
- _last_video.reset (
+ _last_video[wp].reset (
new PlayerVideo (
video.image,
piece->content->video->crop (),
)
);
- emit_video (_last_video, time);
+ emit_video (_last_video[wp], time);
}
void
content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
}
+ /* Pad any gap which may be caused by audio delay */
+
+ if (_last_audio_time) {
+ fill_audio (DCPTimePeriod (*_last_audio_time, time));
+ }
+
/* Push */
_audio_merger.push (content_audio.audio, time);
return;
} else if (end > piece->content->end()) {
Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate());
- DCPOMATIC_ASSERT (remaining_frames > 0);
+ if (remaining_frames == 0) {
+ return;
+ }
shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
content_audio.audio = cut;
_last_video_time = time;
_last_audio_time = time;
} else {
- _last_video_time = optional<DCPTime> ();
- _last_audio_time = optional<DCPTime> ();
+ _last_video_time = optional<DCPTime>();
+ _last_audio_time = optional<DCPTime>();
}
-
- _last_seek_time = time;
}
shared_ptr<Resampler>
return r;
}
-bool
-Player::fill_video (DCPTimePeriod period)
-{
- /* XXX: this may not work for 3D */
- bool filled = false;
- BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_video)) {
- for (DCPTime j = i.from; j < i.to; j += one_video_frame()) {
- if (_playlist->video_content_at(j) && _last_video) {
- emit_video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), j);
- } else {
- emit_video (black_player_video_frame(), j);
- }
- filled = true;
- }
- }
- return filled;
-}
-
void
Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
{
if (subtitles) {
pv->set_subtitle (subtitles.get ());
}
+
Video (pv, time);
- _last_video_time = time + one_video_frame();
- _active_subtitles.clear_before (time);
+
+ if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+ _last_video_time = time + one_video_frame();
+ _active_subtitles.clear_before (time);
+ }
+}
+
+void
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
+{
+ Audio (data, time);
+ _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate ());
}
void
if (samples) {
shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
silence->make_silent ();
- Audio (silence, t);
+ emit_audio (silence, t);
}
t += block;
}
projects / dcpomatic.git / blobdiff