#include "content_subtitle.h"
#include "dcp_decoder.h"
#include "image_decoder.h"
-#include "resampler.h"
#include "compose.hpp"
#include <dcp/reel.h>
#include <dcp/reel_sound_asset.h>
, _playlist (playlist)
, _have_valid_pieces (false)
, _ignore_video (false)
- , _ignore_audio (false)
+ , _ignore_subtitle (false)
, _always_burn_subtitles (false)
, _fast (false)
, _play_referenced (false)
- , _audio_merger (_film->audio_channels(), _film->audio_frame_rate())
+ , _audio_merger (_film->audio_frame_rate())
{
_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
_playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
decoder->video->set_ignore ();
}
- if (decoder->audio && _ignore_audio) {
- decoder->audio->set_ignore ();
+ if (decoder->subtitle && _ignore_subtitle) {
+ decoder->subtitle->set_ignore ();
}
shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
}
if (decoder->subtitle) {
- decoder->subtitle->ImageData.connect (bind (&Player::image_subtitle, this, weak_ptr<Piece> (piece), _1));
- decoder->subtitle->TextData.connect (bind (&Player::text_subtitle, this, weak_ptr<Piece> (piece), _1));
+ decoder->subtitle->ImageStart.connect (bind (&Player::image_subtitle_start, this, weak_ptr<Piece> (piece), _1));
+ decoder->subtitle->TextStart.connect (bind (&Player::text_subtitle_start, this, weak_ptr<Piece> (piece), _1));
+ decoder->subtitle->Stop.connect (bind (&Player::subtitle_stop, this, weak_ptr<Piece> (piece), _1));
}
}
}
}
+ _black = Empty (_film, bind(&Content::video, _1));
+ _silent = Empty (_film, bind(&Content::audio, _1));
+
+ _last_video_time = DCPTime ();
+ _last_audio_time = DCPTime ();
_have_valid_pieces = true;
}
void
Player::set_video_container_size (dcp::Size s)
{
+ if (s == _video_container_size) {
+ return;
+ }
+
_video_container_size = s;
_black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true));
_black_image->make_black ();
+
+ Changed (false);
}
void
Player::resampled_audio_to_dcp (shared_ptr<const Piece> piece, Frame f) const
{
/* See comment in dcp_to_content_video */
- DCPTime const d = DCPTime::from_frames (f, _film->audio_frame_rate()) - DCPTime (piece->content->trim_start (), piece->frc);
- return max (DCPTime (), d + piece->content->position ());
+ return DCPTime::from_frames (f, _film->audio_frame_rate())
+ - DCPTime (piece->content->trim_start(), piece->frc)
+ + piece->content->position();
}
ContentTime
_ignore_video = true;
}
-/** Set this player never to produce any audio data */
void
-Player::set_ignore_audio ()
+Player::set_ignore_subtitle ()
{
- _ignore_audio = true;
+ _ignore_subtitle = true;
}
/** Set whether or not this player should always burn text subtitles into the image,
return a;
}
-list<shared_ptr<Piece> >
-Player::overlaps (DCPTime from, DCPTime to, boost::function<bool (Content *)> valid)
-{
- if (!_have_valid_pieces) {
- setup_pieces ();
- }
-
- list<shared_ptr<Piece> > overlaps;
- BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
- if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) {
- overlaps.push_back (i);
- }
- }
-
- return overlaps;
-}
-
bool
Player::pass ()
{
setup_pieces ();
}
+ /* Find the decoder or empty which is farthest behind where we are and make it emit some data */
+
shared_ptr<Piece> earliest;
DCPTime earliest_content;
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
if (!i->done) {
- DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
- if (!earliest || t < earliest_content) {
+ DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+ /* Given two choices at the same time, pick the one with a subtitle so we see it before
+ the video.
+ */
+ if (!earliest || t < earliest_content || (t == earliest_content && i->decoder->subtitle)) {
earliest_content = t;
earliest = i;
}
}
}
- if (!earliest) {
- /* No more content; fill up to the length of our playlist with silent black */
-
- DCPTime const length = _playlist->length ();
+ bool done = false;
- DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate());
- DCPTime from;
- if (_last_time) {
- from = _last_time.get() + frame;
+ if (!_black.done() && (!earliest || _black.position() < earliest_content)) {
+ /* There is some black that must be emitted */
+ emit_video (black_player_video_frame(), _black.position());
+ _black.set_position (_black.position() + one_video_frame());
+ } else if (!_silent.done() && (!earliest || _silent.position() < earliest_content)) {
+ /* There is some silence that must be emitted */
+ DCPTimePeriod period (_silent.period_at_position());
+ if (period.duration() > one_video_frame()) {
+ period.to = period.from + one_video_frame();
}
- for (DCPTime i = from; i < length; i += frame) {
- Video (black_player_video_frame (), i);
+ fill_audio (period);
+ _silent.set_position (period.to);
+ } else if (_playlist->length() == DCPTime()) {
+ /* Special case of an empty Film; just give one black frame */
+ emit_video (black_player_video_frame(), DCPTime());
+ } else if (earliest) {
+ earliest->done = earliest->decoder->pass ();
+ } else {
+ done = true;
+ }
+
+ /* Emit any audio that is ready */
+
+ DCPTime pull_to = _film->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;
}
+ }
- DCPTime t = _last_audio_time;
- while (t < length) {
- DCPTime block = min (DCPTime::from_seconds (0.5), length - t);
- Frame const samples = block.frames_round(_film->audio_frame_rate());
- if (samples) {
- shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), samples));
- silence->make_silent ();
- Audio (silence, t);
+ 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) {
+ if (_last_audio_time && i->second < *_last_audio_time) {
+ /* There has been an accurate seek and we have received some audio before the seek time;
+ discard it.
+ */
+ pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time);
+ if (!cut.first) {
+ continue;
}
- t += block;
+ *i = cut;
}
- return true;
+ emit_audio (i->first, i->second);
}
- earliest->done = earliest->decoder->pass ();
+ return done;
+}
- /* Emit any audio that is ready */
+optional<PositionImage>
+Player::subtitles_for_frame (DCPTime time) const
+{
+ list<PositionImage> subtitles;
- DCPTime pull_from = _playlist->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_from) {
- pull_from = i->second.last_push_end;
- }
- }
+ BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (time, _always_burn_subtitles)) {
-// cout << "PULL " << to_string(pull_from) << "\n";
- pair<shared_ptr<AudioBuffers>, DCPTime> audio = _audio_merger.pull (pull_from);
- if (audio.first->frames() > 0) {
- DCPOMATIC_ASSERT (audio.second >= _last_audio_time);
- DCPTime t = _last_audio_time;
- while (t < audio.second) {
- /* Silence up to the time of this new audio */
- DCPTime block = min (DCPTime::from_seconds (0.5), audio.second - t);
- shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), block.frames_round(_film->audio_frame_rate())));
- silence->make_silent ();
- Audio (silence, t);
- t += block;
+ /* Image subtitles */
+ list<PositionImage> c = transform_image_subtitles (i.image);
+ copy (c.begin(), c.end(), back_inserter (subtitles));
+
+ /* Text subtitles (rendered to an image) */
+ if (!i.text.empty ()) {
+ list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time);
+ copy (s.begin(), s.end(), back_inserter (subtitles));
}
+ }
- Audio (audio.first, audio.second);
- _last_audio_time = audio.second + DCPTime::from_frames(audio.first->frames(), _film->audio_frame_rate());
+ if (subtitles.empty ()) {
+ return optional<PositionImage> ();
}
- return false;
+ return merge (subtitles);
}
void
/* Time and period of the frame we will emit */
DCPTime const time = content_video_to_dcp (piece, video.frame);
- DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate()));
-
- /* Discard if it's outside the content's period */
- if (time < piece->content->position() || time >= piece->content->end()) {
- return;
- }
+ DCPTimePeriod const period (time, time + one_video_frame());
- /* Get any subtitles */
-
- optional<PositionImage> subtitles;
-
- for (list<pair<PlayerSubtitles, DCPTimePeriod> >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-
- if (!i->second.overlap (period)) {
- continue;
- }
-
- list<PositionImage> sub_images;
-
- /* Image subtitles */
- list<PositionImage> c = transform_image_subtitles (i->first.image);
- copy (c.begin(), c.end(), back_inserter (sub_images));
-
- /* Text subtitles (rendered to an image) */
- if (!i->first.text.empty ()) {
- list<PositionImage> s = render_subtitles (i->first.text, i->first.fonts, _video_container_size, time);
- copy (s.begin (), s.end (), back_inserter (sub_images));
- }
-
- if (!sub_images.empty ()) {
- subtitles = merge (sub_images);
- }
- }
+ /* Fill gaps that we discover now that we have some video which needs to be emitted */
- /* Fill gaps */
-
- if (_last_time) {
+ if (_last_video_time) {
/* XXX: this may not work for 3D */
- DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate());
- for (DCPTime i = _last_time.get() + frame; i < time; i += frame) {
- if (_playlist->video_content_at(i) && _last_video) {
- Video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), i);
+ DCPTime fill_from = max (*_last_video_time, piece->content->position());
+ for (DCPTime j = fill_from; j < time; j += one_video_frame()) {
+ LastVideoMap::const_iterator k = _last_video.find (wp);
+ if (k != _last_video.end ()) {
+ emit_video (k->second, j);
} else {
- Video (black_player_video_frame (), i);
+ emit_video (black_player_video_frame(), j);
}
}
}
- _last_video.reset (
+ /* Discard if it's outside the content's period or if it's before the last accurate seek */
+ if (
+ time < piece->content->position() ||
+ time >= piece->content->end() ||
+ (_last_video_time && time < *_last_video_time)) {
+ return;
+ }
+
+ _last_video[wp].reset (
new PlayerVideo (
video.image,
piece->content->video->crop (),
)
);
- if (subtitles) {
- _last_video->set_subtitle (subtitles.get ());
- }
-
- _last_time = time;
-
- Video (_last_video, *_last_time);
-
- /* Discard any subtitles we no longer need */
-
- for (list<pair<PlayerSubtitles, DCPTimePeriod> >::iterator i = _subtitles.begin (); i != _subtitles.end(); ) {
- list<pair<PlayerSubtitles, DCPTimePeriod> >::iterator tmp = i;
- ++tmp;
-
- if (i->second.to < time) {
- _subtitles.erase (i);
- }
-
- i = tmp;
- }
+ emit_video (_last_video[wp], time);
}
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 ();
if (!piece) {
return;
shared_ptr<AudioContent> content = piece->content->audio;
DCPOMATIC_ASSERT (content);
- /* Gain */
- if (content->gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
- gain->apply_gain (content->gain ());
- content_audio.audio = gain;
- }
-
- /* Resample */
- if (stream->frame_rate() != content->resampled_frame_rate()) {
- shared_ptr<Resampler> r = resampler (content, stream, true);
- pair<shared_ptr<const AudioBuffers>, Frame> ro = r->run (content_audio.audio, content_audio.frame);
- content_audio.audio = ro.first;
- content_audio.frame = ro.second;
- }
-
- /* XXX: end-trimming used to be checked here */
-
/* Compute time in the DCP */
- DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0);
+ DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame);
+ /* And the end of this block in the DCP */
+ DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate());
- /* Remove anything that comes before the start of the content */
+ /* Remove anything that comes before the start or after the end of the content */
if (time < piece->content->position()) {
- DCPTime const discard_time = piece->content->position() - time;
- Frame discard_frames = discard_time.frames_round(_film->audio_frame_rate());
- Frame remaining_frames = content_audio.audio->frames() - discard_frames;
- if (remaining_frames <= 0) {
+ pair<shared_ptr<AudioBuffers>, DCPTime> cut = discard_audio (content_audio.audio, time, piece->content->position());
+ if (!cut.first) {
/* This audio is entirely discarded */
return;
}
+ content_audio.audio = cut.first;
+ time = cut.second;
+ } else if (time > piece->content->end()) {
+ /* Discard it all */
+ return;
+ } else if (end > piece->content->end()) {
+ Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate());
+ if (remaining_frames == 0) {
+ return;
+ }
shared_ptr<AudioBuffers> cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames));
- cut->copy_from (content_audio.audio.get(), remaining_frames, discard_frames, 0);
+ cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0);
content_audio.audio = cut;
- time += discard_time;
- }
-
- /* Remap channels */
- shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames()));
- dcp_mapped->make_silent ();
-
- AudioMapping map = stream->mapping ();
- for (int i = 0; i < map.input_channels(); ++i) {
- for (int j = 0; j < dcp_mapped->channels(); ++j) {
- if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
- dcp_mapped->accumulate_channel (
- content_audio.audio.get(),
- i,
- static_cast<dcp::Channel> (j),
- map.get (i, static_cast<dcp::Channel> (j))
- );
- }
- }
}
- content_audio.audio = dcp_mapped;
+ 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 ());
+ content_audio.audio = gain;
+ }
+
+ /* Remap */
+
+ content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping());
+
+ /* Process */
if (_audio_processor) {
content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
}
-// cout << "PUSH " << content_audio.audio->frames() << " @ " << to_string(time) << "\n";
- _audio_merger.push (content_audio.audio, time);
+ /* 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());
}
void
-Player::image_subtitle (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
+Player::image_subtitle
_start (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
{
shared_ptr<Piece> piece = wp.lock ();
if (!piece) {
PlayerSubtitles ps;
ps.image.push_back (subtitle.sub);
- DCPTimePeriod period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to));
+ DCPTime from (content_time_to_dcp (piece, subtitle.from()));
- if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) {
- _subtitles.push_back (make_pair (ps, period));
- } else {
- Subtitle (ps, period);
- }
+ _active_subtitles.add_from (wp, ps, from);
}
void
-Player::text_subtitle (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
+Player::text_subtitle
_start (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
{
shared_ptr<Piece> piece = wp.lock ();
if (!piece) {
}
PlayerSubtitles ps;
- DCPTimePeriod const period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to));
+ DCPTime const from (content_time_to_dcp (piece, subtitle.from()));
BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) {
s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ());
s.set_aspect_adjust (xs / ys);
}
- s.set_in (dcp::Time(period.from.seconds(), 1000));
- s.set_out (dcp::Time(period.to.seconds(), 1000));
+ s.set_in (dcp::Time(from.seconds(), 1000));
ps.text.push_back (SubtitleString (s, piece->content->subtitle->outline_width()));
ps.add_fonts (piece->content->subtitle->fonts ());
}
- if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) {
- _subtitles.push_back (make_pair (ps, period));
- } else {
- Subtitle (ps, period);
+ _active_subtitles.add_from (wp, ps, from);
+}
+
+void
+Player::subtitle_stop (weak_ptr<Piece> wp, ContentTime to)
+{
+ if (!_active_subtitles.have (wp)) {
+ return;
+ }
+
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ DCPTime const dcp_to = content_time_to_dcp (piece, to);
+
+ pair<PlayerSubtitles, DCPTime> from = _active_subtitles.add_to (wp, dcp_to);
+
+ if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) {
+ Subtitle (from.first, DCPTimePeriod (from.second, dcp_to));
}
}
void
Player::seek (DCPTime time, bool accurate)
{
+ if (_audio_processor) {
+ _audio_processor->flush ();
+ }
+
+ _audio_merger.clear ();
+ _active_subtitles.clear ();
+
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
- if (i->content->position() <= time && time < i->content->end()) {
+ if (time < i->content->position()) {
+ /* Before; seek to 0 */
+ i->decoder->seek (ContentTime(), accurate);
+ i->done = false;
+ } else if (i->content->position() <= time && time < i->content->end()) {
+ /* During; seek to position */
i->decoder->seek (dcp_to_content_time (i, time), accurate);
i->done = false;
+ } else {
+ /* After; this piece is done */
+ i->done = true;
}
}
if (accurate) {
- _last_time = time - DCPTime::from_frames (1, _film->video_frame_rate ());
+ _last_video_time = time;
+ _last_audio_time = time;
} else {
- _last_time = optional<DCPTime> ();
+ _last_video_time = optional<DCPTime>();
+ _last_audio_time = optional<DCPTime>();
}
+
+ _black.set_position (time);
+ _silent.set_position (time);
+
+ _last_video.clear ();
}
-shared_ptr<Resampler>
-Player::resampler (shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create)
+void
+Player::emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
{
- ResamplerMap::const_iterator i = _resamplers.find (make_pair (content, stream));
- if (i != _resamplers.end ()) {
- return i->second;
+ optional<PositionImage> subtitles = subtitles_for_frame (time);
+ if (subtitles) {
+ pv->set_subtitle (subtitles.get ());
}
- if (!create) {
- return shared_ptr<Resampler> ();
+ Video (pv, time);
+
+ if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) {
+ _last_video_time = time + one_video_frame();
+ _active_subtitles.clear_before (time);
}
+}
- LOG_GENERAL (
- "Creating new resampler from %1 to %2 with %3 channels",
- stream->frame_rate(),
- content->resampled_frame_rate(),
- stream->channels()
- );
+void
+Player::emit_audio (shared_ptr<AudioBuffers> data, DCPTime time)
+{
+ Audio (data, time);
+ _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate());
+}
- shared_ptr<Resampler> r (
- new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels())
- );
+void
+Player::fill_audio (DCPTimePeriod period)
+{
+ if (period.from == period.to) {
+ return;
+ }
+
+ DCPOMATIC_ASSERT (period.from < period.to);
+
+ DCPTime t = period.from;
+ while (t < period.to) {
+ 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));
+ silence->make_silent ();
+ emit_audio (silence, t);
+ }
+ t += block;
+ }
+}
- _resamplers[make_pair(content, stream)] = r;
- return r;
+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;
+ if (remaining_frames <= 0) {
+ return make_pair(shared_ptr<AudioBuffers>(), DCPTime());
+ }
+ shared_ptr<AudioBuffers> cut (new AudioBuffers (audio->channels(), remaining_frames));
+ cut->copy_from (audio.get(), remaining_frames, discard_frames, 0);
+ return make_pair(cut, time + discard_time);
}
projects / dcpomatic.git / blobdiff