Try to add basic decryption support to dcpdiff.

[libdcp.git] / src / picture_mxf.cc

diff --git a/src/picture_mxf.cc b/src/picture_mxf.cc
index e59550472ca212497bdac2b5c97135b97466ab04..46aa7752847aa539aaeb790194ccfcf7b293a311 100644 (file)
--- a/src/picture_mxf.cc
+++ b/src/picture_mxf.cc
@@ -20,14 +20,14 @@
 #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"
 #include "KM_fileio.h"
 #include <libxml++/nodes/element.h>
 #include <openjpeg.h>
 #include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
 #include <list>
 #include <stdexcept>
 #include <iostream>
@@ -44,8 +44,6 @@ using std::make_pair;
 using std::istream;
 using std::cout;
 using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using boost::lexical_cast;
 using namespace dcp;
 
 PictureMXF::PictureMXF (boost::filesystem::path file)
@@ -73,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 (
@@ -96,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) {
@@ -115,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 */
        
@@ -138,7 +136,7 @@ PictureMXF::frame_buffer_equals (
        for (int c = 0; c < 3; ++c) {
                
                if (image_A->size() != image_B->size()) {
-                       note (ERROR, "image sizes for frame " + lexical_cast<string>(frame) + " differ");
+                       note (DCP_ERROR, String::compose ("image sizes for frame %1 differ", frame));
                        return false;
                }
                
@@ -164,14 +162,12 @@ PictureMXF::frame_buffer_equals (
        
        double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
        
-       note (NOTE, "mean difference " + lexical_cast<string> (mean) + ", deviation " + lexical_cast<string> (std_dev));
+       note (DCP_NOTE, String::compose ("mean difference %1, deviation %2", mean, std_dev));
        
        if (mean > opt.max_mean_pixel_error) {
                note (
-                       ERROR,
-                       "mean " + lexical_cast<string>(mean) +
-                       " out of range " + lexical_cast<string>(opt.max_mean_pixel_error) +
-                       " in frame " + lexical_cast<string>(frame)
+                       DCP_ERROR,
+                       String::compose ("mean %1 out of range %2 in frame %3", mean, opt.max_mean_pixel_error, frame)
                        );
                
                return false;
@@ -179,10 +175,8 @@ PictureMXF::frame_buffer_equals (
 
        if (std_dev > opt.max_std_dev_pixel_error) {
                note (
-                       ERROR,
-                       "standard deviation " + lexical_cast<string>(std_dev) +
-                       " out of range " + lexical_cast<string>(opt.max_std_dev_pixel_error) +
-                       " in frame " + lexical_cast<string>(frame)
+                       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;
@@ -190,9 +184,3 @@ PictureMXF::frame_buffer_equals (
 
        return true;
 }
-
-string
-PictureMXF::key_type () const
-{
-       return "MDIK";
-}