It seems that <FrameRate> of 96 is ok for 48fps 3D.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 4b42ec0e686cf74b83ba65be3538c668c119eead..0a9a4b6375dda38636aeaeaf8a27443ab11b5062 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -42,6 +42,7 @@
 #include "reel_stereo_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
+#include "reel_markers_asset.h"
 #include "decrypted_kdm_key.h"
 #include "decrypted_kdm.h"
 #include "interop_subtitle_asset.h"
@@ -84,6 +85,11 @@ Reel::Reel (boost::shared_ptr<const cxml::Node> node)
                _main_subtitle.reset (new ReelSubtitleAsset (main_subtitle));
        }
 
+       shared_ptr<cxml::Node> main_markers = asset_list->optional_node_child ("MainMarkers");
+       if (main_markers) {
+               _main_markers.reset (new ReelMarkersAsset (main_markers));
+       }
+
        /* XXX: it's not ideal that we silently tolerate Interop or SMPTE nodes here */
        /* XXX: not sure if Interop supports multiple closed captions */
        list<shared_ptr<cxml::Node> > closed_captions = asset_list->node_children ("MainClosedCaption");
@@ -110,6 +116,10 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
        reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
        xmlpp::Element* asset_list = reel->add_child ("AssetList");
 
+       if (_main_markers) {
+               _main_markers->write_to_cpl (asset_list, standard);
+       }
+
        if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) {
                /* Mono pictures come before other stuff... */
                _main_picture->write_to_cpl (asset_list, standard);
@@ -167,6 +177,10 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHand
                return false;
        }
 
+       if (_main_markers && !_main_markers->equals (other->_main_markers, opt, note)) {
+               return false;
+       }
+
        if (_closed_captions.size() != other->_closed_captions.size()) {
                return false;
        }
@@ -250,6 +264,7 @@ Reel::add (shared_ptr<ReelAsset> asset)
        shared_ptr<ReelPictureAsset> p = dynamic_pointer_cast<ReelPictureAsset> (asset);
        shared_ptr<ReelSoundAsset> so = dynamic_pointer_cast<ReelSoundAsset> (asset);
        shared_ptr<ReelSubtitleAsset> su = dynamic_pointer_cast<ReelSubtitleAsset> (asset);
+       shared_ptr<ReelMarkersAsset> m = dynamic_pointer_cast<ReelMarkersAsset> (asset);
        shared_ptr<ReelClosedCaptionAsset> c = dynamic_pointer_cast<ReelClosedCaptionAsset> (asset);
        shared_ptr<ReelAtmosAsset> a = dynamic_pointer_cast<ReelAtmosAsset> (asset);
        if (p) {
@@ -258,6 +273,8 @@ Reel::add (shared_ptr<ReelAsset> asset)
                _main_sound = so;
        } else if (su) {
                _main_subtitle = su;
+       } else if (m) {
+               _main_markers = m;
        } else if (c) {
                _closed_captions.push_back (c);
        } else if (a) {
@@ -311,19 +328,22 @@ Reel::duration () const
        int64_t d = 0;
 
        if (_main_picture) {
-               d = max (d, _main_picture->duration ());
+               d = max (d, _main_picture->actual_duration());
        }
        if (_main_sound) {
-               d = max (d, _main_sound->duration ());
+               d = max (d, _main_sound->actual_duration());
        }
        if (_main_subtitle) {
-               d = max (d, _main_subtitle->duration ());
+               d = max (d, _main_subtitle->actual_duration());
+       }
+       if (_main_markers) {
+               d = max (d, _main_markers->actual_duration());
        }
        BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
-               d = max (d, i->duration());
+               d = max (d, i->actual_duration());
        }
        if (_atmos) {
-               d = max (d, _atmos->duration ());
+               d = max (d, _atmos->actual_duration());
        }
 
        return d;