No-op; variable renaming.

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index e8ab5452bd404ec8a5c10cdb49ee761a8ad29f20..776ccd118eb2beadef66c0a15ad605284dc908b2 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@
  *  @brief Parent class for classes which can encode video and audio frames.
  */
 
-#include <iostream>
-#include <boost/lambda/lambda.hpp>
-#include <libcxml/cxml.h>
 #include "encoder.h"
 #include "util.h"
 #include "film.h"
@@ -36,6 +33,10 @@
 #include "server_finder.h"
 #include "player.h"
 #include "player_video.h"
+#include "data.h"
+#include <libcxml/cxml.h>
+#include <boost/lambda/lambda.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -45,7 +46,6 @@
 
 using std::pair;
 using std::string;
-using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
@@ -59,10 +59,10 @@ using boost::scoped_array;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j, shared_ptr<Writer> writer)
-       : _film (f)
+Encoder::Encoder (shared_ptr<const Film> film, weak_ptr<Job> j, shared_ptr<Writer> writer)
+       : _film (film)
        , _job (j)
-       , _video_frames_out (0)
+       , _video_frames_enqueued (0)
        , _terminate (false)
        , _writer (writer)
 {
@@ -81,10 +81,12 @@ Encoder::~Encoder ()
 void
 Encoder::add_worker_threads (ServerDescription d)
 {
-       LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), d.host_name ());
+       LOG_GENERAL (N_("Adding %1 worker threads for remote %2"), d.threads(), d.host_name ());
        for (int i = 0; i < d.threads(); ++i) {
                _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
        }
+
+       _writer->set_encoder_threads (_threads.size ());
 }
 
 void
@@ -94,7 +96,11 @@ Encoder::begin ()
                _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
        }
 
-       ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
+       _writer->set_encoder_threads (_threads.size ());
+
+       if (!ServerFinder::instance()->disabled ()) {
+               _server_found_connection = ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
+       }
 }
 
 void
@@ -128,7 +134,11 @@ Encoder::end ()
        for (list<shared_ptr<DCPVideo> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
                LOG_GENERAL (N_("Encode left-over frame %1"), (*i)->index ());
                try {
-                       _writer->write ((*i)->encode_locally(), (*i)->index (), (*i)->eyes ());
+                       _writer->write (
+                               (*i)->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)),
+                               (*i)->index (),
+                               (*i)->eyes ()
+                               );
                        frame_done ();
                } catch (std::exception& e) {
                        LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
@@ -158,7 +168,7 @@ int
 Encoder::video_frames_out () const
 {
        boost::mutex::scoped_lock (_state_mutex);
-       return _video_frames_out;
+       return _video_frames_enqueued;
 }
 
 /** Should be called when a frame has been encoded successfully.
@@ -177,8 +187,11 @@ Encoder::frame_done ()
        }
 }
 
+/** Called in order, so each time this is called the supplied frame is the one
+ *  after the previous one.
+ */
 void
-Encoder::enqueue (shared_ptr<PlayerVideo> pvf)
+Encoder::enqueue (shared_ptr<PlayerVideo> pv)
 {
        _waker.nudge ();
        
@@ -204,18 +217,22 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pvf)
        */
        rethrow ();
 
-       if (_writer->can_fake_write (_video_frames_out)) {
-               _writer->fake_write (_video_frames_out, pvf->eyes ());
+       if (_writer->can_fake_write (_video_frames_enqueued)) {
+               /* We can fake-write this frame */
+               _writer->fake_write (_video_frames_enqueued, pv->eyes ());
                frame_done ();
-       } else if (pvf->has_j2k ()) {
-               _writer->write (pvf->j2k(), _video_frames_out, pvf->eyes ());
+       } else if (pv->has_j2k ()) {
+               /* This frame already has JPEG2000 data, so just write it */
+               _writer->write (pv->j2k(), _video_frames_enqueued, pv->eyes ());
+       } else if (_last_player_video && pv->same (_last_player_video)) {
+               _writer->repeat (_video_frames_enqueued, pv->eyes ());
        } else {
                /* Queue this new frame for encoding */
                LOG_TIMING ("adding to queue of %1", _queue.size ());
                _queue.push_back (shared_ptr<DCPVideo> (
                                          new DCPVideo (
-                                                 pvf,
-                                                 _video_frames_out,
+                                                 pv,
+                                                 _video_frames_enqueued,
                                                  _film->video_frame_rate(),
                                                  _film->j2k_bandwidth(),
                                                  _film->resolution(),
@@ -230,9 +247,11 @@ Encoder::enqueue (shared_ptr<PlayerVideo> pvf)
                _empty_condition.notify_all ();
        }
 
-       if (pvf->eyes() != EYES_LEFT) {
-               ++_video_frames_out;
+       if (pv->eyes() != EYES_LEFT) {
+               ++_video_frames_enqueued;
        }
+
+       _last_player_video = pv;
 }
 
 void
@@ -284,12 +303,13 @@ try
                
                lock.unlock ();
 
-               shared_ptr<EncodedData> encoded;
+               optional<Data> encoded;
 
+               /* We need to encode this input */
                if (server) {
                        try {
                                encoded = vf->encode_remotely (server.get ());
-
+                               
                                if (remote_backoff > 0) {
                                        LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ());
                                }
@@ -307,11 +327,11 @@ try
                                        vf->index(), server->host_name(), e.what(), remote_backoff
                                        );
                        }
-                               
+                       
                } else {
                        try {
                                LOG_TIMING ("[%1] encoder thread begins local encode of %2", boost::this_thread::get_id(), vf->index());
-                               encoded = vf->encode_locally ();
+                               encoded = vf->encode_locally (boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
                                LOG_TIMING ("[%1] encoder thread finishes local encode of %2", boost::this_thread::get_id(), vf->index());
                        } catch (std::exception& e) {
                                LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
@@ -319,7 +339,7 @@ try
                }
 
                if (encoded) {
-                       _writer->write (encoded, vf->index (), vf->eyes ());
+                       _writer->write (encoded.get(), vf->index (), vf->eyes ());
                        frame_done ();
                } else {
                        lock.lock ();