using boost::optional;
using boost::scoped_ptr;
-static bool
-has_video (Content* c)
-{
- return static_cast<bool>(c->video);
-}
-
-static bool
-has_audio (Content* c)
-{
- return static_cast<bool>(c->audio);
-}
-
-static bool
-has_subtitle (Content* c)
-{
- return static_cast<bool>(c->subtitle);
-}
-
Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
: _film (film)
, _playlist (playlist)
}
shared_ptr<PlayerVideo>
-Player::black_player_video_frame (DCPTime time) const
+Player::black_player_video_frame () const
{
return shared_ptr<PlayerVideo> (
new PlayerVideo (
shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
- time,
Crop (),
optional<double> (),
_video_container_size,
}
ContentTime
-Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
+Player::dcp_to_content_time (shared_ptr<const Piece> piece, DCPTime t) const
{
DCPTime s = t - piece->content->position ();
s = min (piece->content->length_after_trim(), s);
}
DCPTime
-Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
+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());
}
DCPTime earliest_position;
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
- if (t < earliest_position) {
+ if (!earliest || t < earliest_position) {
earliest_position = t;
earliest = i;
}
}
+ if (!earliest) {
+ return true;
+ }
+
+ cout << "Pass " << earliest->content->path(0) << "\n";
earliest->decoder->pass ();
- /* XXX: collect audio and maybe emit some */
+ /* Emit any audio that is ready */
+
+ pair<shared_ptr<AudioBuffers>, DCPTime> audio = _audio_merger.pull (earliest_position);
+ 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;
+ }
+
+ Audio (audio.first, audio.second);
+ _last_audio_time = audio.second;
+ }
+
+ return false;
}
void
return;
}
- /* XXX: get subs to burn in and burn them in */
+ /* Time and period of the frame we will emit */
+ DCPTime const time = content_video_to_dcp (piece, video.frame.index());
+ DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate()));
+ /* Get any subtitles */
- /* Fill gaps */
+ optional<PositionImage> subtitles;
- DCPTime const time = content_video_to_dcp (piece, video.frame.index());
+ for (list<pair<PlayerSubtitles, DCPTimePeriod> >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- for (DCPTime i = _last_video_time; i < time; i += DCPTime::from_frames (1, _film->video_frame_rate())) {
- if (_playlist->video_content_at(i) && _last_video) {
- Video (_last_video->clone (i));
- } else {
- Video (black_player_video_frame (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 */
+
+ if (_last_video_time) {
+ for (DCPTime i = _last_video_time.get(); i < time; i += DCPTime::from_frames (1, _film->video_frame_rate())) {
+ if (_playlist->video_content_at(i) && _last_video) {
+ Video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), i);
+ } else {
+ Video (black_player_video_frame (), i);
+ }
}
}
_last_video.reset (
new PlayerVideo (
video.image,
- time,
piece->content->video->crop (),
piece->content->video->fade (video.frame.index()),
piece->content->video->scale().size (
)
);
+ if (subtitles) {
+ _last_video->set_subtitle (subtitles.get ());
+ }
+
_last_video_time = time;
- Video (_last_video);
+ cout << "Video @ " << to_string(_last_video_time.get()) << "\n";
+ Video (_last_video, *_last_video_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;
+ }
}
void
}
void
-Player::image_subtitle (weak_ptr<Piece> piece, ContentImageSubtitle subtitle)
+Player::image_subtitle (weak_ptr<Piece> wp, ContentImageSubtitle subtitle)
{
- /* XXX: Store for video to see */
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ /* Apply content's subtitle offsets */
+ subtitle.sub.rectangle.x += piece->content->subtitle->x_offset ();
+ subtitle.sub.rectangle.y += piece->content->subtitle->y_offset ();
+
+ /* Apply content's subtitle scale */
+ subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale ();
+ subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale ();
+
+ /* Apply a corrective translation to keep the subtitle centred after that scale */
+ subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * (piece->content->subtitle->x_scale() - 1);
+ subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * (piece->content->subtitle->y_scale() - 1);
+
+ 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));
+
+ if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) {
+ _subtitles.push_back (make_pair (ps, period));
+ } else {
+ Subtitle (ps, period);
+ }
}
void
-Player::text_subtitle (weak_ptr<Piece> piece, ContentTextSubtitle subtitle)
+Player::text_subtitle (weak_ptr<Piece> wp, ContentTextSubtitle subtitle)
{
- /* XXX: Store for video to see, or emit */
+ shared_ptr<Piece> piece = wp.lock ();
+ if (!piece) {
+ return;
+ }
+
+ PlayerSubtitles ps;
+ DCPTimePeriod const period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to));
+
+ BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) {
+ s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ());
+ s.set_v_position (s.v_position() + piece->content->subtitle->y_offset ());
+ float const xs = piece->content->subtitle->x_scale();
+ float const ys = piece->content->subtitle->y_scale();
+ float size = s.size();
+
+ /* Adjust size to express the common part of the scaling;
+ e.g. if xs = ys = 0.5 we scale size by 2.
+ */
+ if (xs > 1e-5 && ys > 1e-5) {
+ size *= 1 / min (1 / xs, 1 / ys);
+ }
+ s.set_size (size);
+
+ /* Then express aspect ratio changes */
+ if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
+ s.set_aspect_adjust (xs / ys);
+ }
+
+ s.set_in (dcp::Time(period.from.seconds(), 1000));
+ s.set_out (dcp::Time(period.to.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);
+ }
}
void
Player::seek (DCPTime time, bool accurate)
{
- /* XXX: seek decoders */
+ BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+ if (i->content->position() <= time && time < i->content->end()) {
+ i->decoder->seek (dcp_to_content_time (i, time), accurate);
+ }
+ }
if (accurate) {
_last_video_time = time - DCPTime::from_frames (1, _film->video_frame_rate ());
+ } else {
+ _last_video_time = optional<DCPTime> ();
}
}
projects / dcpomatic.git / blobdiff