#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>
#include <dcp/reel_subtitle_asset.h>
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)
decoder->audio->set_ignore ();
}
- if (decoder->audio && _fast) {
- decoder->audio->set_fast ();
- }
-
shared_ptr<DCPDecoder> dcp = dynamic_pointer_cast<DCPDecoder> (decoder);
if (dcp && _play_referenced) {
dcp->set_decode_referenced ();
}
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,
}
shared_ptr<Piece> earliest;
- DCPTime earliest_position;
+ DCPTime earliest_content;
+
BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
- DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
- if (!earliest || t < earliest_position) {
- earliest_position = t;
- earliest = i;
+ if (!i->done) {
+ DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc);
+ if (!earliest || t < earliest_content) {
+ earliest_content = t;
+ earliest = i;
+ }
}
}
return true;
}
- cout << "Pass " << earliest->content->path(0) << "\n";
- earliest->decoder->pass ();
+ earliest->done = earliest->decoder->pass ();
/* Emit any audio that is ready */
- pair<shared_ptr<AudioBuffers>, DCPTime> audio = _audio_merger.pull (earliest_position);
+ optional<DCPTime> earliest_audio;
+ BOOST_FOREACH (shared_ptr<Piece> i, _pieces) {
+ if (i->decoder->audio) {
+ DCPTime const t = i->content->position() + DCPTime (i->decoder->audio->position(), i->frc);
+ if (!earliest_audio || t < *earliest_audio) {
+ earliest_audio = t;
+ }
+ }
+ }
+
+ pair<shared_ptr<AudioBuffers>, DCPTime> audio = _audio_merger.pull (earliest_audio.get_value_or(DCPTime()));
if (audio.first->frames() > 0) {
DCPOMATIC_ASSERT (audio.second >= _last_audio_time);
DCPTime t = _last_audio_time;
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()));
+ /* Discard if it's outside the content's period */
+ if (time < piece->content->position() || time >= piece->content->end()) {
+ return;
+ }
- DCPTime const time = content_video_to_dcp (piece, video.frame.index());
+ /* 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 */
- if (_last_video_time) {
- for (DCPTime i = _last_video_time.get(); i < time; i += DCPTime::from_frames (1, _film->video_frame_rate())) {
+ if (_last_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 (_last_video->clone (i));
+ Video (shared_ptr<PlayerVideo> (new PlayerVideo (*_last_video)), i);
} else {
- Video (black_player_video_frame (i));
+ 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 (
)
);
- _last_video_time = time;
+ if (subtitles) {
+ _last_video->set_subtitle (subtitles.get ());
+ }
+
+ _last_time = time;
+
+ Video (_last_video, *_last_time);
+
+ /* Discard any subtitles we no longer need */
- cout << "Video @ " << to_string(_last_video_time.get()) << "\n";
- Video (_last_video);
+ 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
shared_ptr<AudioContent> content = piece->content->audio;
DCPOMATIC_ASSERT (content);
- shared_ptr<AudioBuffers> audio = content_audio.audio;
-
/* Gain */
if (content->gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (audio));
+ shared_ptr<AudioBuffers> gain (new AudioBuffers (content_audio.audio));
gain->apply_gain (content->gain ());
- audio = 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 const time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000);
+ DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000);
/* Remap channels */
- shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames()));
+ shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames()));
dcp_mapped->make_silent ();
AudioMapping map = stream->mapping ();
for (int j = 0; j < dcp_mapped->channels(); ++j) {
if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
dcp_mapped->accumulate_channel (
- audio.get(),
+ content_audio.audio.get(),
i,
static_cast<dcp::Channel> (j),
map.get (i, static_cast<dcp::Channel> (j))
}
}
- audio = dcp_mapped;
+ content_audio.audio = dcp_mapped;
if (_audio_processor) {
- audio = _audio_processor->run (audio, _film->audio_channels ());
+ content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ());
+ }
+
+ /* XXX: this may be nonsense */
+ if (time < _audio_merger.last_pull()) {
+ DCPTime const discard_time = _audio_merger.last_pull() - time;
+ Frame discard_frames = discard_time.frames_round(_film->audio_frame_rate());
+ content_audio.audio.reset (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames() - discard_frames));
+ time += discard_time;
}
- _audio_merger.push (audio, time);
+ if (content_audio.audio->frames() > 0) {
+ _audio_merger.push (content_audio.audio, time);
+ }
}
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
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);
+ i->done = false;
}
}
if (accurate) {
- _last_video_time = time - DCPTime::from_frames (1, _film->video_frame_rate ());
+ _last_time = time - DCPTime::from_frames (1, _film->video_frame_rate ());
} else {
- _last_video_time = optional<DCPTime> ();
+ _last_time = optional<DCPTime> ();
}
}
+
+shared_ptr<Resampler>
+Player::resampler (shared_ptr<const AudioContent> content, AudioStreamPtr stream, bool create)
+{
+ ResamplerMap::const_iterator i = _resamplers.find (make_pair (content, stream));
+ if (i != _resamplers.end ()) {
+ return i->second;
+ }
+
+ if (!create) {
+ return shared_ptr<Resampler> ();
+ }
+
+ LOG_GENERAL (
+ "Creating new resampler from %1 to %2 with %3 channels",
+ stream->frame_rate(),
+ content->resampled_frame_rate(),
+ stream->channels()
+ );
+
+ shared_ptr<Resampler> r (
+ new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels())
+ );
+
+ _resamplers[make_pair(content, stream)] = r;
+ return r;
+}
projects / dcpomatic.git / blobdiff