X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_mxf.cc;h=46aa7752847aa539aaeb790194ccfcf7b293a311;hb=391860586976a6b6309caa56cc1191e1ca9efd06;hp=4a8e477b33e1e59234adb2e4ea083e78ae7e4709;hpb=ac265d3d008328b9bdaf00c39ebcd86f263605c7;p=libdcp.git

diff --git a/src/picture_mxf.cc b/src/picture_mxf.cc
index 4a8e477b..46aa7752 100644
--- a/src/picture_mxf.cc
+++ b/src/picture_mxf.cc
@@ -20,7 +20,7 @@
 #include "picture_mxf.h"
 #include "util.h"
 #include "exceptions.h"
-#include "xyz_frame.h"
+#include "xyz_image.h"
 #include "picture_mxf_writer.h"
 #include "compose.hpp"
 #include "AS_DCP.h"
@@ -71,7 +71,7 @@ PictureMXF::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & desc
 
 bool
 PictureMXF::descriptor_equals (
-	ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, string)> note
+	ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, NoteHandler note
 	) const
 {
 	if (
@@ -94,12 +94,12 @@ PictureMXF::descriptor_equals (
 //		a.QuantizationDefault != b.QuantizationDefault
 		) {
 		
-		note (ERROR, "video MXF picture descriptors differ");
+		note (DCP_ERROR, "video MXF picture descriptors differ");
 		return false;
 	}
 
 	if (a.ContainerDuration != b.ContainerDuration) {
-		note (ERROR, "video container durations differ");
+		note (DCP_ERROR, "video container durations differ");
 	}
 	
 //		for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) {
@@ -113,19 +113,19 @@ PictureMXF::descriptor_equals (
 
 bool
 PictureMXF::frame_buffer_equals (
-	int frame, EqualityOptions opt, boost::function<void (NoteType, string)> note,
+	int frame, EqualityOptions opt, NoteHandler note,
 	uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
 	) const
 {
 	if (size_A == size_B && memcmp (data_A, data_B, size_A) == 0) {
-		note (NOTE, "J2K identical");
+		note (DCP_NOTE, "J2K identical");
 		/* Easy result; the J2K data is identical */
 		return true;
 	}
 		
 	/* Decompress the images to bitmaps */
-	shared_ptr<XYZFrame> image_A = decompress_j2k (const_cast<uint8_t*> (data_A), size_A, 0);
-	shared_ptr<XYZFrame> image_B = decompress_j2k (const_cast<uint8_t*> (data_B), size_B, 0);
+	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);
 	
 	/* Compare them */
 	
@@ -136,7 +136,7 @@ PictureMXF::frame_buffer_equals (
 	for (int c = 0; c < 3; ++c) {
 		
 		if (image_A->size() != image_B->size()) {
-			note (ERROR, String::compose ("image sizes for frame %1 differ", frame));
+			note (DCP_ERROR, String::compose ("image sizes for frame %1 differ", frame));
 			return false;
 		}
 		
@@ -162,11 +162,11 @@ PictureMXF::frame_buffer_equals (
 	
 	double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
 	
-	note (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 (
-			ERROR,
+			DCP_ERROR,
 			String::compose ("mean %1 out of range %2 in frame %3", mean, opt.max_mean_pixel_error, frame)
 			);
 		
@@ -175,7 +175,7 @@ PictureMXF::frame_buffer_equals (
 
 	if (std_dev > opt.max_std_dev_pixel_error) {
 		note (
-			ERROR,
+			DCP_ERROR,
 			String::compose ("standard deviation %1 out of range %2 in frame %3", std_dev, opt.max_std_dev_pixel_error, frame)
 			);
 		
@@ -184,9 +184,3 @@ PictureMXF::frame_buffer_equals (
 
 	return true;
 }
-
-string
-PictureMXF::key_type () const
-{
-	return "MDIK";
-}