X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=338be329b429a5c65400396bccd0523affb45dad;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=ef3ff1f46598b4f53ae194575603e480f73dc84a;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index ef3ff1f4..338be329 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -1,33 +1,47 @@
 /*
     Copyright (C) 2012-2015 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 "picture_asset.h"
 #include "util.h"
 #include "exceptions.h"
-#include "xyz_image.h"
+#include "openjpeg_image.h"
 #include "picture_asset_writer.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
 #include "AS_DCP.h"
 #include "KM_fileio.h"
+#include "j2k.h"
 #include <libxml++/nodes/element.h>
-#include <openjpeg.h>
 #include <boost/filesystem.hpp>
 #include <list>
 #include <stdexcept>
@@ -96,7 +110,7 @@ PictureAsset::descriptor_equals (
 //		a.CodingStyleDefault != b.CodingStyleDefault ||
 //		a.QuantizationDefault != b.QuantizationDefault
 		) {
-		
+
 		note (DCP_ERROR, "video MXF picture descriptors differ");
 		return false;
 	}
@@ -104,7 +118,7 @@ PictureAsset::descriptor_equals (
 	if (a.ContainerDuration != b.ContainerDuration) {
 		note (DCP_ERROR, "video container durations differ");
 	}
-	
+
 //		for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) {
 //			if (a.ImageComponents[j] != b.ImageComponents[j]) {
 //				notes.pack_start ("video MXF picture descriptors differ");
@@ -125,24 +139,24 @@ PictureAsset::frame_buffer_equals (
 		/* Easy result; the J2K data is identical */
 		return true;
 	}
-		
+
 	/* Decompress the images to bitmaps */
-	shared_ptr<XYZImage> image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
-	shared_ptr<XYZImage> image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
-	
+	shared_ptr<OpenJPEGImage> image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
+	shared_ptr<OpenJPEGImage> image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
+
 	/* Compare them */
-	
+
 	vector<int> abs_diffs (image_A->size().width * image_A->size().height * 3);
 	int d = 0;
 	int max_diff = 0;
-	
+
 	for (int c = 0; c < 3; ++c) {
-		
+
 		if (image_A->size() != image_B->size()) {
 			note (DCP_ERROR, String::compose ("image sizes for frame %1 differ", frame));
 			return false;
 		}
-		
+
 		int const pixels = image_A->size().width * image_A->size().height;
 		for (int j = 0; j < pixels; ++j) {
 			int const t = abs (image_A->data(c)[j] - image_B->data(c)[j]);
@@ -150,29 +164,29 @@ PictureAsset::frame_buffer_equals (
 			max_diff = max (max_diff, t);
 		}
 	}
-		
+
 	uint64_t total = 0;
 	for (vector<int>::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) {
 		total += *j;
 	}
-	
+
 	double const mean = double (total) / abs_diffs.size ();
-	
+
 	uint64_t total_squared_deviation = 0;
 	for (vector<int>::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) {
 		total_squared_deviation += pow (*j - mean, 2);
 	}
-	
+
 	double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
-	
-	note (DCP_NOTE, String::compose ("mean difference %1, deviation %2", mean, std_dev));
-	
+
+	note (DCP_NOTE, String::compose ("mean difference %1 deviation %2", mean, std_dev));
+
 	if (mean > opt.max_mean_pixel_error) {
 		note (
 			DCP_ERROR,
 			String::compose ("mean %1 out of range %2 in frame %3", mean, opt.max_mean_pixel_error, frame)
 			);
-		
+
 		return false;
 	}
 
@@ -181,7 +195,7 @@ PictureAsset::frame_buffer_equals (
 			DCP_ERROR,
 			String::compose ("standard deviation %1 out of range %2 in frame %3", std_dev, opt.max_std_dev_pixel_error, frame)
 			);
-		
+
 		return false;
 	}