X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_asset.cc;h=e2494be6f417649bd7581e17603aa9d922e7bcd0;hb=c4db5b5396c6401c63d80777a812e8adc642ce02;hp=47a41cc248da2e2673cd9b4ae27d114f6d3c9a9a;hpb=bf59c288798851808359575662f202d390032aa7;p=libdcp.git diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc index 47a41cc2..e2494be6 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington 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 @@ -22,33 +22,73 @@ #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 other, EqualityOptions opt, boost::function note) const +StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file) + : PictureAsset (file) { - if (!MXFAsset::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)); + } + + ASDCP::JP2K::PictureDescriptor desc; + if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) { + boost::throw_exception (DCPReadError ("could not read video MXF information")); } + read_picture_descriptor (desc); + + ASDCP::WriterInfo info; + if (ASDCP_FAILURE (reader.FillWriterInfo (info))) { + boost::throw_exception (DCPReadError ("could not read video MXF information")); + } + + _id = read_writer_info (info); +} + +StereoPictureAsset::StereoPictureAsset (Fraction edit_rate) + : PictureAsset + (edit_rate) +{ + +} + +shared_ptr +StereoPictureAsset::get_frame (int n) const +{ + return shared_ptr (new StereoPictureFrame (file().string(), n)); +} + +shared_ptr +StereoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite) +{ + return shared_ptr (new StereoPictureAssetWriter (this, file, standard, overwrite)); +} + +bool +StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const +{ ASDCP::JP2K::MXFSReader reader_A; - Kumu::Result_t r = reader_A.OpenRead (path().string().c_str()); + 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", path().string(), r)); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r)); } - + ASDCP::JP2K::MXFSReader reader_B; - r = reader_B.OpenRead (other->path().string().c_str()); + r = reader_B.OpenRead (other->file().string().c_str()); if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r)); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r)); } - + ASDCP::JP2K::PictureDescriptor desc_A; if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) { boost::throw_exception (DCPReadError ("could not read video MXF information")); @@ -57,94 +97,52 @@ StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) { boost::throw_exception (DCPReadError ("could not read video MXF information")); } - + if (!descriptor_equals (desc_A, desc_B, note)) { return false; } - + shared_ptr other_picture = dynamic_pointer_cast (other); - assert (other_picture); + DCP_ASSERT (other_picture); + + bool result = true; for (int i = 0; i < _intrinsic_duration; ++i) { - shared_ptr frame_A = get_frame (i); - shared_ptr frame_B = other_picture->get_frame (i); - + shared_ptr frame_A; + shared_ptr 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() )) { - return false; + 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() )) { - return false; + result = false; + if (!opt.keep_going) { + return result; + } } } - return true; -} - -StereoPictureAsset::StereoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name) - : PictureAsset (directory, mxf_name) -{ - -} - -void -StereoPictureAsset::read () -{ - ASDCP::JP2K::MXFSReader reader; - Kumu::Result_t r = reader.OpenRead (path().string().c_str()); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r)); - } - - 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 -StereoPictureAsset::get_frame (int n) const -{ - return shared_ptr (new StereoPictureFrame (path().string(), n)); -} - -shared_ptr -StereoPictureAsset::start_write (bool overwrite) -{ - return shared_ptr (new StereoPictureAssetWriter (this, overwrite)); -} - -string -StereoPictureAsset::cpl_node_name () const -{ - return "msp-cpl:MainStereoscopicPicture"; -} - -pair -StereoPictureAsset::cpl_node_attribute () 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"); - } - - return make_pair ("", ""); -} - -int -StereoPictureAsset::edit_rate_factor () const -{ - return 2; + return result; }