X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=69306e3817e94fd378a17ea862e525a19293419f;hb=8457b7c1066da4e14f00a76f3855e60d986b179f;hp=9c216c253eca301cf4066e2b6a73f51431f9ff8e;hpb=775ae0e37bbec115d742feade0adc614a9a2301c;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 9c216c253..69306e381 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,34 +1,27 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "player.h" #include "film.h" -#include "ffmpeg_decoder.h" #include "audio_buffers.h" -#include "ffmpeg_content.h" -#include "image_decoder.h" -#include "image_content.h" -#include "sndfile_decoder.h" -#include "sndfile_content.h" -#include "subtitle_content.h" -#include "text_subtitle_decoder.h" -#include "text_subtitle_content.h" +#include "content_audio.h" #include "dcp_content.h" #include "job.h" #include "image.h" @@ -40,13 +33,20 @@ #include "content_video.h" #include "player_video.h" #include "frame_rate_change.h" -#include "dcp_content.h" -#include "dcp_decoder.h" -#include "dcp_subtitle_content.h" -#include "dcp_subtitle_decoder.h" #include "audio_processor.h" #include "playlist.h" #include "referenced_reel_asset.h" +#include "decoder_factory.h" +#include "decoder.h" +#include "video_decoder.h" +#include "audio_decoder.h" +#include "subtitle_content.h" +#include "subtitle_decoder.h" +#include "ffmpeg_content.h" +#include "audio_content.h" +#include "content_subtitle.h" +#include "dcp_decoder.h" +#include "image_decoder.h" #include #include #include @@ -76,6 +76,24 @@ using boost::dynamic_pointer_cast; using boost::optional; using boost::scoped_ptr; +static bool +has_video (Content* c) +{ + return static_cast(c->video); +} + +static bool +has_audio (Content* c) +{ + return static_cast(c->audio); +} + +static bool +has_subtitle (Content* c) +{ + return static_cast(c->subtitle); +} + Player::Player (shared_ptr film, shared_ptr playlist) : _film (film) , _playlist (playlist) @@ -97,7 +115,6 @@ Player::Player (shared_ptr film, shared_ptr playlist void Player::setup_pieces () { - list > old_pieces = _pieces; _pieces.clear (); BOOST_FOREACH (shared_ptr i, _playlist->content ()) { @@ -106,98 +123,32 @@ Player::setup_pieces () continue; } - shared_ptr decoder; - optional frc; - - /* FFmpeg */ - shared_ptr fc = dynamic_pointer_cast (i); - if (fc) { - decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast)); - frc = FrameRateChange (fc->video->video_frame_rate(), _film->video_frame_rate()); - } - - shared_ptr dc = dynamic_pointer_cast (i); - if (dc) { - decoder.reset (new DCPDecoder (dc, _film->log(), _fast)); - frc = FrameRateChange (dc->video->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 */ - for (list >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) { - shared_ptr imd = dynamic_pointer_cast ((*j)->decoder); - if (imd && imd->content() == ic) { - decoder = imd; - } - } - - if (!decoder) { - decoder.reset (new ImageDecoder (ic, _film->log())); - } - - frc = FrameRateChange (ic->video->video_frame_rate(), _film->video_frame_rate()); - } - - /* SndfileContent */ - shared_ptr sc = dynamic_pointer_cast (i); - if (sc) { - decoder.reset (new SndfileDecoder (sc, _fast)); - - /* Work out a FrameRateChange for the best overlap video for this content */ - DCPTime best_overlap_t; - shared_ptr best_overlap; - BOOST_FOREACH (shared_ptr j, _playlist->content ()) { - if (!j->video) { - continue; - } - - DCPTime const overlap = min (j->end(), i->end()) - max (j->position(), i->position()); - if (overlap > best_overlap_t) { - best_overlap = j; - best_overlap_t = overlap; - } - } + shared_ptr decoder = decoder_factory (i, _film->log()); + FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate()); - if (best_overlap) { - frc = FrameRateChange (best_overlap->video->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 ()); - } + if (!decoder) { + /* Not something that we can decode; e.g. Atmos content */ + continue; } - /* It's questionable whether subtitle content should have a video frame rate; perhaps - it should be assumed that any subtitle content has been prepared at the same rate - as simultaneous video content (like we do with audio). - */ - - /* TextSubtitleContent */ - shared_ptr rc = dynamic_pointer_cast (i); - if (rc) { - decoder.reset (new TextSubtitleDecoder (rc)); - frc = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate()); + if (decoder->video && _ignore_video) { + decoder->video->set_ignore (); } - /* DCPSubtitleContent */ - shared_ptr dsc = dynamic_pointer_cast (i); - if (dsc) { - decoder.reset (new DCPSubtitleDecoder (dsc)); - frc = FrameRateChange (dsc->subtitle_video_frame_rate(), _film->video_frame_rate()); + if (decoder->audio && _ignore_audio) { + decoder->audio->set_ignore (); } - shared_ptr vd = dynamic_pointer_cast (decoder); - if (vd && _ignore_video) { - vd->set_ignore_video (); + if (decoder->audio && _fast) { + decoder->audio->set_fast (); } - shared_ptr ad = dynamic_pointer_cast (decoder); - if (ad && _ignore_audio) { - ad->set_ignore_audio (); + shared_ptr dcp = dynamic_pointer_cast (decoder); + if (dcp && _play_referenced) { + dcp->set_decode_referenced (); } - _pieces.push_back (shared_ptr (new Piece (i, decoder, frc.get ()))); + _pieces.push_back (shared_ptr (new Piece (i, decoder, frc))); } _have_valid_pieces = true; @@ -217,30 +168,48 @@ Player::playlist_content_changed (weak_ptr w, int property, bool freque property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || property == ContentProperty::PATH || - property == VideoContentProperty::VIDEO_FRAME_TYPE || - property == DCPContentProperty::CAN_BE_PLAYED || - property == SubtitleContentProperty::SUBTITLE_COLOUR || - property == SubtitleContentProperty::SUBTITLE_OUTLINE || - property == SubtitleContentProperty::SUBTITLE_OUTLINE_COLOUR || - property == FFmpegContentProperty::SUBTITLE_STREAM + property == VideoContentProperty::FRAME_TYPE || + property == DCPContentProperty::NEEDS_ASSETS || + property == DCPContentProperty::NEEDS_KDM || + property == SubtitleContentProperty::COLOUR || + property == SubtitleContentProperty::OUTLINE || + property == SubtitleContentProperty::SHADOW || + property == SubtitleContentProperty::EFFECT_COLOUR || + property == FFmpegContentProperty::SUBTITLE_STREAM || + property == VideoContentProperty::COLOUR_CONVERSION ) { _have_valid_pieces = false; Changed (frequent); } else if ( - property == SubtitleContentProperty::USE_SUBTITLES || - property == SubtitleContentProperty::SUBTITLE_X_OFFSET || - property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || - property == SubtitleContentProperty::SUBTITLE_X_SCALE || - property == SubtitleContentProperty::SUBTITLE_Y_SCALE || + property == SubtitleContentProperty::LINE_SPACING || + property == SubtitleContentProperty::OUTLINE_WIDTH || + property == SubtitleContentProperty::Y_SCALE || + property == SubtitleContentProperty::FADE_IN || + property == SubtitleContentProperty::FADE_OUT + ) { + + /* These changes just need the pieces' decoders to be reset. + It's quite possible that other changes could be handled by + this branch rather than the _have_valid_pieces = false branch + above. This would make things a lot faster. + */ + + reset_pieces (); + Changed (frequent); + + } else if ( + property == ContentProperty::VIDEO_FRAME_RATE || + property == SubtitleContentProperty::USE || + property == SubtitleContentProperty::X_OFFSET || + property == SubtitleContentProperty::Y_OFFSET || + property == SubtitleContentProperty::X_SCALE || property == SubtitleContentProperty::FONTS || - property == VideoContentProperty::VIDEO_CROP || - property == VideoContentProperty::VIDEO_SCALE || - property == VideoContentProperty::VIDEO_FRAME_RATE || - property == VideoContentProperty::VIDEO_FADE_IN || - property == VideoContentProperty::VIDEO_FADE_OUT || - property == VideoContentProperty::COLOUR_CONVERSION + property == VideoContentProperty::CROP || + property == VideoContentProperty::SCALE || + property == VideoContentProperty::FADE_IN || + property == VideoContentProperty::FADE_OUT ) { Changed (frequent); @@ -372,7 +341,7 @@ Player::get_video (DCPTime time, bool accurate) /* Text subtitles (rendered to an image) */ if (!ps.text.empty ()) { - list s = render_subtitles (ps.text, ps.fonts, _video_container_size); + list s = render_subtitles (ps.text, ps.fonts, _video_container_size, time); copy (s.begin (), s.end (), back_inserter (sub_images)); } @@ -383,9 +352,10 @@ Player::get_video (DCPTime time, bool accurate) /* Find pieces containing video which is happening now */ - list > ov = overlaps ( + list > ov = overlaps ( time, - time + DCPTime::from_frames (1, _film->video_frame_rate ()) + time + DCPTime::from_frames (1, _film->video_frame_rate ()), + &has_video ); list > pvf; @@ -396,12 +366,12 @@ Player::get_video (DCPTime time, bool accurate) } else { /* Some video content at this time */ shared_ptr last = *(ov.rbegin ()); - VideoFrameType const last_type = last->content->video->video_frame_type (); + VideoFrameType const last_type = last->content->video->frame_type (); /* Get video from appropriate piece(s) */ BOOST_FOREACH (shared_ptr piece, ov) { - shared_ptr decoder = dynamic_pointer_cast (piece->decoder); + shared_ptr decoder = piece->decoder->video; DCPOMATIC_ASSERT (decoder); shared_ptr dcp_content = dynamic_pointer_cast (piece->content); @@ -413,12 +383,12 @@ Player::get_video (DCPTime time, bool accurate) /* always use the last video */ piece == last || /* with a corresponding L/R eye if appropriate */ - (last_type == VIDEO_FRAME_TYPE_3D_LEFT && piece->content->video->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) || - (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && piece->content->video->video_frame_type() == VIDEO_FRAME_TYPE_3D_LEFT); + (last_type == VIDEO_FRAME_TYPE_3D_LEFT && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) || + (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && piece->content->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT); if (use) { /* We want to use this piece */ - list content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate); + list content_video = decoder->get (dcp_to_content_video (piece, time), accurate); if (content_video.empty ()) { pvf.push_back (black_player_video_frame (time)); } else { @@ -431,12 +401,12 @@ Player::get_video (DCPTime time, bool accurate) shared_ptr ( new PlayerVideo ( i->image, - content_video_to_dcp (piece, i->frame), + time, piece->content->video->crop (), - piece->content->video->fade (i->frame), + piece->content->video->fade (i->frame.index()), image_size, _video_container_size, - i->eyes, + i->frame.eyes(), i->part, piece->content->video->colour_conversion () ) @@ -446,7 +416,7 @@ Player::get_video (DCPTime time, bool accurate) } } else { /* Discard unused video */ - decoder->get_video (dcp_to_content_video (piece, time), accurate); + decoder->get (dcp_to_content_video (piece, time), accurate); } } } @@ -473,16 +443,15 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); audio->make_silent (); - list > ov = overlaps (time, time + length); + list > ov = overlaps (time, time + length, has_audio); if (ov.empty ()) { return audio; } bool all_referenced = true; BOOST_FOREACH (shared_ptr i, ov) { - shared_ptr audio_content = dynamic_pointer_cast (i->content); shared_ptr dcp_content = dynamic_pointer_cast (i->content); - if (audio_content && (!dcp_content || !dcp_content->reference_audio ())) { + if (i->content->audio && (!dcp_content || !dcp_content->reference_audio ())) { /* There is audio content which is not from a DCP or not set to be referenced */ all_referenced = false; } @@ -494,13 +463,12 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) BOOST_FOREACH (shared_ptr i, ov) { - shared_ptr content = dynamic_pointer_cast (i->content); - DCPOMATIC_ASSERT (content); - shared_ptr decoder = dynamic_pointer_cast (i->decoder); + DCPOMATIC_ASSERT (i->content->audio); + shared_ptr decoder = i->decoder->audio; DCPOMATIC_ASSERT (decoder); /* The time that we should request from the content */ - DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0); + DCPTime request = time - DCPTime::from_seconds (i->content->audio->delay() / 1000.0); Frame request_frames = length_frames; DCPTime offset; if (request < DCPTime ()) { @@ -517,7 +485,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) Frame const content_frame = dcp_to_resampled_audio (i, request); - BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { + BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams ()) { if (j->channels() == 0) { /* Some content (e.g. DCPs) can have streams with no channels */ @@ -525,12 +493,12 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) } /* Audio from this piece's decoder stream (which might be more or less than what we asked for) */ - ContentAudio all = decoder->get_audio (j, content_frame, request_frames, accurate); + ContentAudio all = decoder->get (j, content_frame, request_frames, accurate); /* Gain */ - if (content->audio_gain() != 0) { + if (i->content->audio->gain() != 0) { shared_ptr gain (new AudioBuffers (all.audio)); - gain->apply_gain (content->audio_gain ()); + gain->apply_gain (i->content->audio->gain ()); all.audio = gain; } @@ -572,7 +540,6 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) Frame Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const { - shared_ptr vc = dynamic_pointer_cast (piece->content); DCPTime s = t - piece->content->position (); s = min (piece->content->length_after_trim(), s); s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc)); @@ -590,7 +557,6 @@ Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const DCPTime Player::content_video_to_dcp (shared_ptr piece, Frame f) const { - shared_ptr vc = dynamic_pointer_cast (piece->content); /* 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 ()); @@ -626,12 +592,12 @@ Player::content_subtitle_to_dcp (shared_ptr piece, ContentTime t) c PlayerSubtitles Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, bool accurate) { - list > subs = overlaps (time, time + length); + list > subs = overlaps (time, time + length, has_subtitle); - PlayerSubtitles ps (time, length); + PlayerSubtitles ps (time); for (list >::const_iterator j = subs.begin(); j != subs.end(); ++j) { - if (!(*j)->content->subtitle->use_subtitles () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn_subtitles ()))) { + if (!(*j)->content->subtitle->use () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn ()))) { continue; } @@ -640,36 +606,36 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, continue; } - shared_ptr subtitle_decoder = dynamic_pointer_cast ((*j)->decoder); + shared_ptr subtitle_decoder = (*j)->decoder->subtitle; ContentTime const from = dcp_to_content_subtitle (*j, time); /* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */ ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ()); - list image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting, accurate); + list image = subtitle_decoder->get_image (ContentTimePeriod (from, to), starting, accurate); for (list::iterator i = image.begin(); i != image.end(); ++i) { /* Apply content's subtitle offsets */ - i->sub.rectangle.x += (*j)->content->subtitle->subtitle_x_offset (); - i->sub.rectangle.y += (*j)->content->subtitle->subtitle_y_offset (); + i->sub.rectangle.x += (*j)->content->subtitle->x_offset (); + i->sub.rectangle.y += (*j)->content->subtitle->y_offset (); /* Apply content's subtitle scale */ - i->sub.rectangle.width *= (*j)->content->subtitle->subtitle_x_scale (); - i->sub.rectangle.height *= (*j)->content->subtitle->subtitle_y_scale (); + i->sub.rectangle.width *= (*j)->content->subtitle->x_scale (); + i->sub.rectangle.height *= (*j)->content->subtitle->y_scale (); /* Apply a corrective translation to keep the subtitle centred after that scale */ - i->sub.rectangle.x -= i->sub.rectangle.width * ((*j)->content->subtitle->subtitle_x_scale() - 1); - i->sub.rectangle.y -= i->sub.rectangle.height * ((*j)->content->subtitle->subtitle_y_scale() - 1); + i->sub.rectangle.x -= i->sub.rectangle.width * ((*j)->content->subtitle->x_scale() - 1); + i->sub.rectangle.y -= i->sub.rectangle.height * ((*j)->content->subtitle->y_scale() - 1); ps.image.push_back (i->sub); } - list text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting, accurate); + list text = subtitle_decoder->get_text (ContentTimePeriod (from, to), starting, accurate); BOOST_FOREACH (ContentTextSubtitle& ts, text) { BOOST_FOREACH (dcp::SubtitleString s, ts.subs) { - s.set_h_position (s.h_position() + (*j)->content->subtitle->subtitle_x_offset ()); - s.set_v_position (s.v_position() + (*j)->content->subtitle->subtitle_y_offset ()); - float const xs = (*j)->content->subtitle->subtitle_x_scale(); - float const ys = (*j)->content->subtitle->subtitle_y_scale(); + s.set_h_position (s.h_position() + (*j)->content->subtitle->x_offset ()); + s.set_v_position (s.v_position() + (*j)->content->subtitle->y_offset ()); + float const xs = (*j)->content->subtitle->x_scale(); + float const ys = (*j)->content->subtitle->y_scale(); float size = s.size(); /* Adjust size to express the common part of the scaling; @@ -686,7 +652,7 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, } s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds(), 1000)); s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds(), 1000)); - ps.text.push_back (s); + ps.text.push_back (SubtitleString (s, (*j)->content->subtitle->outline_width())); ps.add_fonts ((*j)->content->subtitle->fonts ()); } } @@ -704,12 +670,11 @@ Player::get_subtitle_fonts () list > fonts; BOOST_FOREACH (shared_ptr& p, _pieces) { - shared_ptr sc = dynamic_pointer_cast (p->content); - if (sc) { + if (p->content->subtitle) { /* XXX: things may go wrong if there are duplicate font IDs with different font files. */ - list > f = sc->fonts (); + list > f = p->content->subtitle->fonts (); copy (f.begin(), f.end(), back_inserter (fonts)); } } @@ -768,15 +733,24 @@ Player::get_reel_assets () scoped_ptr decoder; try { - decoder.reset (new DCPDecoder (j, _film->log(), false)); + decoder.reset (new DCPDecoder (j, _film->log())); } catch (...) { return a; } int64_t offset = 0; BOOST_FOREACH (shared_ptr k, decoder->reels()) { + + DCPOMATIC_ASSERT (j->video_frame_rate ()); + double const cfr = j->video_frame_rate().get(); + Frame const trim_start = j->trim_start().frames_round (cfr); + Frame const trim_end = j->trim_end().frames_round (cfr); + DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate()); if (j->reference_video ()) { + DCPOMATIC_ASSERT (k->main_picture ()); + k->main_picture()->set_entry_point (trim_start); + k->main_picture()->set_duration (k->main_picture()->intrinsic_duration() - trim_start - trim_end); a.push_back ( ReferencedReelAsset ( k->main_picture (), @@ -786,6 +760,9 @@ Player::get_reel_assets () } if (j->reference_audio ()) { + DCPOMATIC_ASSERT (k->main_sound ()); + k->main_sound()->set_entry_point (trim_start); + k->main_sound()->set_duration (k->main_sound()->intrinsic_duration() - trim_start - trim_end); a.push_back ( ReferencedReelAsset ( k->main_sound (), @@ -796,6 +773,8 @@ Player::get_reel_assets () if (j->reference_subtitle ()) { DCPOMATIC_ASSERT (k->main_subtitle ()); + k->main_subtitle()->set_entry_point (trim_start); + k->main_subtitle()->set_duration (k->main_subtitle()->intrinsic_duration() - trim_start - trim_end); a.push_back ( ReferencedReelAsset ( k->main_subtitle (), @@ -811,3 +790,28 @@ Player::get_reel_assets () return a; } + +list > +Player::overlaps (DCPTime from, DCPTime to, boost::function valid) +{ + if (!_have_valid_pieces) { + setup_pieces (); + } + + list > overlaps; + BOOST_FOREACH (shared_ptr i, _pieces) { + if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) { + overlaps.push_back (i); + } + } + + return overlaps; +} + +void +Player::reset_pieces () +{ + BOOST_FOREACH (shared_ptr i, _pieces) { + i->decoder->reset (); + } +}