using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
: DCP (c)
, _decode_referenced (false)
{
video.reset (new VideoDecoder (this, c, log));
- audio.reset (new AudioDecoder (this, c->audio, log));
-
- subtitle.reset (new SubtitleDecoder (this, c->subtitle, log));
+ if (c->audio) {
+ audio.reset (new AudioDecoder (this, c->audio, log, fast));
+ }
+ if (c->subtitle) {
+ /* XXX: this time here should be the time of the first subtitle, not 0 */
+ subtitle.reset (new SubtitleDecoder (this, c->subtitle, log, ContentTime()));
+ }
shared_ptr<dcp::CPL> cpl;
BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls ()) {
if (_mono_reader) {
video->emit (
shared_ptr<ImageProxy> (
- new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size(), AV_PIX_FMT_XYZ12LE)
+ new J2KImageProxy (
+ _mono_reader->get_frame (entry_point + frame),
+ asset->size(),
+ AV_PIX_FMT_XYZ12LE,
+ _forced_reduction
+ )
),
_offset + frame
);
} else {
video->emit (
shared_ptr<ImageProxy> (
- new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)),
+ new J2KImageProxy (
+ _stereo_reader->get_frame (entry_point + frame),
+ asset->size(),
+ dcp::EYE_LEFT,
+ AV_PIX_FMT_XYZ12LE,
+ _forced_reduction
+ )
+ ),
_offset + frame
);
video->emit (
shared_ptr<ImageProxy> (
- new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)),
+ new J2KImageProxy (
+ _stereo_reader->get_frame (entry_point + frame),
+ asset->size(),
+ dcp::EYE_RIGHT,
+ AV_PIX_FMT_XYZ12LE,
+ _forced_reduction
+ )
+ ),
_offset + frame
);
}
audio->emit (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
}
+ pass_subtitles (_next);
+
+ _next += ContentTime::from_frames (1, vfr);
+
+ if ((*_reel)->main_picture ()) {
+ if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
+ next_reel ();
+ _next = ContentTime ();
+ }
+ }
+
+ return false;
+}
+
+void
+DCPDecoder::pass_subtitles (ContentTime next)
+{
+ double const vfr = _dcp_content->active_video_frame_rate ();
+ /* Frame within the (played part of the) reel that is coming up next */
+ int64_t const frame = next.frames_round (vfr);
+
if ((*_reel)->main_subtitle() && (_decode_referenced || !_dcp_content->reference_subtitle())) {
int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
);
}
}
-
- _next += ContentTime::from_frames (1, vfr);
-
- if ((*_reel)->main_picture ()) {
- if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
- next_reel ();
- _next = ContentTime ();
- }
- }
-
- return false;
}
void
_offset = 0;
get_readers ();
+ if (accurate) {
+ int const pre_roll_seconds = 2;
+
+ /* Pre-roll for subs */
+
+ ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+ if (pre < ContentTime()) {
+ pre = ContentTime ();
+ }
+
+ /* Seek to pre-roll position */
+
+ while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+ pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+ next_reel ();
+ }
+
+ /* Pass subtitles in the pre-roll */
+
+ double const vfr = _dcp_content->active_video_frame_rate ();
+ for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
+ pass_subtitles (pre);
+ pre += ContentTime::from_frames (1, vfr);
+ }
+ }
+
+ /* Seek to correct position */
+
while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
next_reel ();
{
_decode_referenced = true;
}
+
+void
+DCPDecoder::set_forced_reduction (optional<int> reduction)
+{
+ _forced_reduction = reduction;
+}