X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=a8ba7cc536b5012cedab2d6f065f972578894a4c;hb=c28b3d6f168607aca9995282b96647eb64a26dc9;hp=4fe81d4b2a9e86053fb1e5c8965cd0e4bec1a90b;hpb=30e45dd697afc053f2d7be4ee2bc154e5061ad80;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 4fe81d4b2..a8ba7cc53 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -28,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; @@ -119,10 +122,10 @@ Player::pass () break; } - dec->set_dcp_times ((*i)->frc.speed_up, offset); + 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 eles to give us */ + 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 ()) { @@ -167,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) { @@ -185,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 */ @@ -208,7 +207,7 @@ Player::pass () 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); @@ -222,12 +221,12 @@ Player::pass () } 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; _statistics.audio.silence += (da->dcp_time - _audio_position); - } else if (abs (da->dcp_time - _audio_position) < margin) { + } else if (da->dcp_time == _audio_position) { /* We're ok */ emit_audio (earliest_piece, da); _statistics.audio.good += da->data->frames(); @@ -236,10 +235,14 @@ Player::pass () _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) { @@ -267,7 +270,7 @@ Player::emit_video (weak_ptr weak_piece, shared_ptr video) FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate()); float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio(); - libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size); + dcp::Size image_size = fit_ratio_within (ratio, _video_container_size); if (_approximate_size) { image_size.width &= ~3; image_size.height &= ~3; @@ -296,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; @@ -339,10 +343,17 @@ Player::emit_audio (weak_ptr weak_piece, shared_ptr audio) /* 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)) + ); + } } } @@ -439,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 */ @@ -465,36 +506,18 @@ 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; } ContentTime st = (*i)->trim_start() * frc->speed_up; @@ -528,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); } } @@ -551,7 +583,7 @@ Player::playlist_changed () } void -Player::set_video_container_size (libdcp::Size s) +Player::set_video_container_size (dcp::Size s) { _video_container_size = s; @@ -604,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; } @@ -625,10 +657,11 @@ Player::update_subtitle () shared_ptr sc = dynamic_pointer_cast (piece->content); assert (sc); - dcpomatic::Rect in_rect = _in_subtitle.subtitle->rect; - libdcp::Size scaled_size; + dcpomatic::Rect in_rect = _image_subtitle.subtitle->rect; + dcp::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 (); @@ -648,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. @@ -678,18 +711,28 @@ 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, - libdcp::Size inter_size, - libdcp::Size out_size, + dcp::Size inter_size, + dcp::Size out_size, Scaler const * scaler ) : _in (in)