Allow content parts to not be preset in XML.

[dcpomatic.git] / src / lib / writer.cc

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 675f210e9e469535a10c30385974d194bccc0d3a..ea8a2e89f821341666a46267a5c2918595c8cac7 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -473,11 +473,11 @@ Writer::finish ()
 
        BOOST_FOREACH (ReelWriter& i, _reels) {
 
-               cpl->add (i.create_reel (_reel_assets, _fonts));
-
                shared_ptr<Job> job = _job.lock ();
                DCPOMATIC_ASSERT (job);
                i.calculate_digests (job);
+
+               cpl->add (i.create_reel (_reel_assets, _fonts));
        }
 
        dcp::XMLMetadata meta;
@@ -543,8 +543,20 @@ Writer::write (PlayerSubtitles subs)
 void
 Writer::write (list<shared_ptr<Font> > fonts)
 {
-       /* Just keep a list of fonts and we'll deal with them in ::finish */
-       copy (fonts.begin (), fonts.end (), back_inserter (_fonts));
+       /* Just keep a list of unique fonts and we'll deal with them in ::finish */
+
+       BOOST_FOREACH (shared_ptr<Font> i, fonts) {
+               bool got = false;
+               BOOST_FOREACH (shared_ptr<Font> j, _fonts) {
+                       if (*i == *j) {
+                               got = true;
+                       }
+               }
+
+               if (!got) {
+                       _fonts.push_back (i);
+               }
+       }
 }
 
 bool
@@ -570,7 +582,16 @@ operator== (QueueItem const & a, QueueItem const & b)
 void
 Writer::set_encoder_threads (int threads)
 {
-       _maximum_frames_in_memory = lrint (threads * 1.1);
+       /* I think the scaling factor here should be the ratio of the longest frame
+          encode time to the shortest; if the thread count is T, longest time is L
+          and the shortest time S we could encode L/S frames per thread whilst waiting
+          for the L frame to encode so we might have to store LT/S frames.
+
+          However we don't want to use too much memory, so keep it a bit lower than we'd
+          perhaps like.  A J2K frame is typically about 1Mb so 3 here will mean we could
+          use about 240Mb with 72 encoding threads.
+       */
+       _maximum_frames_in_memory = lrint (threads * 3);
 }
 
 void