#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)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
: VideoDecoder (c)
- , AudioDecoder (c)
+ , AudioDecoder (c, fast)
, SubtitleDecoder (c)
, _dcp_content (c)
{
dcp::DCP dcp (c->directory ());
dcp.read ();
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 ();
return true;
}
- float const vfr = _dcp_content->video_frame_rate ();
- int64_t const frame = _next.frames (vfr);
+ double const vfr = _dcp_content->video_frame_rate ();
+ int64_t const frame = _next.frames_round (vfr);
if ((*_reel)->main_picture ()) {
shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
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;
}
}
_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;
}
}
/* XXX: inefficient */
list<ContentTimePeriod> ctp;
- float const vfr = _dcp_content->video_frame_rate ();
+ double const vfr = _dcp_content->video_frame_rate ();
BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
if (!r->main_subtitle ()) {