Speculative fix for hangs during Encoder::end().

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 06fc81ad75f2e29913d0cbcf6b2b16a5ffd82f35..ef58ca09e6e71b85fb7c0c6e29d192fb3dfb468f 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -43,6 +43,7 @@
 #include "i18n.h"
 
 #define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
 #define LOG_ERROR(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
 #define LOG_TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TYPE_TIMING);
 
@@ -95,12 +96,15 @@ Encoder::end ()
 
        /* Keep waking workers until the queue is empty */
        while (!_queue.empty ()) {
+               rethrow ();
                _empty_condition.notify_all ();
                _full_condition.wait (lock);
        }
 
        lock.unlock ();
 
+       LOG_GENERAL_NC (N_("Terminating encoder threads"));
+
        terminate_threads ();
 
        LOG_GENERAL (N_("Mopping up %1"), _queue.size());
@@ -347,6 +351,7 @@ try
                                LOG_TIMING ("finish-local-encode thread=%1 frame=%2", boost::this_thread::get_id(), vf->index());
                        } catch (std::exception& e) {
                                LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
+                               throw;
                        }
                }
 
@@ -372,6 +377,8 @@ try
 catch (...)
 {
        store_current ();
+       /* Wake anything waiting on _full_condition so it can see the exception */
+       _full_condition.notify_all ();
 }
 
 void