Set correct video frame type when importing DCPs (part of #806).

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 633e8e9d77a56409c89b7e41f3bfc172c8f12792..e3b0fb6eec2c6b09c1a64f1da76d765819a90963 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,20 +24,25 @@
 #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/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/mono_picture_asset.h>
+#include <dcp/mono_picture_asset_reader.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_asset.h>
+#include <iostream>
 
 #include "i18n.h"
 
 using std::list;
 using std::cout;
+using std::runtime_error;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
@@ -46,12 +52,13 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        , _has_subtitles (false)
        , _encrypted (false)
        , _kdm_valid (false)
+       , _three_d (false)
 {
        dcp::DCP dcp (content->directory ());
-       dcp.read ();
+       dcp.read (false, 0, true);
 
        if (content->kdm ()) {
-               dcp.add (dcp::DecryptedKDM (content->kdm().get(), Config::instance()->decryption_private_key ()));
+               dcp.add (dcp::DecryptedKDM (content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
        }
 
        if (dcp.cpls().size() == 0) {
@@ -96,7 +103,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        if (!_audio_frame_rate) {
                                _audio_frame_rate = asset->sampling_rate ();
                        } else if (_audio_frame_rate.get() != asset->sampling_rate ()) {
-                               throw DCPError (_("Mismatched audio frame rates in DCP"));
+                               throw DCPError (_("Mismatched audio sample rates in DCP"));
                        }
 
                        _audio_length += (*i)->main_sound()->duration();
@@ -118,9 +125,9 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
 
                        if (mono) {
-                               mono->get_frame(0)->xyz_image ();
+                               mono->start_read()->get_frame(0)->xyz_image ();
                        } else {
-                               stereo->get_frame(0)->xyz_image (dcp::EYE_LEFT);
+                               stereo->start_read()->get_frame(0)->xyz_image (dcp::EYE_LEFT);
                        }
 
                }
@@ -128,7 +135,11 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                _kdm_valid = false;
                if (_encrypted && content->kdm ()) {
                        /* XXX: maybe don't use an exception for this */
-                       throw StringError (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
+                       throw runtime_error (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
                }
        }
+
+       _standard = dcp.standard ();
+       _three_d = !reels.empty() && reels.front()->main_picture() &&
+               dynamic_pointer_cast<dcp::StereoPictureAsset> (reels.front()->main_picture()->asset());
 }