Merge master.

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 2ec32deb72e037bdb9d55dd2a2c35a9785787731..d26f776148c74fd34c0ff35abd264857b87e9266 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -34,6 +34,7 @@
 #include "cross.h"
 #include "writer.h"
 #include "server_finder.h"
+#include "player.h"
 
 #include "i18n.h"
 
@@ -46,13 +47,14 @@ using std::cout;
 using std::min;
 using std::make_pair;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::optional;
 using boost::scoped_array;
 
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j)
        : _film (f)
        , _job (j)
        , _video_frames_out (0)
@@ -66,9 +68,6 @@ Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 Encoder::~Encoder ()
 {
        terminate_threads ();
-       if (_writer) {
-               _writer->finish ();
-       }
 }
 
 /** Add a worker thread for a each thread on a remote server.  Caller must hold
@@ -79,9 +78,7 @@ void
 Encoder::add_worker_threads (ServerDescription d)
 {
        for (int i = 0; i < d.threads(); ++i) {
-               _threads.push_back (
-                       make_pair (d, new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)))
-                       );
+               _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
        }
 }
 
@@ -89,26 +86,13 @@ void
 Encoder::process_begin ()
 {
        for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
-               _threads.push_back (
-                       make_pair (
-                               optional<ServerDescription> (),
-                               new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ()))
-                               )
-                       );
-       }
-
-       vector<ServerDescription> servers = Config::instance()->servers ();
-
-       for (vector<ServerDescription>::iterator i = servers.begin(); i != servers.end(); ++i) {
-               add_worker_threads (*i);
+               _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
        }
 
        _writer.reset (new Writer (_film, _job));
-       _server_finder.reset (new ServerFinder ());
-       _server_finder->ServerFound.connect (boost::bind (&Encoder::server_found, this, _1));
+       ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
 }
 
-
 void
 Encoder::process_end ()
 {
@@ -194,7 +178,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
+Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
 {
        boost::mutex::scoped_lock lock (_mutex);
 
@@ -211,9 +195,12 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversi
                return;
        }
 
-       if (_writer->thrown ()) {
-               _writer->rethrow ();
-       }
+       _writer->rethrow ();
+       /* Re-throw any exception raised by one of our threads.  If more
+          than one has thrown an exception, only one will be rethrown, I think;
+          but then, if that happens something has gone badly wrong.
+       */
+       rethrow ();
 
        if (_writer->can_fake_write (_video_frames_out)) {
                _writer->fake_write (_video_frames_out, eyes);
@@ -228,8 +215,8 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversi
                TIMING ("adding to queue of %1", _queue.size ());
                _queue.push_back (shared_ptr<DCPVideoFrame> (
                                          new DCPVideoFrame (
-                                                 image, _video_frames_out, eyes, conversion, _film->video_frame_rate(),
-                                                 _film->j2k_bandwidth(), _film->log()
+                                                 image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
+                                                 _film->j2k_bandwidth(), _film->resolution(), _film->log()
                                                  )
                                          ));
                
@@ -257,11 +244,11 @@ Encoder::terminate_threads ()
                _condition.notify_all ();
        }
 
-       for (ThreadList::iterator i = _threads.begin(); i != _threads.end(); ++i) {
-               if (i->second->joinable ()) {
-                       i->second->join ();
+       for (list<boost::thread *>::iterator i = _threads.begin(); i != _threads.end(); ++i) {
+               if ((*i)->joinable ()) {
+                       (*i)->join ();
                }
-               delete i->second;
+               delete *i;
        }
 
        _threads.clear ();
@@ -269,6 +256,7 @@ Encoder::terminate_threads ()
 
 void
 Encoder::encoder_thread (optional<ServerDescription> server)
+try
 {
        /* Number of seconds that we currently wait between attempts
           to connect to the server; not relevant for localhost
@@ -290,7 +278,7 @@ Encoder::encoder_thread (optional<ServerDescription> server)
 
                TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
                shared_ptr<DCPVideoFrame> vf = _queue.front ();
-               _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ()));
+               TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame(), vf->eyes ());
                _queue.pop_front ();
                
                lock.unlock ();
@@ -350,18 +338,13 @@ Encoder::encoder_thread (optional<ServerDescription> server)
                _condition.notify_all ();
        }
 }
+catch (...)
+{
+       store_current ();
+}
 
 void
 Encoder::server_found (ServerDescription s)
 {
-       /* See if we already know about this server */
-       boost::mutex::scoped_lock lm (_mutex);
-       ThreadList::iterator i = _threads.begin();
-       while (i != _threads.end() && (!i->first || i->first.get().host_name() != s.host_name())) {
-               ++i;
-       }
-       
-       if (i == _threads.end ()) {
-               add_worker_threads (s);
-       }
+       add_worker_threads (s);
 }