#include "image.h"
#include "config.h"
#include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_frame.h>
#include <dcp/sound_frame.h>
#include <boost/foreach.hpp>
+#include <iostream>
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c)
- : VideoDecoder (c)
- , AudioDecoder (c)
- , SubtitleDecoder (c)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
+ : VideoDecoder (c->video, log)
+ , AudioDecoder (c, fast)
+ , SubtitleDecoder (c->subtitle)
, _dcp_content (c)
{
dcp::DCP dcp (c->directory ());
- dcp.read ();
+ dcp.read (false, 0, true);
if (c->kdm ()) {
- dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_private_key ()));
+ dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
}
DCPOMATIC_ASSERT (dcp.cpls().size() == 1);
_reels = dcp.cpls().front()->reels ();
}
bool
-DCPDecoder::pass ()
+DCPDecoder::pass (PassReason reason, bool)
{
if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
return true;
}
- float const vfr = _dcp_content->video_frame_rate ();
- int64_t const frame = _next.frames (vfr);
+ /* Offset of the start of the current reel from the start of the content in frames */
+ int offset = 0;
+ list<shared_ptr<dcp::Reel> >::const_iterator i = _reels.begin();
+ while (i != _reel) {
+ offset += (*i)->main_picture()->duration ();
+ ++i;
+ }
- if ((*_reel)->main_picture ()) {
+ double const vfr = _dcp_content->video->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_picture () && reason != PASS_REASON_SUBTITLE) {
shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
if (mono) {
- video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame);
+ video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), offset + frame);
} else {
video (
shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
- frame
+ offset + frame
);
video (
shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
- frame
+ offset + frame
);
}
}
- if ((*_reel)->main_sound ()) {
+ if ((*_reel)->main_sound () && reason != PASS_REASON_SUBTITLE) {
int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame);
uint8_t const * from = sf->data ();
shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
for (int i = 0; i < frames; ++i) {
for (int j = 0; j < channels; ++j) {
- data->data()[j][i] = float (from[0] | (from[1] << 8) | (from[2] << 16)) / (1 << 23);
+ data->data()[j][i] = static_cast<int> ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast<float> (INT_MAX - 256);
from += 3;
}
}
- audio (_dcp_content->audio_stream(), data, _next);
+ audio (_dcp_content->audio_stream(), data, ContentTime::from_frames (offset, vfr) + _next);
}
if ((*_reel)->main_subtitle ()) {
int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
- list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during (
+ list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
dcp::Time (entry_point + frame, vfr, vfr),
dcp::Time (entry_point + frame + 1, vfr, vfr),
true
/* XXX: assuming that all `subs' are at the same time; maybe this is ok */
text_subtitle (
ContentTimePeriod (
- ContentTime::from_seconds (subs.front().in().as_seconds ()),
- ContentTime::from_seconds (subs.front().out().as_seconds ())
+ ContentTime::from_frames (offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().in().as_seconds ()),
+ ContentTime::from_frames (offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().out().as_seconds ())
),
subs
);
_next += ContentTime::from_frames (1, vfr);
if ((*_reel)->main_picture ()) {
- if (_next.frames (vfr) >= (*_reel)->main_picture()->duration()) {
+ if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
++_reel;
+ _next = ContentTime ();
}
}
SubtitleDecoder::seek (t, accurate);
_reel = _reels.begin ();
- while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ())) {
- t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ());
+ while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ())) {
+ t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ());
++_reel;
}
/* XXX: inefficient */
list<ContentTimePeriod> ctp;
- float const vfr = _dcp_content->video_frame_rate ();
+ double const vfr = _dcp_content->video->video_frame_rate ();
BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
if (!r->main_subtitle ()) {
int64_t const entry_point = r->main_subtitle()->entry_point ();
- list<dcp::SubtitleString> subs = r->main_subtitle()->subtitle_asset()->subtitles_during (
- dcp::Time (period.from.seconds ()) - dcp::Time (entry_point, vfr, vfr),
- dcp::Time (period.to.seconds ()) - dcp::Time (entry_point, vfr, vfr),
+ list<dcp::SubtitleString> subs = r->main_subtitle()->asset()->subtitles_during (
+ dcp::Time (period.from.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr),
+ dcp::Time (period.to.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr),
starting
);
projects / dcpomatic.git / blobdiff