Merge.
[libdcp.git] / src / stereo_picture_asset.cc
index 433659f49fe697e2b87d5b01696d7ebe290ba8dc..e2494be6f417649bd7581e17603aa9d922e7bcd0 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 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
 #include "stereo_picture_frame.h"
 #include "exceptions.h"
 #include "stereo_picture_asset_writer.h"
+#include "dcp_assert.h"
 
 using std::string;
 using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using namespace libdcp;
+using namespace dcp;
 
-bool
-StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
+       : PictureAsset (file)
 {
-       if (!PictureAsset::equals (other, opt, note)) {
-               return false;
+       ASDCP::JP2K::MXFSReader reader;
+       Kumu::Result_t r = reader.OpenRead (file.string().c_str());
+       if (ASDCP_FAILURE (r)) {
+               boost::throw_exception (MXFFileError ("could not open MXF file for reading", file.string(), r));
        }
-       
-       shared_ptr<const StereoPictureAsset> other_picture = dynamic_pointer_cast<const StereoPictureAsset> (other);
-       assert (other_picture);
 
-       for (int i = 0; i < _intrinsic_duration; ++i) {
-               shared_ptr<const StereoPictureFrame> frame_A = get_frame (i);
-               shared_ptr<const StereoPictureFrame> frame_B = other_picture->get_frame (i);
-               
-               if (!frame_buffer_equals (
-                           i, opt, note,
-                           frame_A->left_j2k_data(), frame_A->left_j2k_size(),
-                           frame_B->left_j2k_data(), frame_B->left_j2k_size()
-                           )) {
-                       return false;
-               }
-               
-               if (!frame_buffer_equals (
-                           i, opt, note,
-                           frame_A->right_j2k_data(), frame_A->right_j2k_size(),
-                           frame_B->right_j2k_data(), frame_B->right_j2k_size()
-                           )) {
-                       return false;
-               }
+       ASDCP::JP2K::PictureDescriptor desc;
+       if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
+               boost::throw_exception (DCPReadError ("could not read video MXF information"));
        }
 
-       return true;
-}
+       read_picture_descriptor (desc);
 
-StereoPictureAsset::StereoPictureAsset (boost::filesystem::path directory, string mxf_name)
-       : PictureAsset (directory, mxf_name)
-{
-       
+       ASDCP::WriterInfo info;
+       if (ASDCP_FAILURE (reader.FillWriterInfo (info))) {
+               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+       }
+
+       _id = read_writer_info (info);
 }
 
-void
-StereoPictureAsset::read ()
+StereoPictureAsset::StereoPictureAsset (Fraction edit_rate)
+       : PictureAsset
+         (edit_rate)
 {
-       ASDCP::JP2K::MXFSReader reader;
-       if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string()));
-       }
-       
-       ASDCP::JP2K::PictureDescriptor desc;
-       if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
-               boost::throw_exception (DCPReadError ("could not read video MXF information"));
-       }
 
-       _size.width = desc.StoredWidth;
-       _size.height = desc.StoredHeight;
 }
 
 shared_ptr<const StereoPictureFrame>
 StereoPictureAsset::get_frame (int n) const
 {
-       return shared_ptr<const StereoPictureFrame> (new StereoPictureFrame (path().string(), n));
+       return shared_ptr<const StereoPictureFrame> (new StereoPictureFrame (file().string(), n));
 }
 
 shared_ptr<PictureAssetWriter>
-StereoPictureAsset::start_write (bool overwrite)
+StereoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite)
 {
-       return shared_ptr<StereoPictureAssetWriter> (new StereoPictureAssetWriter (this, overwrite));
+       return shared_ptr<StereoPictureAssetWriter> (new StereoPictureAssetWriter (this, file, standard, overwrite));
 }
 
-string
-StereoPictureAsset::cpl_node_name () const
+bool
+StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
-       return "msp-cpl:MainStereoscopicPicture";
-}
+       ASDCP::JP2K::MXFSReader reader_A;
+       Kumu::Result_t r = reader_A.OpenRead (file().string().c_str());
+       if (ASDCP_FAILURE (r)) {
+               boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r));
+       }
 
-pair<string, string>
-StereoPictureAsset::cpl_node_attribute (bool interop) const
-{
-       if (interop) {
-               return make_pair ("xmlns:msp-cpl", "http://www.digicine.com/schemas/437-Y/2007/Main-Stereo-Picture-CPL");
-       } else {
-               return make_pair ("xmlns:msp-cpl", "http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL");
+       ASDCP::JP2K::MXFSReader reader_B;
+       r = reader_B.OpenRead (other->file().string().c_str());
+       if (ASDCP_FAILURE (r)) {
+               boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r));
        }
 
-       return make_pair ("", "");
-}
+       ASDCP::JP2K::PictureDescriptor desc_A;
+       if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) {
+               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+       }
+       ASDCP::JP2K::PictureDescriptor desc_B;
+       if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) {
+               boost::throw_exception (DCPReadError ("could not read video MXF information"));
+       }
 
-int
-StereoPictureAsset::edit_rate_factor () const
-{
-       return 2;
+       if (!descriptor_equals (desc_A, desc_B, note)) {
+               return false;
+       }
+
+       shared_ptr<const StereoPictureAsset> other_picture = dynamic_pointer_cast<const StereoPictureAsset> (other);
+       DCP_ASSERT (other_picture);
+
+       bool result = true;
+
+       for (int i = 0; i < _intrinsic_duration; ++i) {
+               shared_ptr<const StereoPictureFrame> frame_A;
+               shared_ptr<const StereoPictureFrame> frame_B;
+               try {
+                       frame_A = get_frame (i);
+                       frame_B = other_picture->get_frame (i);
+               } catch (DCPReadError& e) {
+                       /* If there was a problem reading the frame data we'll just assume
+                          the two frames are not equal.
+                       */
+                       note (DCP_ERROR, e.what ());
+                       return false;
+               }
+
+               if (!frame_buffer_equals (
+                           i, opt, note,
+                           frame_A->left_j2k_data(), frame_A->left_j2k_size(),
+                           frame_B->left_j2k_data(), frame_B->left_j2k_size()
+                           )) {
+                       result = false;
+                       if (!opt.keep_going) {
+                               return result;
+                       }
+               }
+
+               if (!frame_buffer_equals (
+                           i, opt, note,
+                           frame_A->right_j2k_data(), frame_A->right_j2k_size(),
+                           frame_B->right_j2k_data(), frame_B->right_j2k_size()
+                           )) {
+                       result = false;
+                       if (!opt.keep_going) {
+                               return result;
+                       }
+               }
+       }
+
+       return result;
 }