X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpicture_asset.cc;h=12032328522c20be17c95ba8f50152337f23e8a7;hb=cccab9e0c03bf03e51a8924c05b6e5ed74d94e99;hp=2c35e9f9702269feafd082c9ae3acb89036b6c02;hpb=d697e7bedb1e42f5167c92fd9ab363f496d718f5;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 2c35e9f9..12032328 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -35,7 +35,6 @@ #include "picture_asset.h" #include "util.h" #include "exceptions.h" -#include "picture_frame.h" #include "xyz_frame.h" #include "picture_asset_writer.h" @@ -54,55 +53,12 @@ using boost::dynamic_pointer_cast; using boost::lexical_cast; using namespace libdcp; -PictureAsset::PictureAsset (string directory, string mxf_name, boost::signals2::signal* progress, int fps, int intrinsic_duration, bool encrypted, Size size) - : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted) - , _size (size) -{ - -} - -PictureAsset::PictureAsset (string directory, string mxf_name) +PictureAsset::PictureAsset (boost::filesystem::path directory, string mxf_name) : MXFAsset (directory, mxf_name) { } -string -MonoPictureAsset::cpl_node_name () const -{ - return "MainPicture"; -} - -int -MonoPictureAsset::edit_rate_factor () const -{ - return 1; -} - -string -StereoPictureAsset::cpl_node_name () const -{ - return "msp-cpl:MainStereoscopicPicture"; -} - -pair -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"); - } - - return make_pair ("", ""); -} - -int -StereoPictureAsset::edit_rate_factor () const -{ - return 2; -} - void PictureAsset::write_to_cpl (xmlpp::Element* node, bool interop) const { @@ -187,188 +143,6 @@ PictureAsset::equals (shared_ptr other, EqualityOptions opt, boost: return true; } - -MonoPictureAsset::MonoPictureAsset ( - boost::function get_path, - string directory, - string mxf_name, - boost::signals2::signal* progress, - int fps, - int intrinsic_duration, - bool encrypted, - Size size, - bool interop, - MXFMetadata const & metadata - ) - : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted, size) -{ - construct (get_path, interop, metadata); -} - -MonoPictureAsset::MonoPictureAsset ( - vector const & files, - string directory, - string mxf_name, - boost::signals2::signal* progress, - int fps, - int intrinsic_duration, - bool encrypted, - Size size, - bool interop, - MXFMetadata const & metadata - ) - : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted, size) -{ - construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files), interop, metadata); -} - -MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size) - : PictureAsset (directory, mxf_name, 0, fps, 0, false, size) -{ - -} - -MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name) - : PictureAsset (directory, mxf_name) -{ - ASDCP::JP2K::MXFReader 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; - _edit_rate = desc.EditRate.Numerator; - assert (desc.EditRate.Denominator == 1); - _intrinsic_duration = desc.ContainerDuration; -} - -void -MonoPictureAsset::construct (boost::function get_path, bool interop, MXFMetadata const & metadata) -{ - ASDCP::JP2K::CodestreamParser j2k_parser; - ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte); - if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (get_path(0).c_str(), frame_buffer))) { - boost::throw_exception (FileError ("could not open JPEG2000 file for reading", get_path (0))); - } - - ASDCP::JP2K::PictureDescriptor picture_desc; - j2k_parser.FillPictureDescriptor (picture_desc); - picture_desc.EditRate = ASDCP::Rational (_edit_rate, 1); - - ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info, _uuid, interop, metadata); - - ASDCP::JP2K::MXFWriter mxf_writer; - if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, picture_desc, 16384, false))) { - boost::throw_exception (MXFFileError ("could not open MXF file for writing", path().string())); - } - - for (int i = 0; i < _intrinsic_duration; ++i) { - - string const path = get_path (i); - - if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) { - boost::throw_exception (FileError ("could not open JPEG2000 file for reading", path)); - } - - if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, _encryption_context, 0))) { - boost::throw_exception (MXFFileError ("error in writing video MXF", this->path().string())); - } - - if (_progress) { - (*_progress) (0.5 * float (i) / _intrinsic_duration); - } - } - - if (ASDCP_FAILURE (mxf_writer.Finalize())) { - boost::throw_exception (MXFFileError ("error in finalising video MXF", path().string())); - } -} - -string -MonoPictureAsset::path_from_list (int f, vector const & files) const -{ - return files[f]; -} - -shared_ptr -MonoPictureAsset::get_frame (int n) const -{ - return shared_ptr (new MonoPictureFrame (path().string(), n, _decryption_context)); -} - - -bool -MonoPictureAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const -{ - if (!PictureAsset::equals (other, opt, note)) { - return false; - } - - shared_ptr other_picture = dynamic_pointer_cast (other); - assert (other_picture); - - for (int i = 0; i < _intrinsic_duration; ++i) { - if (i >= other_picture->intrinsic_duration()) { - return false; - } - - note (PROGRESS, "Comparing video frame " + lexical_cast (i) + " of " + lexical_cast (_intrinsic_duration)); - shared_ptr frame_A = get_frame (i); - shared_ptr frame_B = other_picture->get_frame (i); - - if (!frame_buffer_equals ( - i, opt, note, - frame_A->j2k_data(), frame_A->j2k_size(), - frame_B->j2k_data(), frame_B->j2k_size() - )) { - return false; - } - } - - return true; -} - -bool -StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const -{ - if (!PictureAsset::equals (other, opt, note)) { - return false; - } - - shared_ptr other_picture = dynamic_pointer_cast (other); - assert (other_picture); - - for (int i = 0; i < _intrinsic_duration; ++i) { - shared_ptr frame_A = get_frame (i); - shared_ptr 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; - } - } - - return true; -} - bool PictureAsset::frame_buffer_equals ( int frame, EqualityOptions opt, boost::function note, @@ -423,65 +197,35 @@ PictureAsset::frame_buffer_equals ( note (NOTE, "mean difference " + lexical_cast (mean) + ", deviation " + lexical_cast (std_dev)); if (mean > opt.max_mean_pixel_error) { - note (ERROR, "mean " + lexical_cast(mean) + " out of range " + lexical_cast(opt.max_mean_pixel_error) + " in frame " + lexical_cast(frame)); + note ( + ERROR, + "mean " + lexical_cast(mean) + + " out of range " + lexical_cast(opt.max_mean_pixel_error) + + " in frame " + lexical_cast(frame) + ); + return false; } if (std_dev > opt.max_std_dev_pixel_error) { - note (ERROR, "standard deviation " + lexical_cast(std_dev) + " out of range " + lexical_cast(opt.max_std_dev_pixel_error) + " in frame " + lexical_cast(frame)); + note ( + ERROR, + "standard deviation " + lexical_cast(std_dev) + + " out of range " + lexical_cast(opt.max_std_dev_pixel_error) + + " in frame " + lexical_cast(frame) + ); + return false; } return true; } - -StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, int intrinsic_duration) - : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration, false, Size (0, 0)) -{ - 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 -StereoPictureAsset::get_frame (int n) const -{ - return shared_ptr (new StereoPictureFrame (path().string(), n)); -} - -shared_ptr -MonoPictureAsset::start_write (bool overwrite, bool interop, MXFMetadata const & metadata) -{ - /* XXX: can't we use shared_ptr here? */ - return shared_ptr (new MonoPictureAssetWriter (this, overwrite, interop, metadata)); -} - string PictureAsset::key_type () const { return "MDIK"; } -StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, Size size) - : PictureAsset (directory, mxf_name, 0, fps, 0, false, size) -{ - -} -shared_ptr -StereoPictureAsset::start_write (bool overwrite, bool interop, MXFMetadata const & metadata) -{ - /* XXX: can't we use shared_ptr here? */ - return shared_ptr (new StereoPictureAssetWriter (this, overwrite, interop, metadata)); -}