Assorted fixes to queue management.

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index b135f4321c2729a4d1c5ea761e0f219a19bbf331..8ee6293094c1397d58ef8a7384a94cde58aff9d4 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -74,8 +74,9 @@ Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
        , _thread (0)
        , _finish (false)
        , _queued_full_in_memory (0)
-       , _maximum_frames_in_memory (0)
-       , _maximum_queue_size (0)
+       /* These will be reset to sensible values when J2KEncoder is created */
+       , _maximum_frames_in_memory (8)
+       , _maximum_queue_size (8)
        , _full_written (0)
        , _fake_written (0)
        , _repeat_written (0)
@@ -201,7 +202,12 @@ Writer::fake_write (Frame frame, Eyes eyes)
        boost::mutex::scoped_lock lock (_state_mutex);
 
        while (_queue.size() > _maximum_queue_size) {
-               /* The queue is too big; wait until that is sorted out */
+               /* The queue is too big; wait until that is sorted out.  We're assuming here
+                  that it will be sorted out either by time or by a necessary full-written
+                  frame being given to us.  fake_write() must be called more-or-less in
+                  order or this will deadlock due to the main write thread waiting for
+                  a frame that never arrives because we're waiting here.
+               */
                _full_condition.wait (lock);
        }
 
@@ -342,8 +348,6 @@ try
                                break;
                        }
 
-                       DCPOMATIC_ASSERT (_queue.size() < _maximum_queue_size);
-
                        /* Nothing to do: wait until something happens which may indicate that we do */
                        LOG_TIMING (N_("writer-sleep queue=%1"), _queue.size());
                        _empty_condition.wait (lock);
@@ -714,8 +718,9 @@ operator== (QueueItem const & a, QueueItem const & b)
 void
 Writer::set_encoder_threads (int threads)
 {
+       boost::mutex::scoped_lock lm (_state_mutex);
        _maximum_frames_in_memory = lrint (threads * Config::instance()->frames_in_memory_multiplier());
-       _maximum_queue_size = lrint (threads * 16);
+       _maximum_queue_size = threads * 16;
 }
 
 void

diff --git a/test/player_test.cc b/test/player_test.cc
index 6a6864dbaf6e0eb77f2e7c4a8385d1b6272341d8..52f3097cbf891f8963db5ad838884f11ef17e108 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -263,3 +263,22 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
                check_image(String::compose("test/data/player_seek_test2_%1.png", i), String::compose("build/test/player_seek_test2_%1.png", i), 0.011);
        }
 }
+
+/** Test a bug when trimmed content follows other content */
+BOOST_AUTO_TEST_CASE (player_trim_test)
+{
+       shared_ptr<Film> film = new_test_film2 ("player_trim_test");
+       shared_ptr<Content> A = content_factory(film, "test/data/flat_red.png").front();
+       film->examine_and_add_content (A);
+       BOOST_REQUIRE (!wait_for_jobs ());
+       A->video->set_length (10 * 24);
+       shared_ptr<Content> B = content_factory(film, "test/data/flat_red.png").front();
+       film->examine_and_add_content (B);
+       BOOST_REQUIRE (!wait_for_jobs ());
+       B->video->set_length (10 * 24);
+       B->set_position (DCPTime::from_seconds (10));
+       B->set_trim_start (ContentTime::from_seconds (2));
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs ());
+}