X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=14a9eda63806d2e0fdcf8fe7e8501614dfed1a90;hb=739dadd8691fa04c8e94d61c02a8b044436562a3;hp=4e3b0227ba8845ec00c753be16671d048fadfc26;hpb=7d48446b5efdf795df1ce22d6d9ed3ebe85d3381;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 4e3b0227..14a9eda6 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -17,76 +17,220 @@ */ +/** @file src/picture_asset.cc + * @brief An asset made up of JPEG2000 files + */ + #include #include #include +#include #include -#include -#include +#include +#include "AS_DCP.h" +#include "KM_fileio.h" #include "picture_asset.h" #include "util.h" +#include "exceptions.h" using namespace std; using namespace boost; using namespace libdcp; -PictureAsset::PictureAsset (list const & files, string p, int fps, int len, int w, int h) - : Asset (p, fps, len) - , _width (w) - , _height (h) +PictureAsset::PictureAsset ( + sigc::slot get_path, + string directory, + string mxf_name, + sigc::signal1* progress, + int fps, + int length, + int width, + int height) + : Asset (directory, mxf_name, progress, fps, length) + , _width (width) + , _height (height) +{ + construct (get_path); +} + +PictureAsset::PictureAsset ( + vector const & files, + string directory, + string mxf_name, + sigc::signal1* progress, + int fps, + int length, + int width, + int height) + : Asset (directory, mxf_name, progress, fps, length) + , _width (width) + , _height (height) +{ + construct (sigc::bind (sigc::mem_fun (*this, &PictureAsset::path_from_list), files)); +} + +PictureAsset::PictureAsset (string directory, string mxf_name, int fps, int length, int width, int height) + : Asset (directory, mxf_name, 0, fps, length) + , _width (width) + , _height (height) +{ + +} + +string +PictureAsset::path_from_list (int f, vector const & files) const +{ + return files[f]; +} + +void +PictureAsset::construct (sigc::slot get_path) { ASDCP::JP2K::CodestreamParser j2k_parser; ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte); - if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (files.front().c_str(), frame_buffer))) { - throw runtime_error ("could not open J2K file for reading"); + if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (get_path(0).c_str(), frame_buffer))) { + throw FileError ("could not open JPEG2000 file for reading", get_path (0)); } ASDCP::JP2K::PictureDescriptor picture_desc; j2k_parser.FillPictureDescriptor (picture_desc); - /* XXX: we round for DCP: not sure if this is right */ picture_desc.EditRate = ASDCP::Rational (_fps, 1); ASDCP::WriterInfo writer_info; fill_writer_info (&writer_info); ASDCP::JP2K::MXFWriter mxf_writer; - if (ASDCP_FAILURE (mxf_writer.OpenWrite (_mxf_path.c_str(), writer_info, picture_desc))) { - throw runtime_error ("could not open MXF for writing"); +#if BOOST_FILESYSTEM_VERSION == 3 + if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, picture_desc))) { +#else + if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, picture_desc))) { +#endif + throw FileError ("could not open MXF file for writing", mxf_path().string()); } - int j = 0; - for (list::const_iterator i = files.begin(); i != files.end(); ++i) { - if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (i->c_str(), frame_buffer))) { - throw runtime_error ("could not open J2K file for reading"); + for (int i = 0; i < _length; ++i) { + + string const path = get_path (i); + + if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) { + throw FileError ("could not open JPEG2000 file for reading", path); } /* XXX: passing 0 to WriteFrame ok? */ if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) { - throw runtime_error ("error in writing video MXF"); + throw MiscError ("error in writing video MXF"); } - ++j; - Progress (float (j) / files.size ()); + (*_progress) (0.5 * float (i) / _length); } if (ASDCP_FAILURE (mxf_writer.Finalize())) { - throw runtime_error ("error in finalising video MXF"); + throw MiscError ("error in finalising video MXF"); } - - _digest = make_digest (_mxf_path); } void PictureAsset::write_to_cpl (ostream& s) const { s << " \n" - << " " << _uuid << "\n" - << " " << filesystem::path(_mxf_path).filename() << "\n" - << " " << _fps << "\n" + << " urn:uuid:" << _uuid << "\n" + << " " << _mxf_name << "\n" + << " " << _fps << " 1\n" << " " << _length << "\n" << " 0\n" << " " << _length << "\n" - << " " << _fps << "\n" + << " " << _fps << " 1\n" << " " << _width << " " << _height << "\n" << " \n"; } + +list +PictureAsset::equals (shared_ptr other, EqualityFlags flags) const +{ + list notes = Asset::equals (other, flags); + + if (flags & MXF_INSPECT) { + ASDCP::JP2K::MXFReader reader_A; +#if BOOST_FILESYSTEM_VERSION == 3 + if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().c_str()))) { +#else + if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) { +#endif + throw FileError ("could not open MXF file for reading", mxf_path().string()); + } + + ASDCP::JP2K::MXFReader reader_B; +#if BOOST_FILESYSTEM_VERSION == 3 + if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().c_str()))) { +#else + if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) { +#endif + throw FileError ("could not open MXF file for reading", mxf_path().string()); + } + + ASDCP::JP2K::PictureDescriptor desc_A; + if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) { + throw DCPReadError ("could not read video MXF information"); + } + ASDCP::JP2K::PictureDescriptor desc_B; + if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) { + throw DCPReadError ("could not read video MXF information"); + } + + if ( + desc_A.EditRate != desc_B.EditRate || + desc_A.ContainerDuration != desc_B.ContainerDuration || + desc_A.SampleRate != desc_B.SampleRate || + desc_A.StoredWidth != desc_B.StoredWidth || + desc_A.StoredHeight != desc_B.StoredHeight || + desc_A.AspectRatio != desc_B.AspectRatio || + desc_A.Rsize != desc_B.Rsize || + desc_A.Xsize != desc_B.Xsize || + desc_A.Ysize != desc_B.Ysize || + desc_A.XOsize != desc_B.XOsize || + desc_A.YOsize != desc_B.YOsize || + desc_A.XTsize != desc_B.XTsize || + desc_A.YTsize != desc_B.YTsize || + desc_A.XTOsize != desc_B.XTOsize || + desc_A.YTOsize != desc_B.YTOsize || + desc_A.Csize != desc_B.Csize +// desc_A.CodingStyleDefault != desc_B.CodingStyleDefault || +// desc_A.QuantizationDefault != desc_B.QuantizationDefault + ) { + + notes.push_back ("video MXF picture descriptors differ"); + } + +// for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) { +// if (desc_A.ImageComponents[j] != desc_B.ImageComponents[j]) { +// notes.pack_start ("video MXF picture descriptors differ"); +// } +// } + + + ASDCP::JP2K::FrameBuffer buffer_A (4 * Kumu::Megabyte); + ASDCP::JP2K::FrameBuffer buffer_B (4 * Kumu::Megabyte); + + for (int i = 0; i < _length; ++i) { + if (ASDCP_FAILURE (reader_A.ReadFrame (i, buffer_A))) { + throw DCPReadError ("could not read video frame"); + } + + if (ASDCP_FAILURE (reader_B.ReadFrame (i, buffer_B))) { + throw DCPReadError ("could not read video frame"); + } + + if (buffer_A.Size() != buffer_B.Size()) { + notes.push_back ("sizes of video data for frame " + lexical_cast(i) + " differ"); + continue; + } + + if (memcmp (buffer_A.RoData(), buffer_B.RoData(), buffer_A.Size()) != 0) { + notes.push_back ("J2K data for frame " + lexical_cast(i) + " differ"); + continue; + } + } + } + + return notes; +}