/*
- Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
files in the program, then also delete it here.
*/
-/** @file src/reel_picture_asset.h
- * @brief ReelPictureAsset class.
+
+/** @file src/reel_picture_asset.cc
+ * @brief ReelPictureAsset class
*/
-#include "reel_picture_asset.h"
-#include "picture_asset.h"
+
+#include "compose.hpp"
#include "dcp_assert.h"
+#include "picture_asset.h"
#include "raw_convert.h"
-#include "compose.hpp"
+#include "reel_picture_asset.h"
+#include "warnings.h"
#include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
#include <iomanip>
#include <cmath>
+
using std::bad_cast;
using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
using boost::optional;
using namespace dcp;
-ReelPictureAsset::ReelPictureAsset ()
- : _frame_rate (Fraction (24, 1))
- , _screen_aspect_ratio (Fraction (1998, 1080))
-{
-
-}
ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point)
- : ReelAsset (asset, asset->edit_rate(), asset->intrinsic_duration(), entry_point)
- , ReelMXF (asset->key_id())
+ : ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
, _frame_rate (asset->frame_rate ())
, _screen_aspect_ratio (asset->screen_aspect_ratio ())
{
}
+
ReelPictureAsset::ReelPictureAsset (shared_ptr<const cxml::Node> node)
- : ReelAsset (node)
- , ReelMXF (node)
+ : ReelFileAsset (node)
{
_frame_rate = Fraction (node->string_child ("FrameRate"));
try {
}
}
-void
+
+xmlpp::Node*
ReelPictureAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
{
- ReelAsset::write_to_cpl (node, standard);
+ auto asset = ReelFileAsset::write_to_cpl (node, standard);
- /* Find <MainPicture> */
- xmlpp::Node* mp = find_child (node, cpl_node_name ());
+ asset->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) {
+ if (standard == Standard::INTEROP) {
/* Allowed values for this tag from the standard */
float allowed[] = { 1.33, 1.66, 1.77, 1.85, 2.00, 2.39 };
}
}
- mp->add_child ("ScreenAspectRatio")->add_child_text (raw_convert<string> (closest.get(), 2, true));
+ asset->add_child("ScreenAspectRatio")->add_child_text(raw_convert<string>(closest.get(), 2, true));
} else {
- mp->add_child ("ScreenAspectRatio")->add_child_text (
+ asset->add_child("ScreenAspectRatio")->add_child_text(
String::compose ("%1 %2", _screen_aspect_ratio.numerator, _screen_aspect_ratio.denominator)
);
}
- if (key_id ()) {
- /* Find <Hash> */
- xmlpp::Node* hash = find_child (mp, "Hash");
- mp->add_child_before (hash, "KeyId")->add_child_text ("urn:uuid:" + key_id().get ());
- }
+ return asset;
}
-string
-ReelPictureAsset::key_type () const
-{
- return "MDIK";
-}
bool
-ReelPictureAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const
+ReelPictureAsset::equals (shared_ptr<const ReelPictureAsset> other, EqualityOptions opt, NoteHandler note) const
{
- if (!ReelAsset::equals (other, opt, note)) {
+ if (!asset_equals (other, opt, note)) {
+ return false;
+ }
+ if (!file_asset_equals (other, opt, note)) {
return false;
}
- shared_ptr<const ReelPictureAsset> rpa = dynamic_pointer_cast<const ReelPictureAsset> (other);
+ auto rpa = dynamic_pointer_cast<const ReelPictureAsset>(other);
if (!rpa) {
return false;
}
if (_frame_rate != rpa->_frame_rate) {
- note (DCP_ERROR, "frame rates differ in reel");
+ note (NoteType::ERROR, "frame rates differ in reel");
return false;
}
if (_screen_aspect_ratio != rpa->_screen_aspect_ratio) {
- note (DCP_ERROR, "screen aspect ratios differ in reel");
+ note (NoteType::ERROR, "screen aspect ratios differ in reel");
return false;
}