Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 531a33c03491bb4c05991f97c4f6853c5c8f3a13..5060b9a7f6ba2634d116bb1d4c0bb79e214ba450 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -23,6 +23,7 @@
 #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>
@@ -34,22 +35,23 @@
 #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 ();
@@ -64,9 +66,9 @@ DCPDecoder::pass ()
        }
 
        double const vfr = _dcp_content->video_frame_rate ();
-       int64_t const frame = _next.frames (vfr);
+       int64_t const frame = _next.frames_round (vfr);
 
-       if ((*_reel)->main_picture ()) {
+       if ((*_reel)->main_picture () && !_dcp_content->reference_video ()) {
                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);
@@ -86,7 +88,7 @@ DCPDecoder::pass ()
                }
        }
 
-       if ((*_reel)->main_sound ()) {
+       if ((*_reel)->main_sound () && !_dcp_content->reference_audio ()) {
                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 ();
@@ -96,7 +98,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;
                        }
                }
@@ -104,7 +106,7 @@ DCPDecoder::pass ()
                audio (_dcp_content->audio_stream(), data, _next);
        }
 
-       if ((*_reel)->main_subtitle ()) {
+       if ((*_reel)->main_subtitle () && !_dcp_content->reference_subtitle ()) {
                int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
                list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during (
                        dcp::Time (entry_point + frame, vfr, vfr),
@@ -127,7 +129,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;
                }
        }