X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_asset.cc;h=46e0bd3c9ce2600fc4d21f0028831522c24290f4;hb=bec7cbcc015814452690a0f702cc41b6f5f56311;hp=8e03b5c4046d93eb30174b7addfb4746a73945c1;hpb=59886567974bd3e79d30a4a9425d86d50bf425f3;p=libdcp.git diff --git a/src/reel_asset.cc b/src/reel_asset.cc index 8e03b5c4..46e0bd3c 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-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,21 +17,28 @@ */ +/** @file src/reel_asset.cc + * @brief ReelAsset class. + */ + +#include "raw_convert.h" #include "reel_asset.h" -#include "content.h" +#include "asset.h" #include "compose.hpp" #include +#include +#include using std::pair; +using std::cout; using std::string; +using std::stringstream; using std::make_pair; using boost::shared_ptr; -using boost::lexical_cast; using namespace dcp; ReelAsset::ReelAsset () - : Object (make_uuid ()) - , _content (_id) + : _asset_ref (_id) , _edit_rate (Fraction (24, 1)) , _intrinsic_duration (0) , _entry_point (0) @@ -40,45 +47,45 @@ ReelAsset::ReelAsset () } -ReelAsset::ReelAsset (shared_ptr content, int64_t entry_point) - : Object (content->id ()) - , _content (content) - , _edit_rate (content->edit_rate ()) - , _intrinsic_duration (content->intrinsic_duration ()) +/** Construct a ReelAsset. + * @param asset Asset that this ReelAsset refers to. + * @param edit_rate Edit rate for the asset. + * @param intrinsic_duration Intrinsic duration of this asset. + * @param entry_point Entry point to use in that asset. + */ +ReelAsset::ReelAsset (shared_ptr asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point) + : Object (asset->id ()) + , _asset_ref (asset) + , _edit_rate (edit_rate) + , _intrinsic_duration (intrinsic_duration) , _entry_point (entry_point) - , _duration (_intrinsic_duration - _entry_point) - , _hash (make_digest (content->file (), 0)) + , _duration (intrinsic_duration - entry_point) + , _hash (make_digest (asset->file (), 0)) { - + /* default _annotation_text to the leaf name of our file */ + _annotation_text = asset->file().leaf().string (); } ReelAsset::ReelAsset (shared_ptr node) : Object (node->string_child ("Id")) - , _content (_id) + , _asset_ref (_id) , _annotation_text (node->optional_string_child ("AnnotationText").get_value_or ("")) , _edit_rate (Fraction (node->string_child ("EditRate"))) , _intrinsic_duration (node->number_child ("IntrinsicDuration")) , _entry_point (node->number_child ("EntryPoint")) , _duration (node->number_child ("Duration")) - , _hash (node->string_child ("Hash")) - , _key_id (node->optional_string_child ("KeyId").get_value_or ("")) + , _hash (node->optional_string_child ("Hash").get_value_or ("")) { if (_id.length() > 9) { _id = _id.substr (9); - _content.set_id (_id); - } - - if (_key_id.length() > 9) { - _key_id = _key_id.substr (9); + _asset_ref.set_id (_id); } - - node->done (); } void -ReelAsset::write_to_cpl (xmlpp::Node* node, Standard) const +ReelAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const { - pair const attr = cpl_node_attribute (); + pair const attr = cpl_node_attribute (standard); xmlpp::Element* a = node->add_child (cpl_node_name ()); if (!attr.first.empty ()) { a->set_attribute (attr.first, attr.second); @@ -86,16 +93,64 @@ ReelAsset::write_to_cpl (xmlpp::Node* node, Standard) const a->add_child("Id")->add_child_text ("urn:uuid:" + _id); a->add_child("AnnotationText")->add_child_text (_annotation_text); a->add_child("EditRate")->add_child_text (String::compose ("%1 %2", _edit_rate.numerator, _edit_rate.denominator)); - a->add_child("IntrinsicDuration")->add_child_text (lexical_cast (_intrinsic_duration)); - a->add_child("EntryPoint")->add_child_text (lexical_cast (_entry_point)); - a->add_child("Duration")->add_child_text (lexical_cast (_duration)); - if (!_key_id.empty ()) { - a->add_child("KeyId")->add_child_text ("urn:uuid:" + _key_id); - } + a->add_child("IntrinsicDuration")->add_child_text (raw_convert (_intrinsic_duration)); + a->add_child("EntryPoint")->add_child_text (raw_convert (_entry_point)); + a->add_child("Duration")->add_child_text (raw_convert (_duration)); + a->add_child("Hash")->add_child_text (_asset_ref.object()->hash ()); } pair -ReelAsset::cpl_node_attribute () const +ReelAsset::cpl_node_attribute (Standard) const { return make_pair ("", ""); } + +bool +ReelAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const +{ + if (_annotation_text != other->_annotation_text) { + stringstream s; + s << "Reel: annotation texts differ (" << _annotation_text << " vs " << other->_annotation_text << ")\n"; + if (!opt.reel_annotation_texts_can_differ) { + note (DCP_ERROR, s.str ()); + return false; + } else { + note (DCP_NOTE, s.str ()); + } + } + + if (_edit_rate != other->_edit_rate) { + note (DCP_ERROR, "Reel: edit rates differ"); + return false; + } + + if (_intrinsic_duration != other->_intrinsic_duration) { + note (DCP_ERROR, String::compose ("Reel: intrinsic durations differ (%1 vs %2)", _intrinsic_duration, other->_intrinsic_duration)); + return false; + } + + if (_entry_point != other->_entry_point) { + note (DCP_ERROR, "Reel: entry points differ"); + return false; + } + + if (_duration != other->_duration) { + note (DCP_ERROR, "Reel: durations differ"); + return false; + } + + if (_hash != other->_hash) { + if (!opt.reel_hashes_can_differ) { + note (DCP_ERROR, "Reel: hashes differ"); + return false; + } else { + note (DCP_NOTE, "Reel: hashes differ"); + } + } + + if (_asset_ref.resolved () && other->_asset_ref.resolved ()) { + return _asset_ref->equals (other->_asset_ref.object (), opt, note); + } + + return true; +}