X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=215b48ee444f83c9025d29e08c05890958425996;hb=5e8f1fb8d6dac786983a8e96cc6ee119506c200a;hp=bda791dd56cdc34154629a63c97a4c071c8e7278;hpb=4964bbe4efaaf8f8d7076cfcfed841300fd7a66d;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index bda791dd5..215b48ee4 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -36,7 +36,6 @@ #include "raw_image_proxy.h" #include "ratio.h" #include "log.h" -#include "scaler.h" #include "render_subtitles.h" #include "config.h" #include "content_video.h" @@ -46,6 +45,7 @@ #include "dcp_decoder.h" #include "dcp_subtitle_content.h" #include "dcp_subtitle_decoder.h" +#include "audio_processor.h" #include #include #include @@ -63,6 +63,7 @@ using std::vector; using std::pair; using std::map; using std::make_pair; +using std::copy; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; @@ -72,13 +73,15 @@ Player::Player (shared_ptr f, shared_ptr p) : _film (f) , _playlist (p) , _have_valid_pieces (false) - , _approximate_size (false) , _ignore_video (false) + , _burn_subtitles (f->burn_subtitles ()) { _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3)); _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); set_video_container_size (_film->frame_size ()); + + film_changed (Film::AUDIO_PROCESSOR); } void @@ -223,7 +226,6 @@ Player::content_changed (weak_ptr w, int property, bool frequent) } } -/** @param already_resampled true if this data has already been through the chain up to the resampler */ void Player::playlist_changed () { @@ -248,8 +250,12 @@ Player::film_changed (Film::Property p) last time we were run. */ - if (p == Film::SCALER || p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { + if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) { Changed (false); + } else if (p == Film::AUDIO_PROCESSOR) { + if (_film->audio_processor ()) { + _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ()); + } } } @@ -282,7 +288,7 @@ Player::transform_image_subtitles (list subs) const PositionImage ( i->image->scale ( scaled_size, - Scaler::from_id ("bicubic"), + dcp::YUV_TO_RGB_REC601, i->image->pixel_format (), true ), @@ -297,12 +303,6 @@ Player::transform_image_subtitles (list subs) const return all; } -void -Player::set_approximate_size () -{ - _approximate_size = true; -} - shared_ptr Player::black_player_video_frame (DCPTime time) const { @@ -314,10 +314,9 @@ Player::black_player_video_frame (DCPTime time) const optional (), _video_container_size, _video_container_size, - Scaler::from_id ("bicubic"), EYES_BOTH, PART_WHOLE, - Config::instance()->colour_conversions().front().conversion + PresetColourConversion::all().front().conversion ) ); } @@ -355,7 +354,7 @@ Player::get_video (DCPTime time, bool accurate) return pvf; } - dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1); + dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ()); for (list::const_iterator i = content_video.begin(); i != content_video.end(); ++i) { pvf.push_back ( @@ -367,7 +366,6 @@ Player::get_video (DCPTime time, bool accurate) content->fade (i->frame), image_size, _video_container_size, - _film->scaler(), i->eyes, i->part, content->colour_conversion () @@ -387,9 +385,12 @@ Player::get_video (DCPTime time, bool accurate) list c = transform_image_subtitles (ps.image); copy (c.begin(), c.end(), back_inserter (sub_images)); - /* Text subtitles (rendered to images) */ - sub_images.push_back (render_subtitles (ps.text, _video_container_size)); - + /* Text subtitles (rendered to an image) */ + if (_burn_subtitles && !ps.text.empty ()) { + list s = render_subtitles (ps.text, _video_container_size); + copy (s.begin (), s.end (), back_inserter (sub_images)); + } + if (!sub_images.empty ()) { for (list >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) { (*i)->set_subtitle (merge (sub_images)); @@ -406,7 +407,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) setup_pieces (); } - AudioFrame const length_frames = length.frames (_film->audio_frame_rate ()); + Frame const length_frames = length.frames (_film->audio_frame_rate ()); shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); audio->make_silent (); @@ -423,16 +424,9 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) shared_ptr decoder = dynamic_pointer_cast ((*i)->decoder); DCPOMATIC_ASSERT (decoder); - if (content->audio_frame_rate() == 0) { - /* This AudioContent has no audio (e.g. if it is an FFmpegContent with no - * audio stream). - */ - continue; - } - /* The time that we should request from the content */ DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0); - AudioFrame request_frames = length_frames; + Frame request_frames = length_frames; DCPTime offset; if (request < DCPTime ()) { /* We went off the start of the content, so we will need to offset @@ -446,49 +440,56 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) request = DCPTime (); } - AudioFrame const content_frame = dcp_to_content_audio (*i, request); - - /* Audio from this piece's decoder (which might be more or less than what we asked for) */ - shared_ptr all = decoder->get_audio (content_frame, request_frames, accurate); + Frame const content_frame = dcp_to_content_audio (*i, request); - /* Gain */ - if (content->audio_gain() != 0) { - shared_ptr gain (new AudioBuffers (all->audio)); - gain->apply_gain (content->audio_gain ()); - all->audio = gain; - } + BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) { + + /* 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); + + /* Gain */ + if (content->audio_gain() != 0) { + shared_ptr gain (new AudioBuffers (all.audio)); + gain->apply_gain (content->audio_gain ()); + all.audio = gain; + } - /* Remap channels */ - shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), all->audio->frames())); - dcp_mapped->make_silent (); - 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 ( - all->audio.get(), - i, - j, - map.get (i, static_cast (j)) - ); + /* Remap channels */ + shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames())); + dcp_mapped->make_silent (); + AudioMapping map = j->mapping (); + for (int i = 0; i < map.input_channels(); ++i) { + for (int j = 0; j < _film->audio_channels(); ++j) { + if (map.get (i, j) > 0) { + dcp_mapped->accumulate_channel ( + all.audio.get(), + i, + j, + map.get (i, j) + ); + } } } - } + + if (_audio_processor) { + dcp_mapped = _audio_processor->run (dcp_mapped); + } - all->audio = dcp_mapped; + all.audio = dcp_mapped; - audio->accumulate_frames ( - all->audio.get(), - content_frame - all->frame, - offset.frames (_film->audio_frame_rate()), - min (AudioFrame (all->audio->frames()), request_frames) - ); + audio->accumulate_frames ( + all.audio.get(), + content_frame - all.frame, + offset.frames (_film->audio_frame_rate()), + min (Frame (all.audio->frames()), request_frames) + ); + } } return audio; } -VideoFrame +Frame Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ @@ -501,7 +502,7 @@ Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const } DCPTime -Player::content_video_to_dcp (shared_ptr piece, VideoFrame f) const +Player::content_video_to_dcp (shared_ptr piece, Frame f) const { DCPTime t = DCPTime::from_frames (f * piece->frc.factor (), _film->video_frame_rate()) - piece->content->trim_start () + piece->content->position (); if (t < DCPTime ()) { @@ -511,7 +512,7 @@ Player::content_video_to_dcp (shared_ptr piece, VideoFrame f) const return t; } -AudioFrame +Frame Player::dcp_to_content_audio (shared_ptr piece, DCPTime t) const { /* s is the offset of t from the start position of this content */ @@ -586,8 +587,15 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting) list text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting); 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 ()); - s.set_size (s.size() * max (subtitle_content->subtitle_x_scale(), subtitle_content->subtitle_y_scale())); + float const xs = subtitle_content->subtitle_x_scale(); + float const ys = subtitle_content->subtitle_y_scale(); + float const average = s.size() * (xs + ys) / 2; + s.set_size (average); + if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) { + s.set_aspect_adjust (xs / ys); + } ps.text.push_back (s); } } @@ -624,3 +632,12 @@ Player::set_ignore_video () { _ignore_video = true; } + +/** Set whether or not this player should burn text subtitles into the image. + * @param burn true to burn subtitles, false to not. + */ +void +Player::set_burn_subtitles (bool burn) +{ + _burn_subtitles = burn; +}