#include "dcp_subtitle_decoder.h"
#include "audio_processor.h"
#include "playlist.h"
+#include "referenced_reel_asset.h"
#include <dcp/reel.h>
#include <dcp/reel_sound_asset.h>
#include <dcp/reel_subtitle_asset.h>
#include "i18n.h"
-#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
using std::list;
using std::cout;
shared_ptr<Decoder> decoder;
optional<FrameRateChange> frc;
- /* 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;
- 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());
- if (overlap > best_overlap_t) {
- best_overlap = vc;
- best_overlap_t = overlap;
- }
- }
-
- optional<FrameRateChange> best_overlap_frc;
- if (best_overlap) {
- best_overlap_frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ());
- } else {
- /* No video overlap; e.g. if the DCP is just audio */
- best_overlap_frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
- }
-
/* FFmpeg */
shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (i);
if (fc) {
shared_ptr<const SndfileContent> sc = dynamic_pointer_cast<const SndfileContent> (i);
if (sc) {
decoder.reset (new SndfileDecoder (sc, _fast));
- frc = best_overlap_frc;
+
+ /* Work out a FrameRateChange for the best overlap video for this content */
+ DCPTime best_overlap_t;
+ shared_ptr<VideoContent> best_overlap;
+ BOOST_FOREACH (shared_ptr<Content> j, _playlist->content ()) {
+ shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
+ if (!vc) {
+ continue;
+ }
+
+ DCPTime const overlap = min (vc->end(), i->end()) - max (vc->position(), i->position());
+ if (overlap > best_overlap_t) {
+ best_overlap = vc;
+ best_overlap_t = overlap;
+ }
+ }
+
+ if (best_overlap) {
+ frc = FrameRateChange (best_overlap->video_frame_rate(), _film->video_frame_rate ());
+ } else {
+ /* No video overlap; e.g. if the DCP is just audio */
+ frc = FrameRateChange (_film->video_frame_rate(), _film->video_frame_rate ());
+ }
}
+ /* It's questionable whether subtitle content should have a video frame rate; perhaps
+ it should be assumed that any subtitle content has been prepared at the same rate
+ as simultaneous video content (like we do with audio).
+ */
+
/* SubRipContent */
shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (i);
if (rc) {
decoder.reset (new SubRipDecoder (rc));
- frc = best_overlap_frc;
+ frc = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate());
}
/* DCPSubtitleContent */
shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (i);
if (dsc) {
decoder.reset (new DCPSubtitleDecoder (dsc));
- frc = best_overlap_frc;
+ frc = FrameRateChange (dsc->subtitle_video_frame_rate(), _film->video_frame_rate());
}
shared_ptr<VideoDecoder> vd = dynamic_pointer_cast<VideoDecoder> (decoder);
return max (ContentTime (), ContentTime (s, piece->frc) + piece->content->trim_start());
}
+DCPTime
+Player::content_subtitle_to_dcp (shared_ptr<const Piece> piece, ContentTime t) const
+{
+ return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position());
+}
+
/** @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.
list<ContentTextSubtitle> text = subtitle_decoder->get_text_subtitles (ContentTimePeriod (from, to), starting);
BOOST_FOREACH (ContentTextSubtitle& ts, text) {
- BOOST_FOREACH (dcp::SubtitleString& s, ts.subs) {
+ 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 ());
float const xs = subtitle_content->subtitle_x_scale();
if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) {
s.set_aspect_adjust (xs / ys);
}
+ s.set_in (dcp::Time(content_subtitle_to_dcp (*j, ts.period().from).seconds()));
+ s.set_out (dcp::Time(content_subtitle_to_dcp (*j, ts.period().to).seconds()));
ps.text.push_back (s);
ps.add_fonts (subtitle_content->fonts ());
}
_have_valid_pieces = false;
}
-list<shared_ptr<dcp::ReelAsset> >
+list<ReferencedReelAsset>
Player::get_reel_assets ()
{
- list<shared_ptr<dcp::ReelAsset> > a;
+ list<ReferencedReelAsset> a;
BOOST_FOREACH (shared_ptr<Content> i, _playlist->content ()) {
shared_ptr<DCPContent> j = dynamic_pointer_cast<DCPContent> (i);
if (!j) {
continue;
}
- /* XXX: hack hack hack */
DCPDecoder decoder (j, false);
- if (j->reference_video ()) {
- a.push_back (decoder.reels().front()->main_picture ());
- }
- if (j->reference_audio ()) {
- a.push_back (decoder.reels().front()->main_sound ());
- }
- if (j->reference_subtitle ()) {
- a.push_back (decoder.reels().front()->main_subtitle ());
+ int64_t offset = 0;
+ BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder.reels()) {
+ DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate());
+ if (j->reference_video ()) {
+ a.push_back (
+ ReferencedReelAsset (
+ k->main_picture (),
+ DCPTimePeriod (from, from + DCPTime::from_frames (k->main_picture()->duration(), _film->video_frame_rate()))
+ )
+ );
+ }
+
+ if (j->reference_audio ()) {
+ a.push_back (
+ ReferencedReelAsset (
+ k->main_sound (),
+ DCPTimePeriod (from, from + DCPTime::from_frames (k->main_sound()->duration(), _film->video_frame_rate()))
+ )
+ );
+ }
+
+ if (j->reference_subtitle ()) {
+ a.push_back (
+ ReferencedReelAsset (
+ k->main_subtitle (),
+ DCPTimePeriod (from, from + DCPTime::from_frames (k->main_subtitle()->duration(), _film->video_frame_rate()))
+ )
+ );
+ }
+
+ /* Assume that main picture duration is the length of the reel */
+ offset += k->main_picture()->duration ();
}
}