/*
- Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "atmos_decoder.h"
#include "player.h"
#include "film.h"
#include "i18n.h"
+
using std::copy;
using std::cout;
using std::dynamic_pointer_cast;
using std::shared_ptr;
using std::vector;
using std::weak_ptr;
+using std::make_shared;
using boost::optional;
using boost::scoped_ptr;
#if BOOST_VERSION >= 106100
#endif
using namespace dcpomatic;
+
int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700;
int const PlayerProperty::PLAYLIST = 701;
int const PlayerProperty::FILM_CONTAINER = 702;
int const PlayerProperty::DCP_DECODE_REDUCTION = 704;
int const PlayerProperty::PLAYBACK_LENGTH = 705;
+
Player::Player (shared_ptr<const Film> film)
: _film (film)
, _suspended (0)
construct ();
}
+
Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist_)
: _film (film)
, _playlist (playlist_)
construct ();
}
+
void
Player::construct ()
{
seek (DCPTime (), true);
}
+
Player::~Player ()
{
delete _shuffler;
}
+
void
Player::setup_pieces ()
{
return static_cast<bool>(content->video) && content->video->use();
}
+
bool
have_audio (shared_ptr<const Content> content)
{
return static_cast<bool>(content->audio);
}
+
void
Player::setup_pieces_unlocked ()
{
}
}
- _stream_states.clear ();
- for (auto i: _pieces) {
- if (i->content->audio) {
- for (auto j: i->content->audio->streams()) {
- _stream_states[j] = StreamState (i, i->content->position ());
+ for (auto i = _pieces.begin(); i != _pieces.end(); ++i) {
+ if ((*i)->use_video() && (*i)->content->video->frame_type() != VideoFrameType::THREE_D_LEFT && (*i)->content->video->frame_type() != VideoFrameType::THREE_D_RIGHT) {
+ /* Look for content later in the content list with in-use video that overlaps this */
+ auto period = DCPTimePeriod((*i)->position(), (*i)->end(_film));
+ auto j = i;
+ ++j;
+ for (; j != _pieces.end(); ++j) {
+ if ((*j)->use_video()) {
+ (*i)->ignore_video = DCPTimePeriod((*j)->position(), (*j)->end(_film)).overlap(period);
+ }
}
}
}
_black = Empty (_film, playlist(), bind(&have_video, _1), _playback_length);
_silent = Empty (_film, playlist(), bind(&have_audio, _1), _playback_length);
- _last_video_time = DCPTime ();
+ _last_video_time = boost::optional<dcpomatic::DCPTime>();
_last_video_eyes = Eyes::BOTH;
- _last_audio_time = DCPTime ();
+ _last_audio_time = boost::optional<dcpomatic::DCPTime>();
}
+
void
Player::playlist_content_change (ChangeType type, int property, bool frequent)
{
if (property == VideoContentProperty::CROP) {
if (type == ChangeType::DONE) {
- dcp::Size const vcs = video_container_size();
+ auto const vcs = video_container_size();
boost::mutex::scoped_lock lm (_mutex);
- for (list<pair<shared_ptr<PlayerVideo>, DCPTime> >::const_iterator i = _delay.begin(); i != _delay.end(); ++i) {
- i->first->reset_metadata (_film, vcs);
+ for (auto const& i: _delay) {
+ i.first->reset_metadata (_film, vcs);
}
}
} else {
Change (type, property, frequent);
}
+
void
Player::set_video_container_size (dcp::Size s)
{
Change (ChangeType::DONE, PlayerProperty::VIDEO_CONTAINER_SIZE, false);
}
+
void
Player::playlist_change (ChangeType type)
{
Change (type, PlayerProperty::PLAYLIST, false);
}
+
void
Player::film_change (ChangeType type, Film::Property p)
{
}
}
+
shared_ptr<PlayerVideo>
Player::black_player_video_frame (Eyes eyes) const
{
);
}
-Frame
-Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
-{
- DCPTime s = t - piece->content->position ();
- s = min (piece->content->length_after_trim(_film), s);
- s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc));
-
- /* It might seem more logical here to convert s to a ContentTime (using the FrameRateChange)
- then convert that ContentTime to frames at the content's rate. However this fails for
- situations like content at 29.9978733fps, DCP at 30fps. The accuracy of the Time type is not
- enough to distinguish between the two with low values of time (e.g. 3200 in Time units).
-
- Instead we convert the DCPTime using the DCP video rate then account for any skip/repeat.
- */
- return s.frames_floor (piece->frc.dcp) / piece->frc.factor ();
-}
-
-DCPTime
-Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
-{
- /* See comment in dcp_to_content_video */
- auto const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc);
- return d + piece->content->position();
-}
-
-Frame
-Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
-{
- auto s = t - piece->content->position ();
- s = min (piece->content->length_after_trim(_film), s);
- /* See notes in dcp_to_content_video */
- return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ());
-}
-
-DCPTime
-Player::resampled_audio_to_dcp (shared_ptr<const Piece> piece, Frame f) const
-{
- /* See comment in dcp_to_content_video */
- return DCPTime::from_frames (f, _film->audio_frame_rate())
- - DCPTime (piece->content->trim_start(), piece->frc)
- + piece->content->position();
-}
-
-ContentTime
-Player::dcp_to_content_time (shared_ptr<const Piece> piece, DCPTime t) const
-{
- auto s = t - piece->content->position ();
- s = min (piece->content->length_after_trim(_film), s);
- return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
-}
-
-DCPTime
-Player::content_time_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
-{
- return max (DCPTime(), DCPTime(t - piece->content->trim_start(), piece->frc) + piece->content->position());
-}
vector<FontData>
Player::get_subtitle_fonts ()
return fonts;
}
+
/** Set this player never to produce any video data */
void
Player::set_ignore_video ()
setup_pieces_unlocked ();
}
+
void
Player::set_ignore_audio ()
{
setup_pieces_unlocked ();
}
+
void
Player::set_ignore_text ()
{
setup_pieces_unlocked ();
}
+
/** Set the player to always burn open texts into the image regardless of the content settings */
void
Player::set_always_burn_open_subtitles ()
_always_burn_open_subtitles = true;
}
+
/** Sets up the player to be faster, possibly at the expense of quality */
void
Player::set_fast ()
setup_pieces_unlocked ();
}
+
void
Player::set_play_referenced ()
{
setup_pieces_unlocked ();
}
+
static void
maybe_add_asset (list<ReferencedReelAsset>& a, shared_ptr<dcp::ReelAsset> r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr)
{
}
}
+
list<ReferencedReelAsset>
Player::get_reel_assets ()
{
list<ReferencedReelAsset> a;
for (auto i: playlist()->content()) {
- shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
+ auto j = dynamic_pointer_cast<DCPContent> (i);
if (!j) {
continue;
}
scoped_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (_film, j, false, false, shared_ptr<DCPDecoder>()));
+ decoder.reset (new DCPDecoder(_film, j, false, false, shared_ptr<DCPDecoder>()));
} catch (...) {
return a;
}
Frame const reel_trim_start = min(reel_duration, max(int64_t(0), trim_start - offset_from_start));
Frame const reel_trim_end = min(reel_duration, max(int64_t(0), reel_duration - (offset_from_end - trim_end)));
- DCPTime const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
+ auto const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
if (j->reference_video ()) {
maybe_add_asset (a, k->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
}
return a;
}
+
bool
Player::pass ()
{
continue;
}
- DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start()));
- if (t > i->content->end(_film)) {
+ auto const t = i->content_time_to_dcp (max(i->decoder->position(), i->content->trim_start()));
+ if (t > i->end(_film)) {
i->done = true;
} else {
{
LOG_DEBUG_PLAYER ("Calling pass() on %1", earliest_content->content->path(0));
earliest_content->done = earliest_content->decoder->pass ();
- shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(earliest_content->content);
+ auto dcp = dynamic_pointer_cast<DCPContent>(earliest_content->content);
if (dcp && !_play_referenced && dcp->reference_audio()) {
/* We are skipping some referenced DCP audio content, so we need to update _last_audio_time
to `hide' the fact that no audio was emitted during the referenced DCP (though
/* Work out the time before which the audio is definitely all here. This is the earliest last_push_end of one
of our streams, or the position of the _silent.
*/
- DCPTime pull_to = _playback_length;
- for (map<AudioStreamPtr, StreamState>::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) {
- if (!i->second.piece->done && i->second.last_push_end < pull_to) {
- pull_to = i->second.last_push_end;
- }
+ auto pull_to = _playback_length;
+ for (auto i: _pieces) {
+ i->update_pull_to (pull_to);
}
if (!_silent.done() && _silent.position() < pull_to) {
pull_to = _silent.position();
}
LOG_DEBUG_PLAYER("Emitting audio up to %1", to_string(pull_to));
- list<pair<shared_ptr<AudioBuffers>, DCPTime> > audio = _audio_merger.pull (pull_to);
- for (list<pair<shared_ptr<AudioBuffers>, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) {
+ auto audio = _audio_merger.pull (pull_to);
+ for (auto i = audio.begin(); i != audio.end(); ++i) {
if (_last_audio_time && i->second < *_last_audio_time) {
/* This new data comes before the last we emitted (or the last seek); discard it */
- pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time);
+ auto cut = discard_audio (i->first, i->second, *_last_audio_time);
if (!cut.first) {
continue;
}
if (done) {
_shuffler->flush ();
- for (list<pair<shared_ptr<PlayerVideo>, DCPTime> >::const_iterator i = _delay.begin(); i != _delay.end(); ++i) {
- do_emit_video(i->first, i->second);
+ for (auto const& i: _delay) {
+ do_emit_video(i.first, i.second);
}
}
return done;
}
+
/** @return Open subtitles for the frame at the given time, converted to images */
optional<PositionImage>
Player::open_subtitles_for_frame (DCPTime time) const
PositionImage (
i.image,
Position<int> (
- lrint (_video_container_size.width * i.rectangle.x),
- lrint (_video_container_size.height * i.rectangle.y)
+ lrint(_video_container_size.width * i.rectangle.x),
+ lrint(_video_container_size.height * i.rectangle.y)
)
)
);
}
/* String subtitles (rendered to an image) */
- if (!j.string.empty ()) {
- list<PositionImage> s = render_text (j.string, j.fonts, _video_container_size, time, vfr);
+ if (!j.string.empty()) {
+ auto s = render_text (j.string, j.fonts, _video_container_size, time, vfr);
copy (s.begin(), s.end(), back_inserter (captions));
}
}
- if (captions.empty ()) {
- return optional<PositionImage> ();
+ if (captions.empty()) {
+ return {};
}
return merge (captions);
}
+
void
Player::video (weak_ptr<Piece> wp, ContentVideo video)
{
- shared_ptr<Piece> piece = wp.lock ();
+ auto piece = wp.lock ();
if (!piece) {
return;
}
- if (!piece->content->video->use()) {
+ if (!piece->use_video()) {
return;
}
- FrameRateChange frc (_film, piece->content);
+ auto frc = piece->frame_rate_change();
if (frc.skip && (video.frame % 2) == 1) {
return;
}
/* Time of the first frame we will emit */
- DCPTime const time = content_video_to_dcp (piece, video.frame);
+ DCPTime const time = piece->content_video_to_dcp (video.frame);
LOG_DEBUG_PLAYER("Received video frame %1 at %2", video.frame, to_string(time));
/* Discard if it's before the content's period or the last accurate seek. We can't discard
if it's after the content's period here as in that case we still need to fill any gap between
`now' and the end of the content's period.
*/
- if (time < piece->content->position() || (_last_video_time && time < *_last_video_time)) {
+ if (time < piece->position() || (_last_video_time && time < *_last_video_time)) {
+ return;
+ }
+
+ if (piece->ignore_video && piece->ignore_video->contains(time)) {
return;
}
/* Fill gaps that we discover now that we have some video which needs to be emitted.
This is where we need to fill to.
*/
- DCPTime fill_to = min (time, piece->content->end(_film));
+ DCPTime fill_to = min (time, piece->end(_film));
if (_last_video_time) {
- DCPTime fill_from = max (*_last_video_time, piece->content->position());
+ DCPTime fill_from = max (*_last_video_time, piece->position());
/* Fill if we have more than half a frame to do */
if ((fill_to - fill_from) > one_video_frame() / 2) {
- LastVideoMap::const_iterator last = _last_video.find (wp);
+ auto last = _last_video.find (wp);
if (_film->three_d()) {
- Eyes fill_to_eyes = video.eyes;
+ auto fill_to_eyes = video.eyes;
if (fill_to_eyes == Eyes::BOTH) {
fill_to_eyes = Eyes::LEFT;
}
- if (fill_to == piece->content->end(_film)) {
+ if (fill_to == piece->end(_film)) {
/* Don't fill after the end of the content */
fill_to_eyes = Eyes::LEFT;
}
- DCPTime j = fill_from;
- Eyes eyes = _last_video_eyes.get_value_or(Eyes::LEFT);
+ auto j = fill_from;
+ auto eyes = _last_video_eyes.get_value_or(Eyes::LEFT);
if (eyes == Eyes::BOTH) {
eyes = Eyes::LEFT;
}
while (j < fill_to || eyes != fill_to_eyes) {
if (last != _last_video.end()) {
LOG_DEBUG_PLAYER("Fill using last video at %1 in 3D mode", to_string(j));
- shared_ptr<PlayerVideo> copy = last->second->shallow_copy();
+ auto copy = last->second->shallow_copy();
copy->set_eyes (eyes);
emit_video (copy, j);
} else {
}
}
- _last_video[wp].reset (
- new PlayerVideo (
- video.image,
- piece->content->video->crop (),
- piece->content->video->fade (_film, video.frame),
- scale_for_display(piece->content->video->scaled_size(_film->frame_size()), _video_container_size, _film->frame_size()),
- _video_container_size,
- video.eyes,
- video.part,
- piece->content->video->colour_conversion(),
- piece->content->video->range(),
- piece->content,
- video.frame,
- false
- )
- );
+ _last_video[wp] = piece->player_video (video, _film, _video_container_size);
DCPTime t = time;
for (int i = 0; i < frc.repeat; ++i) {
- if (t < piece->content->end(_film)) {
+ if (t < piece->end(_film)) {
emit_video (_last_video[wp], t);
}
t += one_video_frame ();
}
}
+
void
Player::audio (weak_ptr<Piece> wp, AudioStreamPtr stream, ContentAudio content_audio)
{
DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
- shared_ptr<Piece> piece = wp.lock ();
+ auto piece = wp.lock ();
if (!piece) {
return;
}
- shared_ptr<AudioContent> content = piece->content->audio;
+ auto content = piece->content->audio;
DCPOMATIC_ASSERT (content);
- int const rfr = content->resampled_frame_rate (_film);
+ int const rfr = piece->resampled_audio_frame_rate (_film);
/* Compute time in the DCP */
- DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame);
+ auto time = piece->resampled_audio_to_dcp (content_audio.frame, _film);
LOG_DEBUG_PLAYER("Received audio frame %1 at %2", content_audio.frame, to_string(time));
/* And the end of this block in the DCP */
- DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), rfr);
+ auto end = time + DCPTime::from_frames(content_audio.audio->frames(), rfr);
/* Remove anything that comes before the start or after the end of the content */
- if (time < piece->content->position()) {
- pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (content_audio.audio, time, piece->content->position());
+ if (time < piece->position()) {
+ auto cut = discard_audio (content_audio.audio, time, piece->position());
if (!cut.first) {
/* This audio is entirely discarded */
return;
}
content_audio.audio = cut.first;
time = cut.second;
- } else if (time > piece->content->end(_film)) {
+ } else if (time > piece->end(_film)) {
/* Discard it all */
return;
- } else if (end > piece->content->end(_film)) {
- Frame const remaining_frames = DCPTime(piece->content->end(_film) - time).frames_round(rfr);
+ } else if (end > piece->end(_film)) {
+ Frame const remaining_frames = DCPTime(piece->end(_film) - time).frames_round(rfr);
if (remaining_frames == 0) {
return;
}
- content_audio.audio.reset (new AudioBuffers(content_audio.audio, remaining_frames, 0));
+ content_audio.audio = make_shared<AudioBuffers>(content_audio.audio, remaining_frames, 0);
}
DCPOMATIC_ASSERT (content_audio.audio->frames() > 0);
/* Gain */
if (content->gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
- gain->apply_gain (content->gain ());
+ auto gain = make_shared<AudioBuffers>(content_audio.audio);
+ gain->apply_gain (content->gain());
content_audio.audio = gain;
}
/* Push */
_audio_merger.push (content_audio.audio, time);
- DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ());
- _stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate());
+ piece->set_last_push_end (stream, time + DCPTime::from_frames(content_audio.audio->frames(), _film->audio_frame_rate()));
}
+
void
Player::bitmap_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, ContentBitmapText subtitle)
{
- shared_ptr<Piece> piece = wp.lock ();
- shared_ptr<const TextContent> text = wc.lock ();
+ auto piece = wp.lock ();
+ auto text = wc.lock ();
if (!piece || !text) {
return;
}
subtitle.sub.rectangle.height *= text->y_scale ();
PlayerText ps;
- shared_ptr<Image> image = subtitle.sub.image;
+ auto image = subtitle.sub.image;
/* We will scale the subtitle up to fit _video_container_size */
int const width = subtitle.sub.rectangle.width * _video_container_size.width;
dcp::Size scaled_size (width, height);
ps.bitmap.push_back (BitmapText(image->scale(scaled_size, dcp::YUVToRGB::REC601, image->pixel_format(), true, _fast), subtitle.sub.rectangle));
- DCPTime from (content_time_to_dcp (piece, subtitle.from()));
+ DCPTime from (piece->content_time_to_dcp(subtitle.from()));
_active_texts[static_cast<int>(text->type())].add_from (wc, ps, from);
}
+
void
Player::plain_text_start (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, ContentStringText subtitle)
{
- shared_ptr<Piece> piece = wp.lock ();
- shared_ptr<const TextContent> text = wc.lock ();
+ auto piece = wp.lock ();
+ auto text = wc.lock ();
if (!piece || !text) {
return;
}
PlayerText ps;
- DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
+ DCPTime const from (piece->content_time_to_dcp(subtitle.from()));
- if (from > piece->content->end(_film)) {
+ if (from > piece->end(_film)) {
return;
}
_active_texts[static_cast<int>(text->type())].add_from (wc, ps, from);
}
+
void
Player::subtitle_stop (weak_ptr<Piece> wp, weak_ptr<const TextContent> wc, ContentTime to)
{
- shared_ptr<const TextContent> text = wc.lock ();
+ auto text = wc.lock ();
if (!text) {
return;
}
return;
}
- DCPTime const dcp_to = content_time_to_dcp (piece, to);
+ auto const dcp_to = piece->content_time_to_dcp(to);
- if (dcp_to > piece->content->end(_film)) {
+ if (dcp_to > piece->end(_film)) {
return;
}
- pair<PlayerText, DCPTime> from = _active_texts[static_cast<int>(text->type())].add_to (wc, dcp_to);
+ auto from = _active_texts[static_cast<int>(text->type())].add_to (wc, dcp_to);
bool const always = (text->type() == TextType::OPEN_SUBTITLE && _always_burn_open_subtitles);
if (text->use() && !always && !text->burn()) {
}
}
+
void
Player::seek (DCPTime time, bool accurate)
{
}
for (auto i: _pieces) {
- if (time < i->content->position()) {
+ if (time < i->position()) {
/* Before; seek to the start of the content. Even if this request is for an inaccurate seek
we must seek this (following) content accurately, otherwise when we come to the end of the current
content we may not start right at the beginning of the next, causing a gap (if the next content has
been trimmed to a point between keyframes, or something).
*/
- i->decoder->seek (dcp_to_content_time (i, i->content->position()), true);
+ i->decoder->seek (i->dcp_to_content_time(i->position(), _film), true);
i->done = false;
- } else if (i->content->position() <= time && time < i->content->end(_film)) {
+ } else if (i->position() <= time && time < i->end(_film)) {
/* During; seek to position */
- i->decoder->seek (dcp_to_content_time (i, time), accurate);
+ i->decoder->seek (i->dcp_to_content_time(time, _film), accurate);
i->done = false;
} else {
/* After; this piece is done */
_last_video.clear ();
}
+
void
Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
{
+ if (!_film->three_d()) {
+ if (pv->eyes() == Eyes::LEFT) {
+ /* Use left-eye images for both eyes... */
+ pv->set_eyes (Eyes::BOTH);
+ } else if (pv->eyes() == Eyes::RIGHT) {
+ /* ...and discard the right */
+ return;
+ }
+ }
+
/* We need a delay to give a little wiggle room to ensure that relevent subtitles arrive at the
player before the video that requires them.
*/
return;
}
- pair<shared_ptr<PlayerVideo>, DCPTime> to_do = _delay.front();
+ auto to_do = _delay.front();
_delay.pop_front();
do_emit_video (to_do.first, to_do.second);
}
+
void
Player::do_emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
{
Video (pv, time);
}
+
void
Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
{
_last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate());
}
+
void
Player::fill_audio (DCPTimePeriod period)
{
DCPTime block = min (DCPTime::from_seconds (0.5), period.to - t);
Frame const samples = block.frames_round(_film->audio_frame_rate());
if (samples) {
- shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
+ auto silence = make_shared<AudioBuffers>(_film->audio_channels(), samples);
silence->make_silent ();
emit_audio (silence, t);
}
}
}
+
DCPTime
Player::one_video_frame () const
{
return DCPTime::from_frames (1, _film->video_frame_rate ());
}
+
pair<shared_ptr<AudioBuffers>, DCPTime>
Player::discard_audio (shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to) const
{
- DCPTime const discard_time = discard_to - time;
- Frame const discard_frames = discard_time.frames_round(_film->audio_frame_rate());
- Frame remaining_frames = audio->frames() - discard_frames;
+ auto const discard_time = discard_to - time;
+ auto const discard_frames = discard_time.frames_round(_film->audio_frame_rate());
+ auto remaining_frames = audio->frames() - discard_frames;
if (remaining_frames <= 0) {
return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
}
- shared_ptr<AudioBuffers> cut (new AudioBuffers(audio, remaining_frames, discard_frames));
+ auto cut = make_shared<AudioBuffers>(audio, remaining_frames, discard_frames);
return make_pair(cut, time + discard_time);
}
+
void
Player::set_dcp_decode_reduction (optional<int> reduction)
{
Change (ChangeType::DONE, PlayerProperty::DCP_DECODE_REDUCTION, false);
}
+
optional<DCPTime>
Player::content_time_to_dcp (shared_ptr<Content> content, ContentTime t)
{
for (auto i: _pieces) {
if (i->content == content) {
- return content_time_to_dcp (i, t);
+ return i->content_time_to_dcp(t);
}
}
projects / dcpomatic.git / blobdiff