Fix typo in log message.

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

diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index c2553854bf5241e193e139987c1f6503956f7892..e6dab582801fd7177ecea144d294510261c9f41a 100644 (file)
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -24,32 +24,31 @@
  */
 
 
-#include "j2k_encoder.h"
-#include "util.h"
-#include "film.h"
-#include "log.h"
-#include "dcpomatic_log.h"
+#include "compose.hpp"
 #include "config.h"
-#include "dcp_video.h"
 #include "cross.h"
-#include "writer.h"
+#include "dcp_video.h"
+#include "dcpomatic_log.h"
+#include "encode_server_description.h"
 #include "encode_server_finder.h"
-#include "player.h"
+#include "film.h"
+#include "j2k_encoder.h"
+#include "log.h"
 #include "player_video.h"
-#include "encode_server_description.h"
-#include "compose.hpp"
+#include "util.h"
+#include "writer.h"
 #include <libcxml/cxml.h>
 #include <iostream>
 
 #include "i18n.h"
 
 
-using std::list;
 using std::cout;
 using std::exception;
+using std::list;
+using std::make_shared;
 using std::shared_ptr;
 using std::weak_ptr;
-using std::make_shared;
 using boost::optional;
 using dcp::Data;
 using namespace dcpomatic;
@@ -77,7 +76,7 @@ J2KEncoder::~J2KEncoder ()
 void
 J2KEncoder::begin ()
 {
-       auto wp = shared_from_this ();
+       weak_ptr<J2KEncoder> wp = shared_from_this ();
        _server_found_connection = EncodeServerFinder::instance()->ServersListChanged.connect (
                boost::bind (&J2KEncoder::call_servers_list_changed, wp)
                );
@@ -135,13 +134,13 @@ J2KEncoder::end ()
             So just mop up anything left in the queue here.
        */
 
-       for (auto i: _queue) {
-               LOG_GENERAL(N_("Encode left-over frame %1"), i->index());
+       for (auto const& i: _queue) {
+               LOG_GENERAL(N_("Encode left-over frame %1"), i.index());
                try {
                        _writer->write (
-                               make_shared<dcp::ArrayData>(i->encode_locally()),
-                               i->index(),
-                               i->eyes()
+                               make_shared<dcp::ArrayData>(i.encode_locally()),
+                               i.index(),
+                               i.eyes()
                                );
                        frame_done ();
                } catch (std::exception& e) {
@@ -237,7 +236,7 @@ J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time)
                LOG_DEBUG_ENCODE("Frame @ %1 ENCODE", to_string(time));
                /* Queue this new frame for encoding */
                LOG_TIMING ("add-frame-to-queue queue=%1", _queue.size ());
-               _queue.push_back (make_shared<DCPVideo>(
+               _queue.push_back (DCPVideo(
                                pv,
                                position,
                                _film->video_frame_rate(),
@@ -283,6 +282,8 @@ void
 J2KEncoder::encoder_thread (optional<EncodeServerDescription> server)
 try
 {
+       start_of_thread ("J2KEncoder");
+
        if (server) {
                LOG_TIMING ("start-encoder-thread thread=%1 server=%2", thread_id (), server->host_name ());
        } else {
@@ -313,7 +314,7 @@ try
                {
                        boost::this_thread::disable_interruption dis;
 
-                       LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), vf->index(), (int) vf->eyes ());
+                       LOG_TIMING ("encoder-pop thread=%1 frame=%2 eyes=%3", thread_id(), vf.index(), static_cast<int>(vf.eyes()));
                        _queue.pop_front ();
 
                        lock.unlock ();
@@ -323,7 +324,7 @@ try
                        /* We need to encode this input */
                        if (server) {
                                try {
-                                       encoded = make_shared<dcp::ArrayData>(vf->encode_remotely(server.get()));
+                                       encoded = make_shared<dcp::ArrayData>(vf.encode_remotely(server.get()));
 
                                        if (remote_backoff > 0) {
                                                LOG_GENERAL ("%1 was lost, but now she is found; removing backoff", server->host_name ());
@@ -339,15 +340,15 @@ try
                                        }
                                        LOG_ERROR (
                                                N_("Remote encode of %1 on %2 failed (%3); thread sleeping for %4s"),
-                                               vf->index(), server->host_name(), e.what(), remote_backoff
+                                               vf.index(), server->host_name(), e.what(), remote_backoff
                                                );
                                }
 
                        } else {
                                try {
-                                       LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_id(), vf->index());
-                                       encoded = make_shared<dcp::ArrayData>(vf->encode_locally());
-                                       LOG_TIMING ("finish-local-encode thread=%1 frame=%2", thread_id(), vf->index());
+                                       LOG_TIMING ("start-local-encode thread=%1 frame=%2", thread_id(), vf.index());
+                                       encoded = make_shared<dcp::ArrayData>(vf.encode_locally());
+                                       LOG_TIMING ("finish-local-encode thread=%1 frame=%2", thread_id(), vf.index());
                                } catch (std::exception& e) {
                                        /* This is very bad, so don't cope with it, just pass it on */
                                        LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
@@ -356,11 +357,11 @@ try
                        }
 
                        if (encoded) {
-                               _writer->write (encoded, vf->index(), vf->eyes());
+                               _writer->write (encoded, vf.index(), vf.eyes());
                                frame_done ();
                        } else {
                                lock.lock ();
-                               LOG_GENERAL (N_("[%1] J2KEncoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf->index());
+                               LOG_GENERAL (N_("[%1] J2KEncoder thread pushes frame %2 back onto queue after failure"), thread_id(), vf.index());
                                _queue.push_front (vf);
                                lock.unlock ();
                        }