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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1e4cc899d..e3b0fb6ee 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,42 +1,48 @@
 /*
     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/>.
 
 */
 
+#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_asset_reader.h>
 #include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_mxf.h>
+#include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_asset_reader.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"
 
 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) {
@@ -74,32 +81,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 ()) {
-				throw DCPError (_("Mismatched audio frame rates in DCP"));
+				_audio_frame_rate = asset->sampling_rate ();
+			} else if (_audio_frame_rate.get() != asset->sampling_rate ()) {
+				throw DCPError (_("Mismatched audio sample 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 +116,30 @@ 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->start_read()->get_frame(0)->xyz_image ();
 			} else {
-				stereo->get_frame(0)->rgb_frame (dcp::EYE_LEFT, image->data()[0]);
+				stereo->start_read()->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 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());
 }