, audio_position (c->position ())
{}
+ /** Set this piece to repeat a video frame a given number of times */
void set_repeat (IncomingVideo video, int num)
{
- cout << "Set repeat " << num << "\n";
repeat_video = video;
repeat_to_do = num;
repeat_done = 0;
void repeat (Player* player)
{
- cout << "repeating; " << repeat_done << "\n";
player->process_video (
repeat_video.weak_piece,
repeat_video.image,
repeat_video.eyes,
- repeat_video.same,
+ repeat_done > 0,
repeat_video.frame,
(repeat_done + 1) * (TIME_HZ / player->_film->video_frame_rate ())
);
shared_ptr<Content> content;
shared_ptr<Decoder> decoder;
+ /** Time of the last video we emitted relative to the start of the DCP */
Time video_position;
+ /** Time of the last audio we emitted relative to the start of the DCP */
Time audio_position;
IncomingVideo repeat_video;
for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
if ((*i)->decoder->done ()) {
- cout << "Scan: done.\n";
continue;
}
- if (_video && dynamic_pointer_cast<VideoDecoder> ((*i)->decoder)) {
+ shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> ((*i)->decoder);
+ shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+
+ if (_video && vd) {
if ((*i)->video_position < earliest_t) {
earliest_t = (*i)->video_position;
earliest = *i;
}
}
- if (_audio && dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+ if (_audio && ad && ad->has_audio ()) {
if ((*i)->audio_position < earliest_t) {
earliest_t = (*i)->audio_position;
earliest = *i;
}
if (!earliest) {
- cout << "No earliest: out.\n";
flush ();
return true;
}
- cout << "Earliest: " << earliest_t << "\n";
-
switch (type) {
case VIDEO:
- cout << "VIDEO.\n";
if (earliest_t > _video_position) {
emit_black ();
} else {
if (earliest->repeating ()) {
- cout << "-repeating.\n";
earliest->repeat (this);
} else {
- cout << "-passing.\n";
earliest->decoder->pass ();
}
}
break;
case AUDIO:
- cout << "SOUND.\n";
if (earliest_t > _audio_position) {
emit_silence (_film->time_to_audio_frames (earliest_t - _audio_position));
} else {
if (_audio) {
Time audio_done_up_to = TIME_MAX;
for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
+ if ((*i)->decoder->done ()) {
+ continue;
+ }
+
if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
audio_done_up_to = min (audio_done_up_to, (*i)->audio_position);
}
return false;
}
+/** @param extra Amount of extra time to add to the content frame's time (for repeat) */
void
Player::process_video (weak_ptr<Piece> weak_piece, shared_ptr<const Image> image, Eyes eyes, bool same, VideoContent::Frame frame, Time extra)
{
- cout << "PLAYER RECEIVES A VIDEO FRAME, extra " << extra << "\n";
-
/* Keep a note of what came in so that we can repeat it if required */
_last_incoming_video.weak_piece = weak_piece;
_last_incoming_video.image = image;
_last_incoming_video.eyes = eyes;
_last_incoming_video.same = same;
_last_incoming_video.frame = frame;
+ _last_incoming_video.extra = extra;
shared_ptr<Piece> piece = weak_piece.lock ();
if (!piece) {
_last_emit_was_black = false;
_video_position = piece->video_position = time;
- cout << "frc.repeat=" << frc.repeat << "; vp now " << _video_position << "\n";
-
if (frc.repeat > 1 && !piece->repeating ()) {
piece->set_repeat (_last_incoming_video, frc.repeat - 1);
}
return;
}
- Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time;
+ Time time = content->position() + (content->audio_delay() * TIME_HZ / 1000) + relative_time - content->trim_start ();
/* Remap channels */
shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
if (!vc) {
continue;
}
-
+
+ /* s is the offset of t from the start position of this content */
Time s = t - vc->position ();
s = max (static_cast<Time> (0), s);
s = min (vc->length_after_trim(), s);
+ /* Hence set the piece positions to the `global' time */
(*i)->video_position = (*i)->audio_position = vc->position() + s;
- FrameRateConversion frc (vc->video_frame_rate(), _film->video_frame_rate());
- /* Here we are converting from time (in the DCP) to a frame number in the content.
- Hence we need to use the DCP's frame rate and the double/skip correction, not
- the source's rate.
- */
- VideoContent::Frame f = (s + vc->trim_start ()) * _film->video_frame_rate() / (frc.factor() * TIME_HZ);
- dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (f, accurate);
+ /* And seek the decoder */
+ dynamic_pointer_cast<VideoDecoder>((*i)->decoder)->seek (
+ vc->time_to_content_video_frames (s + vc->trim_start ()), accurate
+ );
(*i)->reset_repeat ();
}
if (fc) {
shared_ptr<FFmpegDecoder> fd (new FFmpegDecoder (_film, fc, _video, _audio));
- fd->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4, 0));
- fd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
- fd->Subtitle.connect (bind (&Player::process_subtitle, this, piece, _1, _2, _3, _4));
+ fd->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
+ fd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2));
+ fd->Subtitle.connect (bind (&Player::process_subtitle, this, weak_ptr<Piece> (piece), _1, _2, _3, _4));
+ fd->seek (fc->time_to_content_video_frames (fc->trim_start ()), true);
piece->decoder = fd;
}
if (!id) {
id.reset (new StillImageDecoder (_film, ic));
- id->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4, 0));
+ id->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
}
piece->decoder = id;
if (!md) {
md.reset (new MovingImageDecoder (_film, mc));
- md->Video.connect (bind (&Player::process_video, this, piece, _1, _2, _3, _4, 0));
+ md->Video.connect (bind (&Player::process_video, this, weak_ptr<Piece> (piece), _1, _2, _3, _4, 0));
}
piece->decoder = md;
shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
if (sc) {
shared_ptr<AudioDecoder> sd (new SndfileDecoder (_film, sc));
- sd->Audio.connect (bind (&Player::process_audio, this, piece, _1, _2));
+ sd->Audio.connect (bind (&Player::process_audio, this, weak_ptr<Piece> (piece), _1, _2));
piece->decoder = sd;
}
if (!create) {
return shared_ptr<Resampler> ();
}
+
+ _film->log()->log (
+ String::compose (
+ "Creating new resampler for %1 to %2 with %3 channels", c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()
+ )
+ );
shared_ptr<Resampler> r (new Resampler (c->content_audio_frame_rate(), c->output_audio_frame_rate(), c->audio_channels()));
_resamplers[c] = r;
#ifdef DCPOMATIC_DEBUG
_last_video.reset ();
#endif
-
+
Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position);
_video_position += _film->video_frames_to_time (1);
_last_emit_was_black = true;
_last_incoming_video.eyes,
_last_incoming_video.same,
_last_incoming_video.frame,
- 0
+ _last_incoming_video.extra
);
return true;
projects / dcpomatic.git / blobdiff