X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.cc;h=fe2660d48508834c38f9b6c678c5259d3d9162cd;hb=8ad854af828575e44db349eed7e9198932ec3d80;hp=1e4cc899df96df614fd6a9b1413d3101245247a4;hpb=b6c780d3107557d452c6612d715d01e2be52dbda;p=dcpomatic.git

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1e4cc899d..fe2660d48 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -17,21 +17,23 @@
 
 */
 
+#include "dcp_examiner.h"
+#include "dcp_content.h"
+#include "exceptions.h"
+#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_mxf.h>
+#include <dcp/mono_picture_asset.h>
 #include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_mxf.h>
+#include <dcp/stereo_picture_asset.h>
 #include <dcp/stereo_picture_frame.h>
-#include <dcp/sound_mxf.h>
-#include "dcp_examiner.h"
-#include "dcp_content.h"
-#include "exceptions.h"
-#include "image.h"
-#include "config.h"
+#include <dcp/sound_asset.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -51,7 +53,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 	dcp.read ();
 
 	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) {
@@ -74,32 +76,32 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 				throw DCPError (_("Mismatched frame rates in DCP"));
 			}
 
-			shared_ptr<dcp::PictureMXF> mxf = (*i)->main_picture()->mxf ();
+			shared_ptr<dcp::PictureAsset> asset = (*i)->main_picture()->asset ();
 			if (!_video_size) {
-				_video_size = mxf->size ();
-			} else if (_video_size.get() != mxf->size ()) {
+				_video_size = asset->size ();
+			} else if (_video_size.get() != asset->size ()) {
 				throw DCPError (_("Mismatched video sizes in DCP"));
 			}
 
-			_video_length += ContentTime::from_frames ((*i)->main_picture()->duration(), _video_frame_rate.get ());
+			_video_length += (*i)->main_picture()->duration();
 		}
-			
+
 		if ((*i)->main_sound ()) {
-			shared_ptr<dcp::SoundMXF> mxf = (*i)->main_sound()->mxf ();
+			shared_ptr<dcp::SoundAsset> asset = (*i)->main_sound()->asset ();
 
 			if (!_audio_channels) {
-				_audio_channels = mxf->channels ();
-			} else if (_audio_channels.get() != mxf->channels ()) {
+				_audio_channels = asset->channels ();
+			} else if (_audio_channels.get() != asset->channels ()) {
 				throw DCPError (_("Mismatched audio channel counts in DCP"));
 			}
 
 			if (!_audio_frame_rate) {
-				_audio_frame_rate = mxf->sampling_rate ();
-			} else if (_audio_frame_rate.get() != mxf->sampling_rate ()) {
+				_audio_frame_rate = asset->sampling_rate ();
+			} else if (_audio_frame_rate.get() != asset->sampling_rate ()) {
 				throw DCPError (_("Mismatched audio frame rates in DCP"));
 			}
 
-			_audio_length += ContentTime::from_frames ((*i)->main_sound()->duration(), _video_frame_rate.get ());
+			_audio_length += (*i)->main_sound()->duration();
 		}
 
 		if ((*i)->main_subtitle ()) {
@@ -109,28 +111,26 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 
 	_encrypted = dcp.encrypted ();
 	_kdm_valid = true;
-	
+
 	/* Check that we can read the first picture frame */
 	try {
 		if (!dcp.cpls().empty () && !dcp.cpls().front()->reels().empty ()) {
-			shared_ptr<dcp::PictureMXF> mxf = dcp.cpls().front()->reels().front()->main_picture()->mxf ();
-			shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (mxf);
-			shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
-			
-			shared_ptr<Image> image (new Image (PIX_FMT_RGB24, _video_size.get(), false));
-			
+			shared_ptr<dcp::PictureAsset> asset = dcp.cpls().front()->reels().front()->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);
+
 			if (mono) {
-				mono->get_frame(0)->rgb_frame (image->data()[0]);
+				mono->get_frame(0)->xyz_image ();
 			} else {
-				stereo->get_frame(0)->rgb_frame (dcp::EYE_LEFT, image->data()[0]);
+				stereo->get_frame(0)->xyz_image (dcp::EYE_LEFT);
 			}
-			
+
 		}
 	} catch (dcp::DCPReadError& e) {
 		_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 StringError (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
 		}
 	}
 }