X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=53df8a3721cec68cc610c6fd679e4dd979b515a8;hb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;hp=3e92eb3d9090040f94868e6dbc8a9203cb326d3f;hpb=9e8d6f0a2a63ce2ce11cbda8b6dde06664871000;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 3e92eb3d9..53df8a372 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,9 @@ #include "player.h" #include "film.h" #include "ffmpeg_decoder.h" +#include "video_decoder.h" #include "audio_buffers.h" +#include "audio_content.h" #include "ffmpeg_content.h" #include "image_decoder.h" #include "image_content.h" @@ -76,6 +78,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) @@ -113,13 +133,13 @@ Player::setup_pieces () shared_ptr fc = dynamic_pointer_cast (i); if (fc) { decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast)); - frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate()); + frc = FrameRateChange (fc->active_video_frame_rate(), _film->video_frame_rate()); } shared_ptr dc = dynamic_pointer_cast (i); if (dc) { - decoder.reset (new DCPDecoder (dc, _fast)); - frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate()); + decoder.reset (new DCPDecoder (dc, _film->log(), _fast)); + frc = FrameRateChange (dc->active_video_frame_rate(), _film->video_frame_rate()); } /* ImageContent */ @@ -134,35 +154,34 @@ Player::setup_pieces () } if (!decoder) { - decoder.reset (new ImageDecoder (ic)); + decoder.reset (new ImageDecoder (ic, _film->log())); } - frc = FrameRateChange (ic->video_frame_rate(), _film->video_frame_rate()); + frc = FrameRateChange (ic->active_video_frame_rate(), _film->video_frame_rate()); } /* SndfileContent */ shared_ptr sc = dynamic_pointer_cast (i); if (sc) { - decoder.reset (new SndfileDecoder (sc, _fast)); + decoder.reset (new SndfileDecoder (sc, _fast, _film->log())); /* Work out a FrameRateChange for the best overlap video for this content */ DCPTime best_overlap_t; - shared_ptr best_overlap; + shared_ptr best_overlap; BOOST_FOREACH (shared_ptr j, _playlist->content ()) { - shared_ptr vc = dynamic_pointer_cast (j); - if (!vc) { + if (!j->video) { continue; } - DCPTime const overlap = min (vc->end(), i->end()) - max (vc->position(), i->position()); + DCPTime const overlap = min (j->end(), i->end()) - max (j->position(), i->position()); if (overlap > best_overlap_t) { - best_overlap = vc; + best_overlap = j; best_overlap_t = overlap; } } if (best_overlap) { - frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ()); + frc = FrameRateChange (best_overlap->active_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 ()); @@ -178,24 +197,22 @@ Player::setup_pieces () 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()); + frc = FrameRateChange (rc->active_video_frame_rate(), _film->video_frame_rate()); } /* 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()); + frc = FrameRateChange (dsc->active_video_frame_rate(), _film->video_frame_rate()); } - shared_ptr vd = dynamic_pointer_cast (decoder); - if (vd && _ignore_video) { - vd->set_ignore_video (); + if (decoder->video && _ignore_video) { + decoder->video->set_ignore (); } - shared_ptr ad = dynamic_pointer_cast (decoder); - if (ad && _ignore_audio) { - ad->set_ignore_audio (); + if (decoder->audio && _ignore_audio) { + decoder->audio->set_ignore (); } _pieces.push_back (shared_ptr (new Piece (i, decoder, frc.get ()))); @@ -218,28 +235,29 @@ 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 == VideoContentProperty::FRAME_TYPE || property == DCPContentProperty::CAN_BE_PLAYED || - property == TextSubtitleContentProperty::TEXT_SUBTITLE_COLOUR || - property == TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE || - property == TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE_COLOUR + property == SubtitleContentProperty::COLOUR || + property == SubtitleContentProperty::OUTLINE || + property == SubtitleContentProperty::OUTLINE_COLOUR || + property == FFmpegContentProperty::SUBTITLE_STREAM ) { _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 == ContentProperty::VIDEO_FRAME_RATE || + property == SubtitleContentProperty::USE || + property == SubtitleContentProperty::X_OFFSET || + property == SubtitleContentProperty::Y_OFFSET || + property == SubtitleContentProperty::X_SCALE || + property == SubtitleContentProperty::Y_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::CROP || + property == VideoContentProperty::SCALE || + property == VideoContentProperty::FADE_IN || + property == VideoContentProperty::FADE_OUT || property == VideoContentProperty::COLOUR_CONVERSION ) { @@ -317,7 +335,8 @@ Player::transform_image_subtitles (list subs) const scaled_size, dcp::YUV_TO_RGB_REC601, i->image->pixel_format (), - true + true, + _fast ), Position ( lrint (_video_container_size.width * i->rectangle.x), @@ -382,9 +401,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; @@ -395,17 +415,15 @@ Player::get_video (DCPTime time, bool accurate) } else { /* Some video content at this time */ shared_ptr last = *(ov.rbegin ()); - VideoFrameType const last_type = dynamic_pointer_cast (last->content)->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); DCPOMATIC_ASSERT (decoder); - shared_ptr video_content = dynamic_pointer_cast (piece->content); - DCPOMATIC_ASSERT (video_content); - shared_ptr dcp_content = dynamic_pointer_cast (video_content); + shared_ptr dcp_content = dynamic_pointer_cast (piece->content); if (dcp_content && dcp_content->reference_video () && !_play_referenced) { continue; } @@ -414,16 +432,18 @@ 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 && video_content->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) || - (last_type == VIDEO_FRAME_TYPE_3D_RIGHT && video_content->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 { - dcp::Size image_size = video_content->scale().size (video_content, _video_container_size, _film->frame_size ()); + dcp::Size image_size = piece->content->video->scale().size ( + piece->content->video, _video_container_size, _film->frame_size () + ); for (list::const_iterator i = content_video.begin(); i != content_video.end(); ++i) { pvf.push_back ( @@ -431,13 +451,13 @@ Player::get_video (DCPTime time, bool accurate) new PlayerVideo ( i->image, content_video_to_dcp (piece, i->frame), - video_content->crop (), - video_content->fade (i->frame), + piece->content->video->crop (), + piece->content->video->fade (i->frame), image_size, _video_container_size, i->eyes, i->part, - video_content->colour_conversion () + piece->content->video->colour_conversion () ) ) ); @@ -445,7 +465,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); } } } @@ -472,16 +492,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; } @@ -493,13 +512,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); + DCPOMATIC_ASSERT (i->content->audio); shared_ptr decoder = dynamic_pointer_cast (i->decoder); 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 ()) { @@ -516,7 +534,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 */ @@ -524,12 +542,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; } @@ -571,7 +589,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)); @@ -589,7 +606,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 ()); @@ -625,17 +641,16 @@ 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); for (list >::const_iterator j = subs.begin(); j != subs.end(); ++j) { - shared_ptr subtitle_content = dynamic_pointer_cast ((*j)->content); - if (!subtitle_content->use_subtitles () || (!_always_burn_subtitles && (burnt != subtitle_content->burn_subtitles ()))) { + if (!(*j)->content->subtitle->use () || (!_always_burn_subtitles && (burnt != (*j)->content->subtitle->burn ()))) { continue; } - shared_ptr dcp_content = dynamic_pointer_cast (subtitle_content); + shared_ptr dcp_content = dynamic_pointer_cast ((*j)->content); if (dcp_content && dcp_content->reference_subtitle () && !_play_referenced) { continue; } @@ -645,31 +660,31 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt, /* 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 += subtitle_content->subtitle_x_offset (); - i->sub.rectangle.y += subtitle_content->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 *= subtitle_content->subtitle_x_scale (); - i->sub.rectangle.height *= subtitle_content->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 * (subtitle_content->subtitle_x_scale() - 1); - i->sub.rectangle.y -= i->sub.rectangle.height * (subtitle_content->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() + subtitle_content->subtitle_x_offset ()); - s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ()); - float const xs = subtitle_content->subtitle_x_scale(); - float const ys = subtitle_content->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; @@ -687,7 +702,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.add_fonts (subtitle_content->fonts ()); + ps.add_fonts ((*j)->content->subtitle->fonts ()); } } } @@ -704,12 +719,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,7 +782,7 @@ Player::get_reel_assets () scoped_ptr decoder; try { - decoder.reset (new DCPDecoder (j, false)); + decoder.reset (new DCPDecoder (j, _film->log(), false)); } catch (...) { return a; } @@ -811,3 +825,20 @@ 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; +}