X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=f3d523963abec33620447b14e51aa1b5b93dcae3;hb=2489080f9a5d2891da0fc313b2c0ac1450a630ad;hp=d7036a190fcebf68033ed923bdb035fbcbd83adc;hpb=f6ee90107839e0d750d8678b67c9d6d1d596d739;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index d7036a19..f3d52396 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -36,58 +36,150 @@ #include "exceptions.h" #include "picture_frame.h" -using namespace std; -using namespace boost; +using std::string; +using std::ostream; +using std::list; +using std::vector; +using std::max; +using boost::shared_ptr; +using boost::dynamic_pointer_cast; +using boost::lexical_cast; using namespace libdcp; -PictureAsset::PictureAsset ( - sigc::slot get_path, +PictureAsset::PictureAsset (string directory, string mxf_name, boost::signals2::signal* progress, int fps, int intrinsic_duration, Size size) + : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) + , _size (size) +{ + +} + +void +PictureAsset::write_to_cpl (ostream& s) const +{ + s << " \n" + << " urn:uuid:" << _uuid << "\n" + << " " << _file_name << "\n" + << " " << _fps << " 1\n" + << " " << _intrinsic_duration << "\n" + << " " << _entry_point << "\n" + << " " << _duration << "\n" + << " " << _fps << " 1\n" + << " " << _size.width << " " << _size.height << "\n" + << " \n"; +} + +bool +PictureAsset::equals (shared_ptr other, EqualityOptions opt, list& notes) const +{ + if (!MXFAsset::equals (other, opt, notes)) { + 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()); + } + + 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()); + } + + 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"); + return false; + } + +// 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"); +// } +// } + + return true; +} + + +MonoPictureAsset::MonoPictureAsset ( + boost::function get_path, string directory, string mxf_name, - sigc::signal1* progress, + boost::signals2::signal* progress, int fps, - int length, - int width, - int height) - : Asset (directory, mxf_name, progress, fps, length) - , _width (width) - , _height (height) + int intrinsic_duration, + Size size) + : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size) { construct (get_path); } -PictureAsset::PictureAsset ( +MonoPictureAsset::MonoPictureAsset ( vector const & files, string directory, string mxf_name, - sigc::signal1* progress, + boost::signals2::signal* progress, int fps, - int length, - int width, - int height) - : Asset (directory, mxf_name, progress, fps, length) - , _width (width) - , _height (height) + int intrinsic_duration, + Size size) + : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size) { - construct (sigc::bind (sigc::mem_fun (*this, &PictureAsset::path_from_list), files)); + construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, 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) +MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size) + : PictureAsset (directory, mxf_name, 0, fps, 0, size) { } -string -PictureAsset::path_from_list (int f, vector const & files) const +MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, int intrinsic_duration) + : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration, Size (0, 0)) { - return files[f]; + 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"); + } + + _size.width = desc.StoredWidth; + _size.height = desc.StoredHeight; } void -PictureAsset::construct (sigc::slot get_path) +MonoPictureAsset::construct (boost::function get_path) { ASDCP::JP2K::CodestreamParser j2k_parser; ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte); @@ -100,17 +192,17 @@ PictureAsset::construct (sigc::slot get_path) picture_desc.EditRate = ASDCP::Rational (_fps, 1); ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info); + fill_writer_info (&writer_info, _uuid); 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()); + 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) { + 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))) { throw FileError ("could not open JPEG2000 file for reading", path); } @@ -119,8 +211,10 @@ PictureAsset::construct (sigc::slot get_path) if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) { throw MiscError ("error in writing video MXF"); } - - (*_progress) (0.5 * float (i) / _length); + + if (_progress) { + (*_progress) (0.5 * float (i) / _intrinsic_duration); + } } if (ASDCP_FAILURE (mxf_writer.Finalize())) { @@ -128,185 +222,221 @@ PictureAsset::construct (sigc::slot get_path) } } -void -PictureAsset::write_to_cpl (ostream& s) const +string +MonoPictureAsset::path_from_list (int f, vector const & files) 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"; + return files[f]; } -list -PictureAsset::equals (shared_ptr other, EqualityOptions opt) const +shared_ptr +MonoPictureAsset::get_frame (int n) 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()); - } + 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); - 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()); + 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, notes, + frame_A->j2k_frame()->RoData(), frame_A->j2k_frame()->Size(), + frame_B->j2k_frame()->RoData(), frame_B->j2k_frame()->Size() + )) { + return false; } + } - ASDCP::JP2K::PictureDescriptor desc_A; - if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) { - throw DCPReadError ("could not read video MXF information"); + 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 < _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, 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; } - ASDCP::JP2K::PictureDescriptor desc_B; - if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) { - throw DCPReadError ("could not read video MXF information"); + + 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; } + } - 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 - ) { + 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 + ) const +{ + if (size_A == size_B && memcmp (data_A, data_B, size_A) == 0) { + /* Easy result; the J2K data is identical */ + return true; + } - notes.push_back ("video MXF picture descriptors differ"); + /* 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); + + /* 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); + 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(frame) + " differ"); + return false; + } + + 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(frame)); + return false; + } + + opj_image_destroy (image_A); + opj_image_destroy (image_B); -// 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"; - } - - opj_image_destroy (image_A); - opj_image_destroy (image_B); - } + return true; +} + + +StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, int intrinsic_duration) + : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration, Size (0, 0)) +{ + 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"); + } + + _size.width = desc.StoredWidth; + _size.height = desc.StoredHeight; +} + +shared_ptr +StereoPictureAsset::get_frame (int n) const +{ + return shared_ptr (new StereoPictureFrame (path().string(), n + _entry_point)); +} + +shared_ptr +MonoPictureAsset::start_write () +{ + /* XXX: can't we use a shared_ptr here? */ + return shared_ptr (new MonoPictureAssetWriter (this)); +} + +MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* a) + : _frame_buffer (4 * Kumu::Megabyte) + , _asset (a) + , _frames_written (0) + , _finalized (false) +{ + +} + +void +MonoPictureAssetWriter::write (uint8_t* data, int size) +{ + if (ASDCP_FAILURE (_j2k_parser.OpenReadFrame (data, size, _frame_buffer))) { + throw MiscError ("could not parse J2K frame"); + } + + if (_frames_written == 0) { + _j2k_parser.FillPictureDescriptor (_picture_descriptor); + _picture_descriptor.EditRate = ASDCP::Rational (_asset->frames_per_second(), 1); + + MXFAsset::fill_writer_info (&_writer_info, _asset->uuid()); + + if (ASDCP_FAILURE (_mxf_writer.OpenWrite (_asset->path().c_str(), _writer_info, _picture_descriptor))) { + throw MXFFileError ("could not open MXF file for writing", _asset->path().string()); } } - return notes; + if (ASDCP_FAILURE (_mxf_writer.WriteFrame (_frame_buffer, 0, 0))) { + throw MiscError ("error in writing video MXF"); + } + + _frames_written++; } -opj_image_t * -PictureAsset::decompress_j2k (uint8_t* data, int64_t size) const +void +MonoPictureAssetWriter::finalize () { - 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"); + if (ASDCP_FAILURE (_mxf_writer.Finalize())) { + throw MiscError ("error in finalizing video MXF"); } - opj_cio_close (cio); - return image; + _finalized = true; + _asset->set_intrinsic_duration (_frames_written); } -shared_ptr -PictureAsset::get_frame (int n) const +MonoPictureAssetWriter::~MonoPictureAssetWriter () { - return shared_ptr (new PictureFrame (mxf_path().string(), n)); + assert (_finalized); }