#include "video_decoder.h"
#include "audio_decoder.h"
#include "j2k_image_proxy.h"
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
#include "image.h"
#include "config.h"
#include <dcp/dcp.h>
#include <boost/foreach.hpp>
#include <iostream>
+#include "i18n.h"
+
using std::list;
using std::cout;
using boost::shared_ptr;
: DCP (c)
, _decode_referenced (false)
{
- video.reset (new VideoDecoder (this, c, log));
+ if (c->video) {
+ video.reset (new VideoDecoder (this, c, 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()));
+ subtitle.reset (new TextDecoder (this, c->subtitle, log, ContentTime()));
+ }
+
+ list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
+
+ if (cpl_list.empty()) {
+ throw DCPError (_("No CPLs found in DCP."));
}
shared_ptr<dcp::CPL> cpl;
- BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls ()) {
+ BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
cpl = i;
}
/* Frame within the (played part of the) reel that is coming up next */
int64_t const frame = _next.frames_round (vfr);
+ /* We must emit subtitles first as when we emit the video for this frame
+ it will expect already to have the subs.
+ */
+ pass_subtitles (_next);
+
if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
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 ((*_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 (
+ list<shared_ptr<dcp::Subtitle> > subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
dcp::Time (entry_point + frame, vfr, vfr),
dcp::Time (entry_point + frame + 1, vfr, vfr),
true
);
- BOOST_FOREACH (dcp::SubtitleString i, subs) {
- list<dcp::SubtitleString> s;
- s.push_back (i);
- subtitle->emit_text (
- ContentTimePeriod (
- ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.in().as_seconds ()),
- ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.out().as_seconds ())
- ),
- s
- );
+ BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
+ shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+ if (is) {
+ list<dcp::SubtitleString> s;
+ s.push_back (*is);
+ subtitle->emit_plain (
+ ContentTimePeriod (
+ ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->in().as_seconds ()),
+ ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->out().as_seconds ())
+ ),
+ s
+ );
+ }
+
+ /* XXX: image subtitles */
}
}
}
void
DCPDecoder::seek (ContentTime t, bool accurate)
{
+ if (!_dcp_content->can_be_played ()) {
+ return;
+ }
+
Decoder::seek (t, accurate);
_reel = _reels.begin ();
_offset = 0;
get_readers ();
- if (accurate) {
- int const pre_roll_seconds = 2;
+ int const pre_roll_seconds = 2;
- /* Pre-roll for subs */
+ /* Pre-roll for subs */
- ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
- if (pre < ContentTime()) {
- pre = ContentTime ();
- }
+ ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+ if (pre < ContentTime()) {
+ pre = ContentTime ();
+ }
- /* Seek to pre-roll position */
+ /* 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 ();
- }
+ while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+ ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+ pre -= rd;
+ t -= rd;
+ next_reel ();
+ }
- /* Pass subtitles in the pre-roll */
+ /* 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);
- }
+ 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 */
{
_decode_referenced = r;
- video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
- audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
+ if (video) {
+ video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
+ }
+ if (audio) {
+ audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
+ }
}
void