#include "subrip_decoder.h"
#include "subrip_content.h"
#include "dcp_content.h"
-#include "playlist.h"
#include "job.h"
#include "image.h"
#include "raw_image_proxy.h"
#include "dcp_decoder.h"
#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
+#include "audio_processor.h"
#include <boost/foreach.hpp>
#include <stdint.h>
#include <algorithm>
using std::pair;
using std::map;
using std::make_pair;
+using std::copy;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
-Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
- : _film (f)
- , _playlist (p)
+Player::Player (shared_ptr<const Film> film)
+ : _film (film)
, _have_valid_pieces (false)
, _ignore_video (false)
+ , _burn_subtitles (film->burn_subtitles ())
{
- _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this));
- _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
+ _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));
set_video_container_size (_film->frame_size ());
+
+ film_changed (Film::AUDIO_PROCESSOR);
}
void
list<shared_ptr<Piece> > old_pieces = _pieces;
_pieces.clear ();
- ContentList content = _playlist->content ();
+ ContentList content = _film->content ();
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
if (!(*i)->paths_valid ()) {
continue;
}
-
+
shared_ptr<Decoder> decoder;
optional<FrameRateChange> frc;
if (!vc) {
continue;
}
-
+
DCPTime const overlap = max (vc->position(), (*i)->position()) - min (vc->end(), (*i)->end());
if (overlap > best_overlap_t) {
best_overlap = vc;
property == VideoContentProperty::VIDEO_FRAME_TYPE ||
property == DCPContentProperty::CAN_BE_PLAYED
) {
-
+
_have_valid_pieces = false;
Changed (frequent);
property == VideoContentProperty::VIDEO_FADE_IN ||
property == VideoContentProperty::VIDEO_FADE_OUT
) {
-
+
Changed (frequent);
}
}
-void
-Player::playlist_changed ()
-{
- _have_valid_pieces = false;
- Changed (false);
-}
-
void
Player::set_video_container_size (dcp::Size s)
{
last time we were run.
*/
- if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
+ if (p == Film::CONTENT) {
+ _have_valid_pieces = false;
Changed (false);
+ } else if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
+ Changed (false);
+ } else if (p == Film::AUDIO_PROCESSOR) {
+ if (_film->audio_processor ()) {
+ _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ());
+ }
}
}
Player::transform_image_subtitles (list<ImageSubtitle> subs) const
{
list<PositionImage> all;
-
+
for (list<ImageSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
if (!i->image) {
continue;
/* We will scale the subtitle up to fit _video_container_size */
dcp::Size scaled_size (i->rectangle.width * _video_container_size.width, i->rectangle.height * _video_container_size.height);
-
+
/* Then we need a corrective translation, consisting of two parts:
*
* 1. that which is the result of the scaling of the subtitle by _video_container_size; this will be
_video_container_size,
EYES_BOTH,
PART_WHOLE,
- Config::instance()->colour_conversions().front().conversion
+ PresetColourConversion::all().front().conversion
)
);
}
list<shared_ptr<Piece> > ov = overlaps<VideoContent> (
time,
- time + DCPTime::from_frames (1, _film->video_frame_rate ())
+ time + DCPTime::from_frames (1, _film->video_frame_rate ()) - DCPTime::delta()
);
list<shared_ptr<PlayerVideo> > pvf;
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) {
list<PositionImage> c = transform_image_subtitles (ps.image);
copy (c.begin(), c.end(), back_inserter (sub_images));
- /* Text subtitles (rendered to images) */
- sub_images.push_back (render_subtitles (ps.text, _video_container_size));
-
+ /* 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));
}
- }
-
+ }
+
return pvf;
}
setup_pieces ();
}
- AudioFrame const length_frames = length.frames (_film->audio_frame_rate ());
+ Frame const length_frames = length.frames (_film->audio_frame_rate ());
shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
audio->make_silent ();
-
+
list<shared_ptr<Piece> > ov = overlaps<AudioContent> (time, time + length);
if (ov.empty ()) {
return audio;
shared_ptr<AudioDecoder> decoder = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
DCPOMATIC_ASSERT (decoder);
- if (content->audio_frame_rate() == 0) {
- /* This AudioContent has no audio (e.g. if it is an FFmpegContent with no
- * audio stream).
- */
- continue;
- }
-
/* The time that we should request from the content */
DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0);
- AudioFrame request_frames = length_frames;
+ Frame request_frames = length_frames;
DCPTime offset;
if (request < DCPTime ()) {
/* We went off the start of the content, so we will need to offset
request = DCPTime ();
}
- AudioFrame const content_frame = dcp_to_content_audio (*i, request);
+ Frame const content_frame = dcp_to_content_audio (*i, request);
- /* Audio from this piece's decoder (which might be more or less than what we asked for) */
- shared_ptr<ContentAudio> all = decoder->get_audio (content_frame, request_frames, accurate);
+ BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) {
- /* Gain */
- if (content->audio_gain() != 0) {
- shared_ptr<AudioBuffers> gain (new AudioBuffers (all->audio));
- gain->apply_gain (content->audio_gain ());
- all->audio = gain;
- }
+ /* 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);
+
+ /* Gain */
+ if (content->audio_gain() != 0) {
+ shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
+ gain->apply_gain (content->audio_gain ());
+ all.audio = gain;
+ }
- /* Remap channels */
- shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all->audio->frames()));
- dcp_mapped->make_silent ();
- AudioMapping map = content->audio_mapping ();
- for (int i = 0; i < map.content_channels(); ++i) {
- for (int j = 0; j < _film->audio_channels(); ++j) {
- if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
- dcp_mapped->accumulate_channel (
- all->audio.get(),
- i,
- j,
- map.get (i, static_cast<dcp::Channel> (j))
- );
+ /* Remap channels */
+ shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames()));
+ dcp_mapped->make_silent ();
+ AudioMapping map = j->mapping ();
+ for (int i = 0; i < map.input_channels(); ++i) {
+ for (int j = 0; j < _film->audio_channels(); ++j) {
+ if (map.get (i, j) > 0) {
+ dcp_mapped->accumulate_channel (
+ all.audio.get(),
+ i,
+ j,
+ map.get (i, j)
+ );
+ }
}
}
+
+ if (_audio_processor) {
+ dcp_mapped = _audio_processor->run (dcp_mapped);
+ }
+
+ all.audio = dcp_mapped;
+
+ audio->accumulate_frames (
+ all.audio.get(),
+ content_frame - all.frame,
+ offset.frames (_film->audio_frame_rate()),
+ min (Frame (all.audio->frames()), request_frames)
+ );
}
-
- all->audio = dcp_mapped;
-
- audio->accumulate_frames (
- all->audio.get(),
- content_frame - all->frame,
- offset.frames (_film->audio_frame_rate()),
- min (AudioFrame (all->audio->frames()), request_frames)
- );
}
return audio;
}
-VideoFrame
+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 */
}
DCPTime
-Player::content_video_to_dcp (shared_ptr<const Piece> piece, VideoFrame f) const
+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 ()) {
return t;
}
-AudioFrame
+Frame
Player::dcp_to_content_audio (shared_ptr<const Piece> piece, DCPTime t) const
{
/* s is the offset of t from the start position of this content */
list<ContentImageSubtitle> image = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to), starting);
for (list<ContentImageSubtitle>::iterator i = image.begin(); i != image.end(); ++i) {
-
+
/* Apply content's subtitle offsets */
i->sub.rectangle.x += subtitle_content->subtitle_x_offset ();
i->sub.rectangle.y += subtitle_content->subtitle_y_offset ();
/* Apply a corrective translation to keep the subtitle centred after that scale */
i->sub.rectangle.x -= i->sub.rectangle.width * (subtitle_content->subtitle_x_scale() - 1);
i->sub.rectangle.y -= i->sub.rectangle.height * (subtitle_content->subtitle_y_scale() - 1);
-
+
ps.image.push_back (i->sub);
}
list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting);
BOOST_FOREACH (ContentTextSubtitle& ts, text) {
BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) {
+ s.set_h_position (s.h_position() + subtitle_content->subtitle_x_offset ());
s.set_v_position (s.v_position() + subtitle_content->subtitle_y_offset ());
- s.set_size (s.size() * max (subtitle_content->subtitle_x_scale(), subtitle_content->subtitle_y_scale()));
+ float const xs = subtitle_content->subtitle_x_scale();
+ float const ys = subtitle_content->subtitle_y_scale();
+ float const average = s.size() * (xs + ys) / 2;
+ s.set_size (average);
+ if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
+ s.set_aspect_adjust (xs / ys);
+ }
ps.text.push_back (s);
}
}
{
_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.
+ */
+void
+Player::set_burn_subtitles (bool burn)
+{
+ _burn_subtitles = burn;
+}
projects / dcpomatic.git / blobdiff