Remove picture_asset.h; some better error messages.
[libdcp.git] / src / picture_mxf.cc
index 8f0f85b9555007bcadb3f9a83cfcaf415dfee7b0..4a8e477b33e1e59234adb2e4ea083e78ae7e4709 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 */
 
-/** @file  src/picture_asset.cc
- *  @brief An asset made up of JPEG2000 files
- */
-
-#include <list>
-#include <stdexcept>
-#include <iostream>
-#include <sstream>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <openjpeg.h>
-#include <libxml++/nodes/element.h>
-#include "AS_DCP.h"
-#include "KM_fileio.h"
 #include "picture_mxf.h"
 #include "util.h"
 #include "exceptions.h"
 #include "xyz_frame.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 <list>
+#include <stdexcept>
+#include <iostream>
+#include <sstream>
 
 using std::string;
 using std::ostream;
@@ -48,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)
@@ -58,33 +52,21 @@ PictureMXF::PictureMXF (boost::filesystem::path file)
 
 }
 
-PictureMXF::PictureMXF (int edit_rate)
+PictureMXF::PictureMXF (Fraction edit_rate)
        : MXF (edit_rate)
 {
 
 }
 
 void
-PictureMXF::write_to_cpl (xmlpp::Element* node) const
+PictureMXF::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & desc)
 {
-       MXF::write_to_cpl (node);
-       
-       xmlpp::Node::NodeList c = node->get_children ();
-       xmlpp::Node::NodeList::iterator i = c.begin();
-       while (i != c.end() && (*i)->get_name() != cpl_node_name ()) {
-               ++i;
-       }
-
-       assert (i != c.end ());
-
-       (*i)->add_child ("FrameRate")->add_child_text (lexical_cast<string> (_edit_rate * edit_rate_factor ()) + " 1");
-       if (_interop) {
-               stringstream s;
-               s << std::fixed << std::setprecision (2) << (float (_size.width) / _size.height);
-               (*i)->add_child ("ScreenAspectRatio")->add_child_text (s.str ());
-       } else {
-               (*i)->add_child ("ScreenAspectRatio")->add_child_text (lexical_cast<string> (_size.width) + " " + lexical_cast<string> (_size.height));
-       }
+       _size.width = desc.StoredWidth;
+       _size.height = desc.StoredHeight;
+       _edit_rate = Fraction (desc.EditRate.Numerator, desc.EditRate.Denominator);
+       _intrinsic_duration = desc.ContainerDuration;
+       _frame_rate = Fraction (desc.SampleRate.Numerator, desc.SampleRate.Denominator);
+       _screen_aspect_ratio = Fraction (desc.AspectRatio.Numerator, desc.AspectRatio.Denominator);
 }
 
 bool
@@ -154,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 (ERROR, String::compose ("image sizes for frame %1 differ", frame));
                        return false;
                }
                
@@ -180,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 (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)
+                       String::compose ("mean %1 out of range %2 in frame %3", mean, opt.max_mean_pixel_error, frame)
                        );
                
                return false;
@@ -196,9 +176,7 @@ 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)
+                       String::compose ("standard deviation %1 out of range %2 in frame %3", std_dev, opt.max_std_dev_pixel_error, frame)
                        );
                
                return false;
@@ -212,6 +190,3 @@ PictureMXF::key_type () const
 {
        return "MDIK";
 }
-
-
-