X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_frame.cc;h=d9a89fe12ddad8c77d9f2b6c5901999cf98c11d2;hb=5665c52ad16aaba050c34b8b391a3212e8cf85a8;hp=689a8b21f6c199b6ce6d7fb39cacd94c43161607;hpb=989f182558193a51e0a26603fb2ca59f827216a0;p=libdcp.git

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 689a8b21..d9a89fe1 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_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.
 */
 
 /** @file  src/mono_picture_frame.cc
@@ -26,11 +40,11 @@
 #include "util.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
-#include "KM_fileio.h"
-#include "AS_DCP.h"
-#include <openjpeg.h>
-
-#define DCI_GAMMA 2.6
+#include "compose.hpp"
+#include "j2k.h"
+#include "crypto_context.h"
+#include <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
 
 using std::string;
 using boost::shared_ptr;
@@ -44,41 +58,43 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 {
 	boost::uintmax_t const size = boost::filesystem::file_size (path);
 	_buffer = new ASDCP::JP2K::FrameBuffer (size);
-	FILE* f = fopen_boost (path, "r");
+	FILE* f = fopen_boost (path, "rb");
 	if (!f) {
 		boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
 	}
 
-	fread (j2k_data(), 1, size, f);
+	size_t n = fread (j2k_data(), 1, size, f);
+	if (n != size) {
+		boost::throw_exception (FileError ("could not read from JPEG2000 file", path, errno));
+	}
+
 	fclose (f);
 
 	_buffer->Size (size);
 }
 
 /** Make a picture frame from a 2D (monoscopic) asset.
- *  @param mxf_path Path to the asset's MXF file.
+ *  @param reader Reader for the asset's MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param c Context for decryption, or 0.
  */
-MonoPictureFrame::MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext* c)
+MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr<DecryptionContext> c)
 {
-	ASDCP::JP2K::MXFReader reader;
-	Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str());
-	if (ASDCP_FAILURE (r)) {
-		boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path, r));
-	}
-
 	/* XXX: unfortunate guesswork on this buffer size */
 	_buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
 
-	if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
-		boost::throw_exception (DCPReadError ("could not read video frame"));
+	ASDCP::Result_t const r = reader->ReadFrame (n, *_buffer, c->context(), c->hmac());
+
+	if (ASDCP_FAILURE (r)) {
+		boost::throw_exception (ReadError (String::compose ("could not read video frame %1 (%2)", n, static_cast<int>(r))));
 	}
 }
 
-MonoPictureFrame::MonoPictureFrame ()
+MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size)
 {
-	_buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
+	_buffer = new ASDCP::JP2K::FrameBuffer (size);
+	_buffer->Size (size);
+	memcpy (_buffer->Data(), data, size);
 }
 
 /** MonoPictureFrame destructor */
@@ -112,7 +128,7 @@ MonoPictureFrame::j2k_size () const
  *  of the image, expressed as a power of two (pass 0 for no
  *  reduction).
  */
-shared_ptr<XYZImage>
+shared_ptr<OpenJPEGImage>
 MonoPictureFrame::xyz_image (int reduce) const
 {
 	return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);