X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.cc;h=f77ce820c2262e28624b43890fe362f597738227;hb=dd672d926e3b88cbe42b0778fda397d9e858b592;hp=63f59638ef9140e7f26d9cfbc3293f44f5a3367f;hpb=7f24f3e03420004d62d506e67372991823ce6342;p=libdcp.git diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 63f59638..f77ce820 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -1,88 +1,100 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ + /** @file src/picture_asset.cc - * @brief An asset made up of JPEG2000 files + * @brief PictureAsset class */ -#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 "j2k_transcode.h" +#include +#include +#include +#include +#include +#include + 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 (boost::filesystem::path directory, string mxf_name) - : MXFAsset (directory, mxf_name) +using std::shared_ptr; +using namespace dcp; + + +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, Standard standard) + : MXF (standard) + , _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::descriptor_equals ( - ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function note + ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, NoteHandler note ) const { if ( @@ -104,15 +116,15 @@ PictureAsset::descriptor_equals ( // a.CodingStyleDefault != b.CodingStyleDefault || // a.QuantizationDefault != b.QuantizationDefault ) { - - note (ERROR, "video MXF picture descriptors differ"); + + note (NoteType::ERROR, "video MXF picture descriptors differ"); return false; } if (a.ContainerDuration != b.ContainerDuration) { - note (ERROR, "video container durations differ"); + note (NoteType::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"); @@ -122,35 +134,36 @@ PictureAsset::descriptor_equals ( return true; } + 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 (NoteType::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); - + auto image_A = decompress_j2k (const_cast(data_A), size_A, 0); + auto 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 (NoteType::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]); @@ -158,53 +171,61 @@ 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); + for (auto j: abs_diffs) { + 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)); - + + auto const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size()); + + note (NoteType::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) + NoteType::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) + NoteType::ERROR, + String::compose ("standard deviation %1 out of range %2 in frame %3", std_dev, opt.max_std_dev_pixel_error, frame) ); - + return false; } return true; } + string -PictureAsset::key_type () const +PictureAsset::static_pkl_type (Standard standard) { - return "MDIK"; + switch (standard) { + case Standard::INTEROP: + return "application/x-smpte-mxf;asdcpKind=Picture"; + case Standard::SMPTE: + return "application/mxf"; + default: + DCP_ASSERT (false); + } } - +string +PictureAsset::pkl_type (Standard standard) const +{ + return static_pkl_type (standard); +}