X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=12032328522c20be17c95ba8f50152337f23e8a7;hb=cccab9e0c03bf03e51a8924c05b6e5ed74d94e99;hp=f2c489e70df8d03d9c16c0eaa7d79d7a449b7fb2;hpb=4f902db0ad994910a34ca845225635ceefcac96e;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index f2c489e7..12032328 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -29,75 +29,85 @@ #include #include #include +#include #include "AS_DCP.h" #include "KM_fileio.h" #include "picture_asset.h" #include "util.h" #include "exceptions.h" -#include "picture_frame.h" +#include "xyz_frame.h" +#include "picture_asset_writer.h" using std::string; using std::ostream; using std::list; using std::vector; using std::max; +using std::stringstream; +using std::pair; +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 libdcp; -PictureAsset::PictureAsset (string directory, string mxf_name, boost::signals2::signal* progress, int fps, int entry_point, int length, bool encrypted) - : MXFAsset (directory, mxf_name, progress, fps, entry_point, length, encrypted) - , _width (0) - , _height (0) +PictureAsset::PictureAsset (boost::filesystem::path directory, string mxf_name) + : MXFAsset (directory, mxf_name) { } void -PictureAsset::write_to_cpl (ostream& s) const +PictureAsset::write_to_cpl (xmlpp::Element* node, bool interop) const { - s << " \n" - << " urn:uuid:" << _uuid << "\n" - << " " << _file_name << "\n" - << " " << _fps << " 1\n" - << " " << _length << "\n" - << " 0\n" - << " " << _length << "\n" - << " " << _fps << " 1\n" - << " " << _width << " " << _height << "\n" - << " \n"; + MXFAsset::write_to_cpl (node, interop); + + 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 (_edit_rate * edit_rate_factor ()) + " 1"); + if (interop) { + (*i)->add_child ("ScreenAspectRatio")->add_child_text (lexical_cast (float (_size.width) / _size.height)); + } else { + (*i)->add_child ("ScreenAspectRatio")->add_child_text (lexical_cast (_size.width) + " " + lexical_cast (_size.height)); + } } bool -PictureAsset::equals (shared_ptr other, EqualityOptions opt, list& notes) const +PictureAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { - if (!MXFAsset::equals (other, opt, notes)) { + if (!MXFAsset::equals (other, opt, note)) { return false; } ASDCP::JP2K::MXFReader reader_A; if (ASDCP_FAILURE (reader_A.OpenRead (path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string())); } ASDCP::JP2K::MXFReader reader_B; if (ASDCP_FAILURE (reader_B.OpenRead (other->path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string())); } ASDCP::JP2K::PictureDescriptor desc_A; if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) { - throw DCPReadError ("could not read video MXF information"); + boost::throw_exception (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"); + boost::throw_exception (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 || @@ -116,10 +126,14 @@ PictureAsset::equals (shared_ptr other, EqualityOptions opt, list other, EqualityOptions opt, list get_path, - string directory, - string mxf_name, - boost::signals2::signal* progress, - int fps, - int length, - int width, - int height, - bool encrypted) - : PictureAsset (directory, mxf_name, progress, fps, 0, length, encrypted) -{ - _width = width; - _height = height; - construct (get_path); -} - -MonoPictureAsset::MonoPictureAsset ( - vector const & files, - string directory, - string mxf_name, - boost::signals2::signal* progress, - int fps, - int length, - int width, - int height, - bool encrypted) - : PictureAsset (directory, mxf_name, progress, fps, 0, length, encrypted) -{ - _width = width; - _height = height; - construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files)); -} - -MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, int entry_point, int length) - : PictureAsset (directory, mxf_name, 0, fps, entry_point, length, false) -{ - ASDCP::JP2K::MXFReader reader; - if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); - } - - ASDCP::JP2K::PictureDescriptor desc; - if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) { - throw DCPReadError ("could not read video MXF information"); - } - - _width = desc.StoredWidth; - _height = desc.StoredHeight; -} - -void -MonoPictureAsset::construct (boost::function get_path) -{ - 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))) { - throw 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 (_fps, 1); - - ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info); - - ASDCP::JP2K::MXFWriter mxf_writer; - if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, picture_desc))) { - throw MXFFileError ("could not open MXF file for writing", path().string()); - } - - 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); - } - - if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, _encryption_context, 0))) { - throw MiscError ("error in writing video MXF"); - } - - if (_progress) { - (*_progress) (0.5 * float (i) / _length); - } - } - - if (ASDCP_FAILURE (mxf_writer.Finalize())) { - throw MiscError ("error in finalising video MXF"); - } -} - -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 + _entry_point)); -} - - -bool -MonoPictureAsset::equals (shared_ptr other, EqualityOptions opt, list& notes) const -{ - if (!PictureAsset::equals (other, opt, notes)) { - return false; - } - - shared_ptr other_picture = dynamic_pointer_cast (other); - assert (other_picture); - - for (int i = 0; i < _length; ++i) { - shared_ptr frame_A = get_frame (i); - shared_ptr frame_B = other_picture->get_frame (i); - - if (!frame_buffer_equals ( - i, opt, notes, - frame_A->j2k_frame()->RoData(), frame_A->j2k_frame()->Size(), - frame_B->j2k_frame()->RoData(), frame_B->j2k_frame()->Size() - )) { - return false; - } - } - - return true; -} - -bool -StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, list& notes) const -{ - if (!PictureAsset::equals (other, opt, notes)) { - return false; - } - - shared_ptr other_picture = dynamic_pointer_cast (other); - assert (other_picture); - - for (int i = 0; i < _length; ++i) { - shared_ptr frame_A = get_frame (i); - shared_ptr frame_B = other_picture->get_frame (i); - - if (!frame_buffer_equals ( - i, opt, notes, - frame_A->j2k_frame()->Left.RoData(), frame_A->j2k_frame()->Left.Size(), - frame_B->j2k_frame()->Left.RoData(), frame_B->j2k_frame()->Left.Size() - )) { - return false; - } - - if (!frame_buffer_equals ( - i, opt, notes, - frame_A->j2k_frame()->Right.RoData(), frame_A->j2k_frame()->Right.Size(), - frame_B->j2k_frame()->Right.RoData(), frame_B->j2k_frame()->Right.Size() - )) { - return false; - } - } - - return true; -} - bool PictureAsset::frame_buffer_equals ( - int frame, EqualityOptions opt, list& notes, uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B + int frame, EqualityOptions opt, boost::function note, + uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B ) const { if (size_A == size_B && memcmp (data_A, data_B, size_A) == 0) { + note (NOTE, "J2K identical"); /* Easy result; the J2K data is identical */ return true; } /* Decompress the images to bitmaps */ - opj_image_t* image_A = decompress_j2k (const_cast (data_A), size_A, 0); - opj_image_t* image_B = decompress_j2k (const_cast (data_B), size_B, 0); + shared_ptr image_A = decompress_j2k (const_cast (data_A), size_A, 0); + shared_ptr image_B = decompress_j2k (const_cast (data_B), size_B, 0); /* Compare them */ - if (image_A->numcomps != image_B->numcomps) { - notes.push_back ("image component counts for frame " + lexical_cast(frame) + " differ"); - return false; - } - - vector abs_diffs (image_A->comps[0].w * image_A->comps[0].h * image_A->numcomps); + vector abs_diffs (image_A->size().width * image_A->size().height * 3); int d = 0; int max_diff = 0; - for (int c = 0; c < image_A->numcomps; ++c) { + for (int c = 0; c < 3; ++c) { - if (image_A->comps[c].w != image_B->comps[c].w || image_A->comps[c].h != image_B->comps[c].h) { - notes.push_back ("image sizes for frame " + lexical_cast(frame) + " differ"); + if (image_A->size() != image_B->size()) { + note (ERROR, "image sizes for frame " + lexical_cast(frame) + " differ"); return false; } - int const pixels = image_A->comps[c].w * image_A->comps[c].h; + int const pixels = image_A->size().width * image_A->size().height; for (int j = 0; j < pixels; ++j) { - int const t = abs (image_A->comps[c].data[j] - image_B->comps[c].data[j]); + int const t = abs (image_A->data(c)[j] - image_B->data(c)[j]); abs_diffs[d++] = t; max_diff = max (max_diff, t); } @@ -351,37 +194,38 @@ PictureAsset::frame_buffer_equals ( double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size()); - if (mean > opt.max_mean_pixel_error || std_dev > opt.max_std_dev_pixel_error) { - notes.push_back ("mean or standard deviation out of range for " + lexical_cast(frame)); + 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) + ); + return false; } - - opj_image_destroy (image_A); - opj_image_destroy (image_B); - return true; -} - - -StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, int entry_point, int length) - : PictureAsset (directory, mxf_name, 0, fps, entry_point, length, false) -{ - ASDCP::JP2K::MXFSReader reader; - if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); - } - - ASDCP::JP2K::PictureDescriptor desc; - if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) { - throw DCPReadError ("could not read video MXF information"); + 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) + ); + + return false; } - _width = desc.StoredWidth; - _height = desc.StoredHeight; + return true; } -shared_ptr -StereoPictureAsset::get_frame (int n) const +string +PictureAsset::key_type () const { - return shared_ptr (new StereoPictureFrame (path().string(), n + _entry_point)); + return "MDIK"; } + + +