Always add FFOC and LFOC markers (#1805).

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 87037f51fb97169a6293e302d262e6aadc19e136..3d822c5ea5142c52b8ae24799b1f52572c179738 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -2062,3 +2062,17 @@ InfoFileHandle::~InfoFileHandle ()
 {
        fclose (_handle);
 }
+
+
+/** Add FFOC and LFOC markers to a list if they are not already there */
+void
+Film::add_ffoc_lfoc (Markers& markers) const
+{
+       if (markers.find(dcp::Marker::FFOC) == markers.end()) {
+               markers[dcp::Marker::FFOC] = dcpomatic::DCPTime(0);
+       }
+
+       if (markers.find(dcp::Marker::LFOC) == markers.end()) {
+               markers[dcp::Marker::LFOC] = length() - DCPTime::from_frames(1, video_frame_rate());
+       }
+}

diff --git a/src/lib/film.h b/src/lib/film.h
index 887433bea2456b3f9b271ff386b423c7ec7622bf..4854d2ae72ef466d123bd813ff71d429c7055084 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -327,8 +327,10 @@ public:
                return _reencode_j2k;
        }
 
+       typedef std::map<dcp::Marker, dcpomatic::DCPTime> Markers;
+
        boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
-       std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
+       Markers markers () const {
                return _markers;
        }
 
@@ -418,6 +420,8 @@ public:
        void set_distributor (std::string d);
        void set_luminance (dcp::Luminance l);
 
+       void add_ffoc_lfoc (Markers& markers) const;
+
        /** Emitted when some property has of the Film is about to change or has changed */
        mutable boost::signals2::signal<void (ChangeType, Property)> Change;
 

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 7ed79d818128ecf1a1f34553e2f57e0683ec1ae3..0ea4d1563e3061a5866b2ab3a13cfa92506f53c4 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -606,9 +606,10 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                a->set_language (i->first.language);
        }
 
-       map<dcp::Marker, DCPTime> markers = _film->markers ();
-       map<dcp::Marker, DCPTime> reel_markers;
-       for (map<dcp::Marker, DCPTime>::const_iterator i = markers.begin(); i != markers.end(); ++i) {
+       Film::Markers markers = _film->markers ();
+       _film->add_ffoc_lfoc (markers);
+       Film::Markers reel_markers;
+       for (Film::Markers::const_iterator i = markers.begin(); i != markers.end(); ++i) {
                if (_period.contains(i->second)) {
                        reel_markers[i->first] = i->second;
                }

diff --git a/test/markers_test.cc b/test/markers_test.cc
new file mode 100644 (file)
index 0000000..f187057
--- /dev/null
+++ b/test/markers_test.cc
@@ -0,0 +1,103 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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.
+
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+/** @file  test/markers_test
+ *  @brief Test SMPTE markers.
+ *  @ingroup feature
+ */
+
+
+#include "lib/content_factory.h"
+#include "lib/film.h"
+#include "test.h"
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <dcp/reel_markers_asset.h>
+#include <dcp/reel.h>
+#include <boost/test/unit_test.hpp>
+
+
+using std::string;
+using boost::optional;
+using boost::shared_ptr;
+
+
+/** Check that FFOC and LFOC are automatically added if not specified */
+BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
+{
+       string const name = "automatic_ffoc_lfoc_markers_test1";
+       shared_ptr<Film> film = new_test_film2 (name);
+       film->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       film->set_interop (false);
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name()));
+       dcp.read ();
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+       shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+       BOOST_REQUIRE_EQUAL (cpl->reels().size(), 1);
+       shared_ptr<dcp::Reel> reel = cpl->reels().front();
+       shared_ptr<dcp::ReelMarkersAsset> markers = reel->main_markers();
+       BOOST_REQUIRE (markers);
+
+       optional<dcp::Time> ffoc = markers->get (dcp::Marker::FFOC);
+       BOOST_REQUIRE (ffoc);
+       BOOST_CHECK (*ffoc == dcp::Time (0, 0, 0, 0, 24));
+       optional<dcp::Time> lfoc = markers->get (dcp::Marker::LFOC);
+       BOOST_REQUIRE (lfoc);
+       BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 23, 24));
+}
+
+
+/** Check that FFOC and LFOC are not overridden if they are specified */
+BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2)
+{
+       string const name = "automatic_ffoc_lfoc_markers_test2";
+       shared_ptr<Film> film = new_test_film2 (name);
+       film->examine_and_add_content (content_factory("test/data/flat_red.png").front());
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       film->set_interop (false);
+       film->set_marker (dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1));
+       film->set_marker (dcp::Marker::LFOC, dcpomatic::DCPTime::from_seconds(9));
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name()));
+       dcp.read ();
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+       shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
+       BOOST_REQUIRE_EQUAL (cpl->reels().size(), 1);
+       shared_ptr<dcp::Reel> reel = cpl->reels().front();
+       shared_ptr<dcp::ReelMarkersAsset> markers = reel->main_markers();
+       BOOST_REQUIRE (markers);
+
+       optional<dcp::Time> ffoc = markers->get (dcp::Marker::FFOC);
+       BOOST_REQUIRE (ffoc);
+       BOOST_CHECK (*ffoc == dcp::Time (0, 0, 1, 0, 24));
+       optional<dcp::Time> lfoc = markers->get (dcp::Marker::LFOC);
+       BOOST_REQUIRE (lfoc);
+       BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 0, 24));
+}
+

diff --git a/test/wscript b/test/wscript
index 176f4ca675ed70d5b99b91538fceff53039683a2..aa535ba271fd7e9ccc1a33490fdac20508e28f2b 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -94,6 +94,7 @@ def build(bld):
                  job_test.cc
                  kdm_naming_test.cc
                  make_black_test.cc
+                 markers_test.cc
                  no_use_video_test.cc
                  optimise_stills_test.cc
                  pixel_formats_test.cc