Allow config of the full KDM decryption chain.

[dcpomatic.git] / src / lib / dcp_decoder.cc

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 0c7e7589bc2d9772d185a3d1e906a82e4e1c0052..9cd327a525ff1f0cd56c457bea9a9c5df8ea5db1 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -49,7 +49,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> 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 ();
@@ -63,8 +63,8 @@ DCPDecoder::pass ()
                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 ();
@@ -96,7 +96,7 @@ DCPDecoder::pass ()
                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;
                        }
                }
@@ -127,7 +127,7 @@ DCPDecoder::pass ()
        _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;
                }
        }
@@ -164,7 +164,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
        /* 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 ()) {