X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=b3993fceda3c12af35e02c58ab9769fc0c31084a;hb=660f1059c3b2c1ee08cd390cf6d5a0b5900a7edc;hp=12032328522c20be17c95ba8f50152337f23e8a7;hpb=566608b965e8ec0e08d9de128405d22ec7fedcd6;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 12032328..b3993fce 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,26 +17,23 @@ */ -/** @file src/picture_asset.cc - * @brief An asset made up of JPEG2000 files - */ - -#include -#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 "xyz_frame.h" +#include "openjpeg_image.h" #include "picture_asset_writer.h" +#include "dcp_assert.h" +#include "compose.hpp" +#include "AS_DCP.h" +#include "KM_fileio.h" +#include "j2k.h" +#include +#include +#include +#include +#include +#include +#include using std::string; using std::ostream; @@ -49,93 +46,68 @@ 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; +using namespace dcp; -PictureAsset::PictureAsset (boost::filesystem::path directory, string mxf_name) - : MXFAsset (directory, mxf_name) +PictureAsset::PictureAsset (boost::filesystem::path file) + : Asset (file) + , _intrinsic_duration (0) { } -void -PictureAsset::write_to_cpl (xmlpp::Element* node, bool interop) const +PictureAsset::PictureAsset (Fraction edit_rate) + : _edit_rate (edit_rate) + , _intrinsic_duration (0) { - 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)); - } +void +PictureAsset::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & desc) +{ + _size.width = desc.StoredWidth; + _size.height = desc.StoredHeight; + _edit_rate = Fraction (desc.EditRate.Numerator, desc.EditRate.Denominator); + _intrinsic_duration = desc.ContainerDuration; + _frame_rate = Fraction (desc.SampleRate.Numerator, desc.SampleRate.Denominator); + _screen_aspect_ratio = Fraction (desc.AspectRatio.Numerator, desc.AspectRatio.Denominator); } 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, NoteHandler 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.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"); + + note (DCP_ERROR, "video MXF picture descriptors differ"); return false; } - if (desc_A.ContainerDuration != desc_B.ContainerDuration) { - note (ERROR, "video container durations differ"); + if (a.ContainerDuration != b.ContainerDuration) { + note (DCP_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"); // } // } @@ -145,33 +117,33 @@ PictureAsset::equals (shared_ptr other, EqualityOptions opt, boost: bool PictureAsset::frame_buffer_equals ( - int frame, EqualityOptions opt, boost::function note, + int frame, EqualityOptions opt, NoteHandler 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"); + note (DCP_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); - + 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 */ - + vector abs_diffs (image_A->size().width * image_A->size().height * 3); int d = 0; int max_diff = 0; - + for (int c = 0; c < 3; ++c) { - + if (image_A->size() != image_B->size()) { - note (ERROR, "image sizes for frame " + lexical_cast(frame) + " differ"); + note (DCP_ERROR, String::compose ("image sizes for frame %1 differ", frame)); return false; } - + 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]); @@ -179,42 +151,38 @@ PictureAsset::frame_buffer_equals ( 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()); - - note (NOTE, "mean difference " + lexical_cast (mean) + ", deviation " + lexical_cast (std_dev)); - + + note (DCP_NOTE, String::compose ("mean difference %1, deviation %2", mean, 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) + DCP_ERROR, + String::compose ("mean %1 out of range %2 in frame %3", mean, opt.max_mean_pixel_error, frame) ); - + return false; } 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) + DCP_ERROR, + String::compose ("standard deviation %1 out of range %2 in frame %3", std_dev, opt.max_std_dev_pixel_error, frame) ); - + return false; } @@ -222,10 +190,14 @@ PictureAsset::frame_buffer_equals ( } string -PictureAsset::key_type () const +PictureAsset::pkl_type (Standard standard) const { - return "MDIK"; + switch (standard) { + case INTEROP: + return "application/x-smpte-mxf;asdcpKind=Picture"; + case SMPTE: + return "application/mxf"; + default: + DCP_ASSERT (false); + } } - - -