X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_frame.cc;h=e645c7df613412ee1973727409fa4dba396866bc;hb=9bcc4e7b7099b07677d77fe9ea52330fc93c7aa7;hp=855795eb8efb9cf68bffed03c5b54f48616dbb68;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 855795eb..e645c7df 100644
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "stereo_picture_frame.h"
@@ -22,34 +36,27 @@
 #include "util.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
-#include "AS_DCP.h"
-#include "KM_fileio.h"
 #include "compose.hpp"
-#include <openjpeg.h>
-
-#define DCI_GAMMA 2.6
+#include "j2k.h"
+#include "decryption_context.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 using std::string;
 using boost::shared_ptr;
 using namespace dcp;
 
 /** Make a picture frame from a 3D (stereoscopic) asset.
- *  @param mxf_path Path to the asset's MXF file.
+ *  @param reader Reader for the MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
  */
-StereoPictureFrame::StereoPictureFrame (boost::filesystem::path path, int n)
+StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr<DecryptionContext> c)
 {
-	ASDCP::JP2K::MXFSReader reader;
-	Kumu::Result_t r = reader.OpenRead (path.string().c_str());
-	if (ASDCP_FAILURE (r)) {
-		boost::throw_exception (FileError ("could not open MXF file for reading", path, r));
-	}
-
 	/* XXX: unfortunate guesswork on this buffer size */
 	_buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte);
 
-	if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer))) {
-		boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n, path.string())));
+	if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c->decryption()))) {
+		boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n)));
 	}
 }
 
@@ -68,7 +75,7 @@ StereoPictureFrame::~StereoPictureFrame ()
  *  of the image, expressed as a power of two (pass 0 for no
  *  reduction).
  */
-shared_ptr<XYZImage>
+shared_ptr<OpenJPEGImage>
 StereoPictureFrame::xyz_image (Eye eye, int reduce) const
 {
 	switch (eye) {
@@ -77,8 +84,8 @@ StereoPictureFrame::xyz_image (Eye eye, int reduce) const
 	case RIGHT:
 		return decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
 	}
-	
-	return shared_ptr<XYZImage> ();
+
+	return shared_ptr<OpenJPEGImage> ();
 }
 
 uint8_t const *