X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_picture_asset.cc;h=de106c794befacb78ef475958aa3b3b858f60eff;hb=b80f65a2f7cf3e8a02fe0ad8bebb19640f63b5d2;hp=6bac3bce5f47d21fe3563f8cd72a2d460f28a608;hpb=765a960ea8bb9d829d625901662f54c60f954f3d;p=libdcp.git diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc index 6bac3bce..de106c79 100644 --- a/src/reel_picture_asset.cc +++ b/src/reel_picture_asset.cc @@ -1,39 +1,55 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2016 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/reel_picture_asset.h * @brief ReelPictureAsset class. */ -#include "content.h" #include "reel_picture_asset.h" -#include "picture_mxf.h" +#include "picture_asset.h" #include "dcp_assert.h" +#include "raw_convert.h" #include "compose.hpp" #include +#include #include +#include using std::bad_cast; using std::string; -using std::stringstream; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; using namespace dcp; ReelPictureAsset::ReelPictureAsset () @@ -43,54 +59,74 @@ ReelPictureAsset::ReelPictureAsset () } -ReelPictureAsset::ReelPictureAsset (shared_ptr content, int64_t entry_point) - : ReelMXFAsset (content, content->edit_rate(), content->intrinsic_duration(), entry_point) - , _frame_rate (content->frame_rate ()) - , _screen_aspect_ratio (content->screen_aspect_ratio ()) +ReelPictureAsset::ReelPictureAsset (shared_ptr asset, int64_t entry_point) + : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point) + , ReelMXF (asset->key_id()) + , _frame_rate (asset->frame_rate ()) + , _screen_aspect_ratio (asset->screen_aspect_ratio ()) { - + } ReelPictureAsset::ReelPictureAsset (shared_ptr node) - : ReelMXFAsset (node) + : ReelAsset (node) + , ReelMXF (node) { _frame_rate = Fraction (node->string_child ("FrameRate")); try { _screen_aspect_ratio = Fraction (node->string_child ("ScreenAspectRatio")); } catch (XMLError& e) { - /* Maybe it's not a fraction */ - } - try { - float f = node->number_child ("ScreenAspectRatio"); - _screen_aspect_ratio = Fraction (f * 1000, 1000); - } catch (bad_cast& e) { + /* It's not a fraction */ + try { + float f = node->number_child ("ScreenAspectRatio"); + _screen_aspect_ratio = Fraction (f * 1000, 1000); + } catch (bad_cast& e) { + } } } void ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { - ReelMXFAsset::write_to_cpl (node, standard); + ReelAsset::write_to_cpl (node, standard); - 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; - } + /* Find */ + xmlpp::Node* mp = find_child (node, cpl_node_name ()); - DCP_ASSERT (i != c.end ()); - - (*i)->add_child ("FrameRate")->add_child_text (String::compose ("%1 %2", _frame_rate.numerator, _frame_rate.denominator)); + mp->add_child ("FrameRate")->add_child_text (String::compose ("%1 %2", _frame_rate.numerator, _frame_rate.denominator)); if (standard == INTEROP) { - stringstream s; - s << std::fixed << std::setprecision (2) << (float (_screen_aspect_ratio.numerator) / _screen_aspect_ratio.denominator); - (*i)->add_child ("ScreenAspectRatio")->add_child_text (s.str ()); + + /* Allowed values for this tag from the standard */ + float allowed[] = { 1.33, 1.66, 1.77, 1.85, 2.00, 2.39 }; + int const num_allowed = sizeof(allowed) / sizeof(float); + + /* Actual ratio */ + float ratio = float (_screen_aspect_ratio.numerator) / _screen_aspect_ratio.denominator; + + /* Pick the closest and use that */ + optional closest; + optional error; + for (int i = 0; i < num_allowed; ++i) { + float const e = fabsf (allowed[i] - ratio); + if (!closest || e < error.get()) { + closest = allowed[i]; + error = e; + } + } + + mp->add_child ("ScreenAspectRatio")->add_child_text (raw_convert (closest.get(), 2, true)); } else { - (*i)->add_child ("ScreenAspectRatio")->add_child_text ( + mp->add_child ("ScreenAspectRatio")->add_child_text ( String::compose ("%1 %2", _screen_aspect_ratio.numerator, _screen_aspect_ratio.denominator) ); } + + if (key_id ()) { + /* Find */ + xmlpp::Node* hash = find_child (mp, "Hash"); + mp->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id().get ()); + } } string @@ -105,7 +141,7 @@ ReelPictureAsset::equals (shared_ptr other, EqualityOptions opt if (!ReelAsset::equals (other, opt, note)) { return false; } - + shared_ptr rpa = dynamic_pointer_cast (other); if (!rpa) { return false;