#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
#include "audio_processor.h"
+#include "playlist.h"
#include <boost/foreach.hpp>
#include <stdint.h>
#include <algorithm>
+#include <iostream>
#include "i18n.h"
using boost::dynamic_pointer_cast;
using boost::optional;
-Player::Player (shared_ptr<const Film> film)
+Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist)
: _film (film)
+ , _playlist (playlist)
, _have_valid_pieces (false)
, _ignore_video (false)
- , _burn_subtitles (film->burn_subtitles ())
+ , _ignore_audio (false)
+ , _always_burn_subtitles (false)
+ , _fast (false)
{
- _film_content_changed_connection = _film->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
_film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
+ _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
+ _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::playlist_content_changed, this, _1, _2, _3));
set_video_container_size (_film->frame_size ());
film_changed (Film::AUDIO_PROCESSOR);
list<shared_ptr<Piece> > old_pieces = _pieces;
_pieces.clear ();
- ContentList content = _film->content ();
+ BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
- for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
-
- if (!(*i)->paths_valid ()) {
+ if (!i->paths_valid ()) {
continue;
}
/* Work out a FrameRateChange for the best overlap video for this content, in case we need it below */
DCPTime best_overlap_t;
shared_ptr<VideoContent> best_overlap;
- for (ContentList::iterator j = content.begin(); j != content.end(); ++j) {
- shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*j);
+ BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
+ shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
if (!vc) {
continue;
}
- DCPTime const overlap = max (vc->position(), (*i)->position()) - min (vc->end(), (*i)->end());
+ DCPTime const overlap = max (vc->position(), i->position()) - min (vc->end(), i->end());
if (overlap > best_overlap_t) {
best_overlap = vc;
best_overlap_t = overlap;
}
/* FFmpeg */
- shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (*i);
+ shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
if (fc) {
- decoder.reset (new FFmpegDecoder (fc, _film->log()));
+ decoder.reset (new FFmpegDecoder (fc, _film->log(), _fast));
frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
}
- shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (*i);
+ shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (i);
if (dc) {
- decoder.reset (new DCPDecoder (dc));
+ decoder.reset (new DCPDecoder (dc, _fast));
frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate());
}
/* ImageContent */
- shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
+ shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (i);
if (ic) {
/* See if we can re-use an old ImageDecoder */
for (list<shared_ptr<Piece> >::const_iterator j = old_pieces.begin(); j != old_pieces.end(); ++j) {
}
/* SndfileContent */
- shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (*i);
+ shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (i);
if (sc) {
- decoder.reset (new SndfileDecoder (sc));
+ decoder.reset (new SndfileDecoder (sc, _fast));
frc = best_overlap_frc;
}
/* SubRipContent */
- shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (*i);
+ shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (i);
if (rc) {
decoder.reset (new SubRipDecoder (rc));
frc = best_overlap_frc;
}
/* DCPSubtitleContent */
- shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (*i);
+ shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
if (dsc) {
decoder.reset (new DCPSubtitleDecoder (dsc));
frc = best_overlap_frc;
vd->set_ignore_video ();
}
- _pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
+ shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> (decoder);
+ if (ad && _ignore_audio) {
+ ad->set_ignore_audio ();
+ }
+
+ _pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc.get ())));
}
_have_valid_pieces = true;
}
void
-Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
+Player::playlist_content_changed (weak_ptr<Content> w, int property, bool frequent)
{
shared_ptr<Content> c = w.lock ();
if (!c) {
property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
property == SubtitleContentProperty::SUBTITLE_X_SCALE ||
property == SubtitleContentProperty::SUBTITLE_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::VIDEO_FADE_OUT ||
+ property == VideoContentProperty::COLOUR_CONVERSION
) {
Changed (frequent);
_black_image->make_black ();
}
+void
+Player::playlist_changed ()
+{
+ _have_valid_pieces = false;
+ Changed (false);
+}
+
void
Player::film_changed (Film::Property p)
{
last time we were run.
*/
- if (p == Film::CONTENT) {
- _have_valid_pieces = false;
- Changed (false);
- } else if (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 ()) {
true
),
Position<int> (
- rint (_video_container_size.width * i->rectangle.x),
- rint (_video_container_size.height * i->rectangle.y)
+ lrint (_video_container_size.width * i->rectangle.x),
+ lrint (_video_container_size.height * i->rectangle.y)
)
)
);
shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)),
time,
Crop (),
- optional<float> (),
+ optional<double> (),
_video_container_size,
_video_container_size,
EYES_BOTH,
setup_pieces ();
}
+ /* Find subtitles for possible burn-in */
+
+ PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false, true);
+
+ list<PositionImage> sub_images;
+
+ /* Image subtitles */
+ list<PositionImage> c = transform_image_subtitles (ps.image);
+ copy (c.begin(), c.end(), back_inserter (sub_images));
+
+ /* Text subtitles (rendered to an image) */
+ if (!ps.text.empty ()) {
+ list<PositionImage> s = render_subtitles (ps.text, ps.fonts, _video_container_size);
+ copy (s.begin (), s.end (), back_inserter (sub_images));
+ }
+
+ optional<PositionImage> subtitles;
+ if (!sub_images.empty ()) {
+ subtitles = merge (sub_images);
+ }
+
+ /* Find pieces containing video which is happening now */
+
list<shared_ptr<Piece> > ov = overlaps<VideoContent> (
time,
time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta()
/* No video content at this time */
pvf.push_back (black_player_video_frame (time));
} else {
- /* Create a PlayerVideo from the content's video at this time */
-
- shared_ptr<Piece> piece = ov.back ();
- shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder);
- DCPOMATIC_ASSERT (decoder);
- shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content);
- DCPOMATIC_ASSERT (content);
-
- list<ContentVideo> content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate);
- if (content_video.empty ()) {
- pvf.push_back (black_player_video_frame (time));
- return pvf;
- }
-
- dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
-
- for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
- pvf.push_back (
- shared_ptr<PlayerVideo> (
- new PlayerVideo (
- i->image,
- content_video_to_dcp (piece, i->frame),
- content->crop (),
- content->fade (i->frame),
- image_size,
- _video_container_size,
- i->eyes,
- i->part,
- content->colour_conversion ()
- )
- )
- );
+ /* Some video content at this time */
+ shared_ptr<Piece> last = *(ov.rbegin ());
+ VideoFrameType const last_type = dynamic_pointer_cast<VideoContent> (last->content)->video_frame_type ();
+
+ /* Get video from appropriate piece(s) */
+ BOOST_FOREACH (shared_ptr<Piece> piece, ov) {
+
+ shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder);
+ DCPOMATIC_ASSERT (decoder);
+ shared_ptr<VideoContent> video_content = dynamic_pointer_cast<VideoContent> (piece->content);
+ DCPOMATIC_ASSERT (video_content);
+
+ bool const use =
+ /* 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);
+
+ if (use) {
+ /* We want to use this piece */
+ list<ContentVideo> content_video = decoder->get_video (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 ());
+
+ for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
+ pvf.push_back (
+ shared_ptr<PlayerVideo> (
+ new PlayerVideo (
+ i->image,
+ content_video_to_dcp (piece, i->frame),
+ video_content->crop (),
+ video_content->fade (i->frame),
+ image_size,
+ _video_container_size,
+ i->eyes,
+ i->part,
+ video_content->colour_conversion ()
+ )
+ )
+ );
+ }
+ }
+ } else {
+ /* Discard unused video */
+ decoder->get_video (dcp_to_content_video (piece, time), accurate);
+ }
}
}
- /* Add subtitles (for possible burn-in) to whatever PlayerVideos we got */
-
- PlayerSubtitles ps = get_subtitles (time, DCPTime::from_frames (1, _film->video_frame_rate ()), false);
-
- list<PositionImage> sub_images;
-
- /* Image subtitles */
- list<PositionImage> c = transform_image_subtitles (ps.image);
- copy (c.begin(), c.end(), back_inserter (sub_images));
-
- /* Text subtitles (rendered to an image) */
- if (_burn_subtitles && !ps.text.empty ()) {
- list<PositionImage> s = render_subtitles (ps.text, _video_container_size);
- copy (s.begin (), s.end (), back_inserter (sub_images));
- }
-
- if (!sub_images.empty ()) {
- for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
- (*i)->set_subtitle (merge (sub_images));
+ if (subtitles) {
+ BOOST_FOREACH (shared_ptr<PlayerVideo> p, pvf) {
+ p->set_subtitle (subtitles.get ());
}
}
setup_pieces ();
}
- Frame const length_frames = length.frames (_film->audio_frame_rate ());
+ Frame const length_frames = length.frames_round (_film->audio_frame_rate ());
shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
audio->make_silent ();
the stuff we get back.
*/
offset = -request;
- request_frames += request.frames (_film->audio_frame_rate ());
+ request_frames += request.frames_round (_film->audio_frame_rate ());
if (request_frames < 0) {
request_frames = 0;
}
request = DCPTime ();
}
- Frame const content_frame = dcp_to_content_audio (*i, request);
+ Frame const content_frame = dcp_to_resampled_audio (*i, request);
BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) {
+ if (j->channels() == 0) {
+ /* Some content (e.g. DCPs) can have streams with no channels */
+ continue;
+ }
+
/* 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);
}
if (_audio_processor) {
- dcp_mapped = _audio_processor->run (dcp_mapped);
+ dcp_mapped = _audio_processor->run (dcp_mapped, _film->audio_channels ());
}
all.audio = dcp_mapped;
audio->accumulate_frames (
all.audio.get(),
content_frame - all.frame,
- offset.frames (_film->audio_frame_rate()),
+ offset.frames_round (_film->audio_frame_rate()),
min (Frame (all.audio->frames()), request_frames)
);
}
Frame
Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
{
- /* s is the offset of t from the start position of this content */
+ shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (piece->content);
DCPTime s = t - piece->content->position ();
- s = DCPTime (max (DCPTime::Type (0), s.get ()));
- s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
+ s = min (piece->content->length_after_trim(), s);
+ s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc));
- /* Convert this to the content frame */
- return DCPTime (s + piece->content->trim_start()).frames (_film->video_frame_rate()) / piece->frc.factor ();
+ /* 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
{
- DCPTime t = DCPTime::from_frames (f * piece->frc.factor (), _film->video_frame_rate()) - piece->content->trim_start () + piece->content->position ();
- if (t < DCPTime ()) {
- t = DCPTime ();
- }
-
- return t;
+ shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (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 ());
}
Frame
-Player::dcp_to_content_audio (shared_ptr<const Piece> piece, DCPTime t) const
+Player::dcp_to_resampled_audio (shared_ptr<const Piece> piece, DCPTime t) const
{
- /* s is the offset of t from the start position of this content */
DCPTime s = t - piece->content->position ();
- s = DCPTime (max (DCPTime::Type (0), s.get ()));
- s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
- /* Convert this to the content frame */
- return DCPTime (s + piece->content->trim_start()).frames (_film->audio_frame_rate());
+ s = min (piece->content->length_after_trim(), 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 ());
}
ContentTime
Player::dcp_to_content_subtitle (shared_ptr<const Piece> piece, DCPTime t) const
{
- /* s is the offset of t from the start position of this content */
DCPTime s = t - piece->content->position ();
- s = DCPTime (max (DCPTime::Type (0), s.get ()));
- s = DCPTime (min (piece->content->length_after_trim().get(), s.get()));
-
- return ContentTime (s + piece->content->trim_start(), piece->frc);
-}
-
-void
-PlayerStatistics::dump (shared_ptr<Log> log) const
-{
- log->log (String::compose ("Video: %1 good %2 skipped %3 black %4 repeat", video.good, video.skip, video.black, video.repeat), Log::TYPE_GENERAL);
- log->log (String::compose ("Audio: %1 good %2 skipped %3 silence", audio.good, audio.skip, audio.silence.seconds()), Log::TYPE_GENERAL);
-}
-
-PlayerStatistics const &
-Player::statistics () const
-{
- return _statistics;
+ s = min (piece->content->length_after_trim(), s);
+ return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
}
+/** @param burnt true to return only subtitles to be burnt, false to return only
+ * subtitles that should not be burnt. This parameter will be ignored if
+ * _always_burn_subtitles is true; in this case, all subtitles will be returned.
+ */
PlayerSubtitles
-Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
+Player::get_subtitles (DCPTime time, DCPTime length, bool starting, bool burnt)
{
list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (time, time + length);
for (list<shared_ptr<Piece> >::const_iterator j = subs.begin(); j != subs.end(); ++j) {
shared_ptr<SubtitleContent> subtitle_content = dynamic_pointer_cast<SubtitleContent> ((*j)->content);
- if (!subtitle_content->use_subtitles ()) {
+ if (!subtitle_content->use_subtitles () || (!_always_burn_subtitles && (burnt != subtitle_content->burn_subtitles ()))) {
continue;
}
s.set_aspect_adjust (xs / ys);
}
ps.text.push_back (s);
+ ps.add_fonts (subtitle_content->fonts ());
}
}
}
_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.
+/** Set this player never to produce any audio data */
+void
+Player::set_ignore_audio ()
+{
+ _ignore_audio = true;
+}
+
+/** Set whether or not this player should always burn text subtitles into the image,
+ * regardless of the content settings.
+ * @param burn true to always burn subtitles, false to obey content settings.
*/
void
-Player::set_burn_subtitles (bool burn)
+Player::set_always_burn_subtitles (bool burn)
+{
+ _always_burn_subtitles = burn;
+}
+
+void
+Player::set_fast ()
{
- _burn_subtitles = burn;
+ _fast = true;
+ _have_valid_pieces = false;
}
projects / dcpomatic.git / blobdiff