#include "subtitle_content.h"
#include "subrip_decoder.h"
#include "subrip_content.h"
+#include "dcp_content.h"
#include "playlist.h"
#include "job.h"
#include "image.h"
-#include "image_proxy.h"
+#include "raw_image_proxy.h"
#include "ratio.h"
#include "log.h"
#include "scaler.h"
#include "render_subtitles.h"
#include "config.h"
#include "content_video.h"
-#include "player_video_frame.h"
+#include "player_video.h"
#include "frame_rate_change.h"
+#include "dcp_content.h"
+#include "dcp_decoder.h"
+#include "dcp_subtitle_content.h"
+#include "dcp_subtitle_decoder.h"
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate());
}
+ shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (*i);
+ if (dc) {
+ decoder.reset (new DCPDecoder (dc, _film->log ()));
+ frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate());
+ }
+
/* ImageContent */
shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (*i);
if (ic) {
frc = best_overlap_frc;
}
+ /* DCPSubtitleContent */
+ shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (*i);
+ if (dsc) {
+ decoder.reset (new DCPSubtitleDecoder (dsc));
+ frc = best_overlap_frc;
+ }
+
_pieces.push_back (shared_ptr<Piece> (new Piece (*i, decoder, frc.get ())));
}
property == ContentProperty::TRIM_START ||
property == ContentProperty::TRIM_END ||
property == ContentProperty::PATH ||
- property == VideoContentProperty::VIDEO_FRAME_TYPE
+ property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+ property == DCPContentProperty::CAN_BE_PLAYED
) {
_have_valid_pieces = false;
Changed (frequent);
} else if (
- property == SubtitleContentProperty::SUBTITLE_USE ||
+ property == SubtitleContentProperty::USE_SUBTITLES ||
property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
- property == SubtitleContentProperty::SUBTITLE_SCALE ||
+ property == SubtitleContentProperty::SUBTITLE_X_SCALE ||
+ property == SubtitleContentProperty::SUBTITLE_Y_SCALE ||
property == VideoContentProperty::VIDEO_CROP ||
property == VideoContentProperty::VIDEO_SCALE ||
property == VideoContentProperty::VIDEO_FRAME_RATE
}
list<PositionImage>
-Player::process_content_image_subtitles (shared_ptr<SubtitleContent> content, list<shared_ptr<ContentImageSubtitle> > subs) const
+Player::transform_image_subtitles (list<ImageSubtitle> subs) const
{
list<PositionImage> all;
- for (list<shared_ptr<ContentImageSubtitle> >::const_iterator i = subs.begin(); i != subs.end(); ++i) {
- if (!(*i)->image) {
+ for (list<ImageSubtitle>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
+ if (!i->image) {
continue;
}
- dcpomatic::Rect<double> in_rect = (*i)->rectangle;
- dcp::Size scaled_size;
-
- in_rect.x += content->subtitle_x_offset ();
- in_rect.y += content->subtitle_y_offset ();
-
- /* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */
- scaled_size.width = in_rect.width * _video_container_size.width * content->subtitle_scale ();
- scaled_size.height = in_rect.height * _video_container_size.height * content->subtitle_scale ();
+ /* 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:
*
* rect.x * _video_container_size.width and rect.y * _video_container_size.height.
*
* 2. that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
- * (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and
- * (height_before_subtitle_scale * (1 - subtitle_scale) / 2).
+ * (width_before_subtitle_scale * (1 - subtitle_x_scale) / 2) and
+ * (height_before_subtitle_scale * (1 - subtitle_y_scale) / 2).
*
* Combining these two translations gives these expressions.
*/
all.push_back (
PositionImage (
- (*i)->image->scale (
+ i->image->scale (
scaled_size,
Scaler::from_id ("bicubic"),
- (*i)->image->pixel_format (),
+ i->image->pixel_format (),
true
),
Position<int> (
- rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - content->subtitle_scale ()) / 2))),
- rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - content->subtitle_scale ()) / 2)))
+ rint (_video_container_size.width * i->rectangle.x),
+ rint (_video_container_size.height * i->rectangle.y)
)
)
);
return all;
}
-list<PositionImage>
-Player::process_content_text_subtitles (list<shared_ptr<ContentTextSubtitle> > sub) const
-{
- list<PositionImage> all;
- for (list<shared_ptr<ContentTextSubtitle> >::const_iterator i = sub.begin(); i != sub.end(); ++i) {
- if (!(*i)->subs.empty ()) {
- all.push_back (render_subtitles ((*i)->subs, _video_container_size));
- }
- }
-
- return all;
-}
-
void
Player::set_approximate_size ()
{
_approximate_size = true;
}
-shared_ptr<PlayerVideoFrame>
-Player::black_player_video_frame () const
+shared_ptr<PlayerVideo>
+Player::black_player_video_frame (DCPTime time) const
{
- return shared_ptr<PlayerVideoFrame> (
- new PlayerVideoFrame (
+ return shared_ptr<PlayerVideo> (
+ new PlayerVideo (
shared_ptr<const ImageProxy> (new RawImageProxy (_black_image, _film->log ())),
+ time,
Crop (),
_video_container_size,
_video_container_size,
);
}
-/** @return All PlayerVideoFrames at the given time (there may be two frames for 3D) */
-list<shared_ptr<PlayerVideoFrame> >
+/** @return All PlayerVideos at the given time (there may be two frames for 3D) */
+list<shared_ptr<PlayerVideo> >
Player::get_video (DCPTime time, bool accurate)
{
if (!_have_valid_pieces) {
time + DCPTime::from_frames (1, _film->video_frame_rate ())
);
- list<shared_ptr<PlayerVideoFrame> > pvf;
+ list<shared_ptr<PlayerVideo> > pvf;
if (ov.empty ()) {
/* No video content at this time */
- pvf.push_back (black_player_video_frame ());
+ pvf.push_back (black_player_video_frame (time));
} else {
- /* Create a PlayerVideoFrame from the content's video at this time */
+ /* 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);
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 ());
+ pvf.push_back (black_player_video_frame (time));
return pvf;
}
- dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
+ dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
if (_approximate_size) {
image_size.width &= ~3;
image_size.height &= ~3;
for (list<ContentVideo>::const_iterator i = content_video.begin(); i != content_video.end(); ++i) {
pvf.push_back (
- shared_ptr<PlayerVideoFrame> (
- new PlayerVideoFrame (
+ shared_ptr<PlayerVideo> (
+ new PlayerVideo (
i->image,
+ content_video_to_dcp (piece, i->frame),
content->crop (),
image_size,
_video_container_size,
}
}
- /* Add subtitles to whatever PlayerVideoFrames we got */
-
- list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (
- time,
- time + DCPTime::from_frames (1, _film->video_frame_rate ())
- );
+ /* 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;
-
- 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->subtitle_use ()) {
- continue;
- }
- shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
- ContentTime const from = dcp_to_content_subtitle (*j, time);
- /* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
- ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ());
+ /* Image subtitles */
+ list<PositionImage> c = transform_image_subtitles (ps.image);
+ copy (c.begin(), c.end(), back_inserter (sub_images));
- list<shared_ptr<ContentImageSubtitle> > image_subtitles = subtitle_decoder->get_image_subtitles (ContentTimePeriod (from, to));
- if (!image_subtitles.empty ()) {
- list<PositionImage> im = process_content_image_subtitles (
- subtitle_content,
- image_subtitles
- );
-
- copy (im.begin(), im.end(), back_inserter (sub_images));
- }
-
- list<shared_ptr<ContentTextSubtitle> > text_subtitles = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to));
- if (!text_subtitles.empty ()) {
- list<PositionImage> im = process_content_text_subtitles (text_subtitles);
- copy (im.begin(), im.end(), back_inserter (sub_images));
- }
- }
+ /* Text subtitles (rendered to images) */
+ sub_images.push_back (render_subtitles (ps.text, _video_container_size));
if (!sub_images.empty ()) {
- for (list<shared_ptr<PlayerVideoFrame> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
+ for (list<shared_ptr<PlayerVideo> >::const_iterator i = pvf.begin(); i != pvf.end(); ++i) {
(*i)->set_subtitle (merge (sub_images));
}
}
return DCPTime (s + piece->content->trim_start()).frames (_film->video_frame_rate()) * piece->frc.factor ();
}
+DCPTime
+Player::content_video_to_dcp (shared_ptr<const Piece> piece, VideoFrame 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;
+}
+
AudioFrame
Player::dcp_to_content_audio (shared_ptr<const Piece> piece, DCPTime t) const
{
{
return _statistics;
}
+
+PlayerSubtitles
+Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
+{
+ list<shared_ptr<Piece> > subs = overlaps<SubtitleContent> (time, time + length);
+
+ PlayerSubtitles ps (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 ()) {
+ continue;
+ }
+
+ shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
+ ContentTime const from = dcp_to_content_subtitle (*j, time);
+ /* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
+ ContentTime const to = from + ContentTime::from_frames (1, _film->video_frame_rate ());
+
+ 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 content's subtitle scale */
+ i->sub.rectangle.width *= subtitle_content->subtitle_x_scale ();
+ i->sub.rectangle.height *= subtitle_content->subtitle_y_scale ();
+
+ /* 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);
+ for (list<ContentTextSubtitle>::const_iterator i = text.begin(); i != text.end(); ++i) {
+ copy (i->subs.begin(), i->subs.end(), back_inserter (ps.text));
+ }
+ }
+
+ return ps;
+}
projects / dcpomatic.git / blobdiff