X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=3a0383feab54727ae7c0efc7125807ffd42fc9ab;hb=38ab691952b83088fe7f5aa19d3ad2646221ccbf;hp=f2982b47d6cbc38690108973ad89418fd65f867e;hpb=da4c216fb48b230eac4297e237c379f2a1449fc1;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index f2982b47..3a0383fe 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -25,22 +25,24 @@ #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" -#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; @@ -50,87 +52,68 @@ 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, Size size) - : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) - , _size (size) -{ - -} - -PictureAsset::PictureAsset (string directory, string mxf_name) +PictureAsset::PictureAsset (boost::filesystem::path directory, boost::filesystem::path 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" - << " " << _edit_rate << " 1\n" - << " " << _intrinsic_duration << "\n" - << " " << _entry_point << "\n" - << " " << _duration << "\n" - << " " << _edit_rate << " 1\n" - << " " << _size.width << " " << _size.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, boost::function note) const +PictureAsset::descriptor_equals ( + ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function note + ) const { - if (!MXFAsset::equals (other, opt, note)) { - return false; - } - - ASDCP::JP2K::MXFReader reader_A; - if (ASDCP_FAILURE (reader_A.OpenRead (path().string().c_str()))) { - 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()))) { - 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))) { - boost::throw_exception (DCPReadError ("could not read video MXF information")); - } - ASDCP::JP2K::PictureDescriptor desc_B; - if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) { - 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 || - 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 + 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 (desc_A.ImageComponents[j] != desc_B.ImageComponents[j]) { +// if (a.ImageComponents[j] != b.ImageComponents[j]) { // notes.pack_start ("video MXF picture descriptors differ"); // } // } @@ -138,176 +121,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, - Size size) - : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size) -{ - construct (get_path); -} - -MonoPictureAsset::MonoPictureAsset ( - vector const & files, - string directory, - string mxf_name, - boost::signals2::signal* progress, - int fps, - int intrinsic_duration, - Size size) - : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size) -{ - construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files)); -} - -MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size) - : PictureAsset (directory, mxf_name, 0, fps, 0, 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) -{ - 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); - - 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, 0, 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)); -} - - -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) { - 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, @@ -321,30 +134,25 @@ PictureAsset::frame_buffer_equals ( } /* 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) { - note (ERROR, "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) { + 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); } @@ -364,168 +172,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) { - note (ERROR, "mean or standard deviation out of range for " + lexical_cast(frame)); - return false; - } - note (NOTE, "mean difference " + lexical_cast (mean) + ", deviation " + lexical_cast (std_dev)); - 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()))) { - 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) -{ - /* XXX: can't we use a shared_ptr here? */ - return shared_ptr (new MonoPictureAssetWriter (this, overwrite)); -} - -FrameInfo::FrameInfo (istream& s) -{ - s >> offset >> size >> hash; -} - -void -FrameInfo::write (ostream& s) -{ - s << offset << " " << size << " " << hash; -} - -struct MonoPictureAssetWriter::ASDCPState -{ - ASDCPState() - : frame_buffer (4 * Kumu::Megabyte) - {} - - ASDCP::JP2K::CodestreamParser j2k_parser; - ASDCP::JP2K::FrameBuffer frame_buffer; - ASDCP::JP2K::MXFWriter mxf_writer; - ASDCP::WriterInfo writer_info; - ASDCP::JP2K::PictureDescriptor picture_descriptor; -}; - - -/** @param a Asset to write to. `a' must not be deleted while - * this writer class still exists, or bad things will happen. - */ -MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* a, bool overwrite) - : _state (new MonoPictureAssetWriter::ASDCPState) - , _asset (a) - , _frames_written (0) - , _started (false) - , _finalized (false) - , _overwrite (overwrite) -{ - -} - - -void -MonoPictureAssetWriter::start (uint8_t* data, int size) -{ - if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) { - boost::throw_exception (MiscError ("could not parse J2K frame")); - } - - _state->j2k_parser.FillPictureDescriptor (_state->picture_descriptor); - _state->picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1); - - MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid()); - - if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite ( - _asset->path().string().c_str(), - _state->writer_info, - _state->picture_descriptor, - 16384, - _overwrite) - )) { + 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) + ); - boost::throw_exception (MXFFileError ("could not open MXF file for writing", _asset->path().string())); - } - - _started = true; -} - -FrameInfo -MonoPictureAssetWriter::write (uint8_t* data, int size) -{ - assert (!_finalized); - - if (!_started) { - start (data, size); + return false; } - if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) { - boost::throw_exception (MiscError ("could not parse J2K frame")); - } - - uint64_t const before_offset = _state->mxf_writer.Tell (); - - string hash; - if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0, &hash))) { - boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string())); + 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; } - ++_frames_written; - return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash); + return true; } -void -MonoPictureAssetWriter::fake_write (int size) +string +PictureAsset::key_type () const { - assert (_started); - assert (!_finalized); - - if (ASDCP_FAILURE (_state->mxf_writer.FakeWriteFrame (size))) { - boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string())); - } - - ++_frames_written; + return "MDIK"; } -void -MonoPictureAssetWriter::finalize () -{ - assert (!_finalized); - - if (ASDCP_FAILURE (_state->mxf_writer.Finalize())) { - boost::throw_exception (MXFFileError ("error in finalizing video MXF", _asset->path().string())); - } - _finalized = true; - _asset->set_intrinsic_duration (_frames_written); - _asset->set_duration (_frames_written); -} -MonoPictureAssetWriter::~MonoPictureAssetWriter () -{ - assert (_finalized); -}