X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=3a0383feab54727ae7c0efc7125807ffd42fc9ab;hb=38ab691952b83088fe7f5aa19d3ad2646221ccbf;hp=c59664d9cb263833c3c8b0179a3e3460f12468c2;hpb=20e2e745f98aa246041f6a299a9cc3aa346e809a;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index c59664d9..3a0383fe 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -25,281 +25,185 @@ #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; +#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 ( - 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) +PictureAsset::PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name) + : MXFAsset (directory, mxf_name) { - 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) +void +PictureAsset::write_to_cpl (xmlpp::Element* node, bool interop) const { + 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)); + } } -string -PictureAsset::path_from_list (int f, vector const & files) const +bool +PictureAsset::descriptor_equals ( + ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function note + ) const { - return files[f]; + if ( + a.EditRate != b.EditRate || + a.SampleRate != b.SampleRate || + a.StoredWidth != b.StoredWidth || + a.StoredHeight != b.StoredHeight || + a.AspectRatio != b.AspectRatio || + a.Rsize != b.Rsize || + a.Xsize != b.Xsize || + a.Ysize != b.Ysize || + a.XOsize != b.XOsize || + a.YOsize != b.YOsize || + a.XTsize != b.XTsize || + a.YTsize != b.YTsize || + a.XTOsize != b.XTOsize || + a.YTOsize != b.YTOsize || + a.Csize != b.Csize +// a.CodingStyleDefault != b.CodingStyleDefault || +// a.QuantizationDefault != b.QuantizationDefault + ) { + + note (ERROR, "video MXF picture descriptors differ"); + return false; + } + + if (a.ContainerDuration != b.ContainerDuration) { + note (ERROR, "video container durations differ"); + } + +// for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) { +// if (a.ImageComponents[j] != b.ImageComponents[j]) { +// notes.pack_start ("video MXF picture descriptors differ"); +// } +// } + + return true; } -void -PictureAsset::construct (sigc::slot get_path) +bool +PictureAsset::frame_buffer_equals ( + 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 { - 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)); + 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 */ + 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); - ASDCP::JP2K::PictureDescriptor picture_desc; - j2k_parser.FillPictureDescriptor (picture_desc); - picture_desc.EditRate = ASDCP::Rational (_fps, 1); + /* Compare them */ - ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info); + vector abs_diffs (image_A->size().width * image_A->size().height * 3); + int d = 0; + int max_diff = 0; - ASDCP::JP2K::MXFWriter mxf_writer; - if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, picture_desc))) { - throw FileError ("could not open MXF file for writing", mxf_path().string()); - } - - for (int i = 0; i < _length; ++i) { - - string const path = get_path (i); + for (int c = 0; c < 3; ++c) { - if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) { - throw FileError ("could not open JPEG2000 file for reading", path); + if (image_A->size() != image_B->size()) { + note (ERROR, "image sizes for frame " + lexical_cast(frame) + " differ"); + return false; } - - /* XXX: passing 0 to WriteFrame ok? */ - if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) { - throw MiscError ("error in writing video MXF"); + + int const pixels = image_A->size().width * image_A->size().height; + for (int j = 0; j < pixels; ++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); } + } - (*_progress) (0.5 * float (i) / _length); + uint64_t total = 0; + for (vector::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) { + total += *j; } - if (ASDCP_FAILURE (mxf_writer.Finalize())) { - throw MiscError ("error in finalising video MXF"); + double const mean = double (total) / abs_diffs.size (); + + uint64_t total_squared_deviation = 0; + for (vector::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) { + total_squared_deviation += pow (*j - mean, 2); } -} - -void -PictureAsset::write_to_cpl (ostream& s) const -{ - s << " \n" - << " urn:uuid:" << _uuid << "\n" - << " " << _mxf_name << "\n" - << " " << _fps << " 1\n" - << " " << _length << "\n" - << " 0\n" - << " " << _length << "\n" - << " " << _fps << " 1\n" - << " " << _width << " " << _height << "\n" - << " \n"; -} - -list -PictureAsset::equals (shared_ptr other, EqualityOptions opt) const -{ - list notes = Asset::equals (other, opt); - - if (opt.flags & MXF_INSPECT) { - ASDCP::JP2K::MXFReader reader_A; - if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) { - throw FileError ("could not open MXF file for reading", mxf_path().string()); - } - - ASDCP::JP2K::MXFReader reader_B; - if (ASDCP_FAILURE (reader_B.OpenRead (other->mxf_path().string().c_str()))) { - 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 - ) { + + double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size()); + + 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) + ); - 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"); - } - - bool j2k_same = true; - - if (buffer_A.Size() != buffer_B.Size()) { - notes.push_back ("sizes of video data for frame " + lexical_cast(i) + " differ"); - j2k_same = false; - } else if (memcmp (buffer_A.RoData(), buffer_B.RoData(), buffer_A.Size()) != 0) { - notes.push_back ("J2K data for frame " + lexical_cast(i) + " differ"); - j2k_same = false; - } - - if (!j2k_same) { - - if (opt.verbose) { - cout << "J2K images for " << i << " differ; checking by pixel\n"; - } - - /* Decompress the images to bitmaps */ - opj_image_t* image_A = decompress_j2k (const_cast (buffer_A.RoData()), buffer_A.Size ()); - opj_image_t* image_B = decompress_j2k (const_cast (buffer_B.RoData()), buffer_B.Size ()); - - /* Compare them */ - - if (image_A->numcomps != image_B->numcomps) { - notes.push_back ("image component counts for frame " + lexical_cast(i) + " differ"); - } - - vector abs_diffs (image_A->comps[0].w * image_A->comps[0].h * image_A->numcomps); - int d = 0; - int max_diff = 0; - - for (int c = 0; c < image_A->numcomps; ++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(i) + " differ"); - } - - int const pixels = image_A->comps[c].w * image_A->comps[c].h; - for (int j = 0; j < pixels; ++j) { - int const t = abs (image_A->comps[c].data[j] - image_B->comps[c].data[j]); - abs_diffs[d++] = t; - max_diff = max (max_diff, t); - } - } - - uint64_t total = 0; - for (vector::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) { - total += *j; - } - - double const mean = double (total) / abs_diffs.size (); - - uint64_t total_squared_deviation = 0; - for (vector::iterator j = abs_diffs.begin(); j != abs_diffs.end(); ++j) { - total_squared_deviation += pow (*j - mean, 2); - } - - 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(i)); - } - - if (opt.verbose) { - cout << "\tmax pixel error " << max_diff << ", mean pixel error " << mean << ", standard deviation " << std_dev << "\n"; - } + return false; + } - opj_image_destroy (image_A); - opj_image_destroy (image_B); - } - } + 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; } - return notes; + return true; } -opj_image_t * -PictureAsset::decompress_j2k (uint8_t* data, int64_t size) const +string +PictureAsset::key_type () const { - opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K); - opj_dparameters_t parameters; - opj_set_default_decoder_parameters (¶meters); - opj_setup_decoder (decoder, ¶meters); - opj_cio_t* cio = opj_cio_open ((opj_common_ptr) decoder, data, size); - opj_image_t* image = opj_decode (decoder, cio); - if (!image) { - opj_destroy_decompress (decoder); - opj_cio_close (cio); - throw DCPReadError ("could not decode JPEG2000 codestream"); - } - - opj_cio_close (cio); - return image; + return "MDIK"; } + + +