Merge master.

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 693fd587e8bab1c8a6b2ba94253cfacc5caf6f96..8caa0190c38726121d182b1f81e27ebf99b85295 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -29,13 +29,13 @@
 #include "film.h"
 #include "log.h"
 #include "config.h"
-#include "dcp_video_frame.h"
+#include "dcp_video.h"
 #include "server.h"
 #include "cross.h"
 #include "writer.h"
 #include "server_finder.h"
 #include "player.h"
-#include "player_video_frame.h"
+#include "player_video.h"
 
 #include "i18n.h"
 
@@ -58,15 +58,14 @@ 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)
+Encoder::Encoder (shared_ptr<const Film> f, weak_ptr<Job> j, shared_ptr<Writer> writer)
        : _film (f)
        , _job (j)
        , _video_frames_out (0)
        , _terminate (false)
+       , _writer (writer)
 {
-       _have_a_real_frame[EYES_BOTH] = false;
-       _have_a_real_frame[EYES_LEFT] = false;
-       _have_a_real_frame[EYES_RIGHT] = false;
+
 }
 
 Encoder::~Encoder ()
@@ -88,18 +87,17 @@ Encoder::add_worker_threads (ServerDescription d)
 }
 
 void
-Encoder::process_begin ()
+Encoder::begin ()
 {
        for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
                _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, optional<ServerDescription> ())));
        }
 
-       _writer.reset (new Writer (_film, _job));
        ServerFinder::instance()->connect (boost::bind (&Encoder::server_found, this, _1));
 }
 
 void
-Encoder::process_end ()
+Encoder::end ()
 {
        boost::mutex::scoped_lock lock (_mutex);
 
@@ -126,7 +124,7 @@ Encoder::process_end ()
             So just mop up anything left in the queue here.
        */
 
-       for (list<shared_ptr<DCPVideoFrame> >::iterator i = _queue.begin(); i != _queue.end(); ++i) {
+       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 ());
@@ -135,9 +133,6 @@ Encoder::process_end ()
                        LOG_ERROR (N_("Local encode failed (%1)"), e.what ());
                }
        }
-               
-       _writer->finish ();
-       _writer.reset ();
 }      
 
 /** @return an estimate of the current number of frames we are encoding per second,
@@ -182,7 +177,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<PlayerVideoFrame> pvf, bool same)
+Encoder::enqueue (shared_ptr<PlayerVideo> pvf)
 {
        _waker.nudge ();
        
@@ -210,19 +205,21 @@ Encoder::process_video (shared_ptr<PlayerVideoFrame> pvf, bool same)
 
        if (_writer->can_fake_write (_video_frames_out)) {
                _writer->fake_write (_video_frames_out, pvf->eyes ());
-               _have_a_real_frame[pvf->eyes()] = false;
-               frame_done ();
-       } else if (same && _have_a_real_frame[pvf->eyes()]) {
-               /* Use the last frame that we encoded. */
-               _writer->repeat (_video_frames_out, pvf->eyes());
                frame_done ();
+       } else if (pvf->has_j2k ()) {
+               _writer->write (pvf->j2k(), _video_frames_out, pvf->eyes ());
        } else {
                /* Queue this new frame for encoding */
                LOG_TIMING ("adding to queue of %1", _queue.size ());
-               _queue.push_back (shared_ptr<DCPVideoFrame> (
-                                         new DCPVideoFrame (
-                                                 pvf, _video_frames_out, _film->video_frame_rate(),
-                                                 _film->j2k_bandwidth(), _film->resolution(), _film->log()
+               _queue.push_back (shared_ptr<DCPVideo> (
+                                         new DCPVideo (
+                                                 pvf,
+                                                 _video_frames_out,
+                                                 _film->video_frame_rate(),
+                                                 _film->j2k_bandwidth(),
+                                                 _film->resolution(),
+                                                 _film->burn_subtitles(),
+                                                 _film->log()
                                                  )
                                          ));
 
@@ -230,7 +227,6 @@ Encoder::process_video (shared_ptr<PlayerVideoFrame> pvf, bool same)
                   waiting on that.
                */
                _empty_condition.notify_all ();
-               _have_a_real_frame[pvf->eyes()] = true;
        }
 
        if (pvf->eyes() != EYES_LEFT) {
@@ -238,12 +234,6 @@ Encoder::process_video (shared_ptr<PlayerVideoFrame> pvf, bool same)
        }
 }
 
-void
-Encoder::process_audio (shared_ptr<const AudioBuffers> data)
-{
-       _writer->write (data);
-}
-
 void
 Encoder::terminate_threads ()
 {
@@ -287,7 +277,7 @@ try
                }
 
                LOG_TIMING ("[%1] encoder thread wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
-               shared_ptr<DCPVideoFrame> vf = _queue.front ();
+               shared_ptr<DCPVideo> vf = _queue.front ();
                LOG_TIMING ("[%1] encoder thread pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->index(), vf->eyes ());
                _queue.pop_front ();