X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=48c75078e12a59c2bdfabab7f5a91bbf1ea085f0;hb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;hp=e3d88a54c212dbe36e3225a1f337090d76050d13;hpb=ec95ff05f66e9b4cf3bcdbefa0c75ca8f99dc279;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index e3d88a54c..48c75078e 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -18,6 +18,7 @@ */ #include +#include #include "player.h" #include "film.h" #include "ffmpeg_decoder.h" @@ -27,12 +28,15 @@ #include "sndfile_decoder.h" #include "sndfile_content.h" #include "subtitle_content.h" +#include "subrip_decoder.h" +#include "subrip_content.h" #include "playlist.h" #include "job.h" #include "image.h" #include "ratio.h" #include "log.h" #include "scaler.h" +#include "render_subtitles.h" using std::list; using std::cout; @@ -107,13 +111,37 @@ Player::pass () for (list >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) { - shared_ptr dec = (*i)->decoder->peek (); + DCPTime const offset = (*i)->content->position() - (*i)->content->trim_start(); + + bool done = false; + shared_ptr dec; + while (!done) { + dec = (*i)->decoder->peek (); + if (!dec) { + /* Decoder has nothing else to give us */ + break; + } - if (dec) { - dec->set_dcp_times ((*i)->frc.speed_up, (*i)->content->position()); + dec->set_dcp_times (_film->video_frame_rate(), _film->audio_frame_rate(), (*i)->frc, offset); + DCPTime const t = dec->dcp_time - offset; + if (t >= ((*i)->content->full_length() - (*i)->content->trim_end ())) { + /* In the end-trimmed part; decoder has nothing else to give us */ + dec.reset (); + done = true; + } else if (t >= (*i)->content->trim_start ()) { + /* Within the un-trimmed part; everything's ok */ + done = true; + } else { + /* Within the start-trimmed part; get something else */ + (*i)->decoder->consume (); + } } - if (dec && dec->dcp_time < earliest_time) { + if (!dec) { + continue; + } + + if (dec->dcp_time < earliest_time) { earliest_piece = *i; earliest_decoded = dec; earliest_time = dec->dcp_time; @@ -130,7 +158,7 @@ Player::pass () } if (earliest_audio != TIME_MAX) { - TimedAudioBuffers tb = _audio_merger.pull (earliest_audio); + TimedAudioBuffers tb = _audio_merger.pull (max (int64_t (0), earliest_audio)); Audio (tb.audio, tb.time); /* This assumes that the audio_frames_to_time conversion is exact so that there are no accumulated errors caused by rounding. @@ -142,16 +170,12 @@ Player::pass () shared_ptr dv = dynamic_pointer_cast (earliest_decoded); shared_ptr da = dynamic_pointer_cast (earliest_decoded); - shared_ptr ds = dynamic_pointer_cast (earliest_decoded); + shared_ptr dis = dynamic_pointer_cast (earliest_decoded); + shared_ptr dts = dynamic_pointer_cast (earliest_decoded); /* Will be set to false if we shouldn't consume the peeked DecodedThing */ bool consume = true; - /* This is the margin either side of _{video,audio}_position that we will accept - as a starting point for a frame consecutive to the previous. - */ - DCPTime const margin = TIME_HZ / (2 * _film->video_frame_rate ()); - if (dv && _video) { if (_just_did_inaccurate_seek) { @@ -160,7 +184,7 @@ Player::pass () emit_video (earliest_piece, dv); step_video_position (dv); - } else if (dv->dcp_time - _video_position > margin) { + } else if (dv->dcp_time > _video_position) { /* Too far ahead */ @@ -172,42 +196,53 @@ Player::pass () if (i == _pieces.end() || !_last_incoming_video.video || !_have_valid_pieces) { /* We're outside all video content */ emit_black (); + _statistics.video.black++; } else { /* We're inside some video; repeat the frame */ _last_incoming_video.video->dcp_time = _video_position; emit_video (_last_incoming_video.weak_piece, _last_incoming_video.video); step_video_position (_last_incoming_video.video); + _statistics.video.repeat++; } consume = false; - } else if (abs (dv->dcp_time - _video_position) < margin) { + } else if (dv->dcp_time == _video_position) { /* We're ok */ emit_video (earliest_piece, dv); step_video_position (dv); + _statistics.video.good++; } else { /* Too far behind: skip */ + _statistics.video.skip++; } _just_did_inaccurate_seek = false; } else if (da && _audio) { - if (da->dcp_time - _audio_position > margin) { + if (da->dcp_time > _audio_position) { /* Too far ahead */ emit_silence (da->dcp_time - _audio_position); consume = false; - } else if (abs (da->dcp_time - _audio_position) < margin) { + _statistics.audio.silence += (da->dcp_time - _audio_position); + } else if (da->dcp_time == _audio_position) { /* We're ok */ emit_audio (earliest_piece, da); + _statistics.audio.good += da->data->frames(); } else { /* Too far behind: skip */ + _statistics.audio.skip += da->data->frames(); } - } else if (ds && _video) { - _in_subtitle.piece = earliest_piece; - _in_subtitle.subtitle = ds; - update_subtitle (); + } else if (dis && _video) { + _image_subtitle.piece = earliest_piece; + _image_subtitle.subtitle = dis; + update_subtitle_from_image (); + } else if (dts && _video) { + _text_subtitle.piece = earliest_piece; + _text_subtitle.subtitle = dts; + update_subtitle_from_text (); } if (consume) { @@ -264,6 +299,7 @@ Player::emit_video (weak_ptr weak_piece, shared_ptr video) pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset); } + #ifdef DCPOMATIC_DEBUG _last_video = piece->content; @@ -304,17 +340,20 @@ Player::emit_audio (weak_ptr weak_piece, shared_ptr audio) audio->data = gain; } - if (content->trimmed (audio->dcp_time - content->position ())) { - return; - } - /* Remap channels */ shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->data->frames())); dcp_mapped->make_silent (); - list > map = content->audio_mapping().content_to_dcp (); - for (list >::iterator i = map.begin(); i != map.end(); ++i) { - if (i->first < audio->data->channels() && i->second < dcp_mapped->channels()) { - dcp_mapped->accumulate_channel (audio->data.get(), i->first, i->second); + AudioMapping map = content->audio_mapping (); + for (int i = 0; i < map.content_channels(); ++i) { + for (int j = 0; j < _film->audio_channels(); ++j) { + if (map.get (i, static_cast (j)) > 0) { + dcp_mapped->accumulate_channel ( + audio->data.get(), + i, + static_cast (j), + map.get (i, static_cast (j)) + ); + } } } @@ -342,16 +381,16 @@ void Player::flush () { TimedAudioBuffers tb = _audio_merger.flush (); - if (tb.audio) { + if (_audio && tb.audio) { Audio (tb.audio, tb.time); _audio_position += _film->audio_frames_to_time (tb.audio->frames ()); } - while (_video_position < _audio_position) { + while (_video && _video_position < _audio_position) { emit_black (); } - while (_audio_position < _video_position) { + while (_audio && _audio_position < _video_position) { emit_silence (_video_position - _audio_position); } @@ -379,7 +418,7 @@ Player::seek (DCPTime t, bool accurate) s = min ((*i)->content->length_after_trim(), s); /* Convert this to the content time */ - ContentTime ct = (s * (*i)->frc.speed_up) + (*i)->content->trim_start (); + ContentTime ct = (s + (*i)->content->trim_start()) * (*i)->frc.speed_up; /* And seek the decoder */ (*i)->decoder->seek (ct, accurate); @@ -411,15 +450,45 @@ Player::setup_pieces () for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { + if (!(*i)->paths_valid ()) { + continue; + } + shared_ptr decoder; optional frc; + /* Work out a FrameRateChange for the best overlap video for this content, in case we need it below */ + DCPTime best_overlap_t = 0; + shared_ptr best_overlap; + for (ContentList::iterator j = content.begin(); j != content.end(); ++j) { + shared_ptr vc = dynamic_pointer_cast (*j); + if (!vc) { + continue; + } + + DCPTime const overlap = max (vc->position(), (*i)->position()) - min (vc->end(), (*i)->end()); + if (overlap > best_overlap_t) { + best_overlap = vc; + best_overlap_t = overlap; + } + } + + optional best_overlap_frc; + if (best_overlap) { + best_overlap_frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ()); + } else { + /* No video overlap; e.g. if the DCP is just audio */ + best_overlap_frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ()); + } + + /* FFmpeg */ shared_ptr fc = dynamic_pointer_cast (*i); if (fc) { decoder.reset (new FFmpegDecoder (_film, fc, _video, _audio)); frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate()); } - + + /* ImageContent */ shared_ptr ic = dynamic_pointer_cast (*i); if (ic) { /* See if we can re-use an old ImageDecoder */ @@ -437,39 +506,22 @@ Player::setup_pieces () frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate()); } + /* SndfileContent */ shared_ptr sc = dynamic_pointer_cast (*i); if (sc) { decoder.reset (new SndfileDecoder (_film, sc)); + frc = best_overlap_frc; + } - /* Working out the frc for this content is a bit tricky: what if it overlaps - two pieces of video content with different frame rates? For now, use - the one with the best overlap. - */ - - DCPTime best_overlap_t = 0; - shared_ptr best_overlap; - for (ContentList::iterator j = content.begin(); j != content.end(); ++j) { - shared_ptr vc = dynamic_pointer_cast (*j); - if (!vc) { - continue; - } - - DCPTime const overlap = max (vc->position(), sc->position()) - min (vc->end(), sc->end()); - if (overlap > best_overlap_t) { - best_overlap = vc; - best_overlap_t = overlap; - } - } - - if (best_overlap) { - frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ()); - } else { - /* No video overlap; e.g. if the DCP is just audio */ - frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ()); - } + /* SubRipContent */ + shared_ptr rc = dynamic_pointer_cast (*i); + if (rc) { + decoder.reset (new SubRipDecoder (_film, rc)); + frc = best_overlap_frc; } - decoder->seek ((*i)->trim_start (), true); + ContentTime st = (*i)->trim_start() * frc->speed_up; + decoder->seek (st, true); _pieces.push_back (shared_ptr (new Piece (*i, decoder, frc.get ()))); } @@ -499,17 +551,26 @@ Player::content_changed (weak_ptr w, int property, bool frequent) _have_valid_pieces = false; Changed (frequent); - } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) { + } else if ( + property == SubtitleContentProperty::SUBTITLE_X_OFFSET || + property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || + property == SubtitleContentProperty::SUBTITLE_SCALE + ) { - update_subtitle (); + update_subtitle_from_image (); + update_subtitle_from_text (); Changed (frequent); - } else if (property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO) { + } else if ( + property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_RATIO || + property == VideoContentProperty::VIDEO_FRAME_RATE + ) { Changed (frequent); } else if (property == ContentProperty::PATH) { + _have_valid_pieces = false; Changed (frequent); } } @@ -575,20 +636,20 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER) { + if (p == Film::SCALER || p == Film::WITH_SUBTITLES || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { Changed (false); } } void -Player::update_subtitle () +Player::update_subtitle_from_image () { - shared_ptr piece = _in_subtitle.piece.lock (); + shared_ptr piece = _image_subtitle.piece.lock (); if (!piece) { return; } - if (!_in_subtitle.subtitle->image) { + if (!_image_subtitle.subtitle->image) { _out_subtitle.image.reset (); return; } @@ -596,10 +657,11 @@ Player::update_subtitle () shared_ptr sc = dynamic_pointer_cast (piece->content); assert (sc); - dcpomatic::Rect in_rect = _in_subtitle.subtitle->rect; + dcpomatic::Rect in_rect = _image_subtitle.subtitle->rect; libdcp::Size scaled_size; - in_rect.y += sc->subtitle_offset (); + in_rect.x += sc->subtitle_x_offset (); + in_rect.y += sc->subtitle_y_offset (); /* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */ scaled_size.width = in_rect.width * _video_container_size.width * sc->subtitle_scale (); @@ -619,16 +681,16 @@ Player::update_subtitle () _out_subtitle.position.x = rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_scale ()) / 2))); _out_subtitle.position.y = rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_scale ()) / 2))); - - _out_subtitle.image = _in_subtitle.subtitle->image->scale ( + + _out_subtitle.image = _image_subtitle.subtitle->image->scale ( scaled_size, Scaler::from_id ("bicubic"), - PIX_FMT_RGBA, + _image_subtitle.subtitle->image->pixel_format (), true ); - - _out_subtitle.from = _in_subtitle.subtitle->dcp_time; - _out_subtitle.to = _in_subtitle.subtitle->dcp_time_to; + + _out_subtitle.from = _image_subtitle.subtitle->dcp_time + piece->content->position (); + _out_subtitle.to = _image_subtitle.subtitle->dcp_time_to + piece->content->position (); } /** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles. @@ -649,13 +711,23 @@ Player::repeat_last_video () return true; } +void +Player::update_subtitle_from_text () +{ + if (_text_subtitle.subtitle->subs.empty ()) { + _out_subtitle.image.reset (); + return; + } + + render_subtitles (_text_subtitle.subtitle->subs, _video_container_size, _out_subtitle.image, _out_subtitle.position); +} + void Player::set_approximate_size () { _approximate_size = true; } - PlayerImage::PlayerImage ( shared_ptr in, Crop crop, @@ -693,3 +765,15 @@ PlayerImage::image (AVPixelFormat format, bool aligned) return out; } +void +PlayerStatistics::dump (shared_ptr log) const +{ + log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat)); + log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence)); +} + +PlayerStatistics const & +Player::statistics () const +{ + return _statistics; +}