X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=8b2db0eb3113767594264b6ca8367e2022bbbe8b;hb=50cb31af16240b248700dab1484d7f07656c66df;hp=95e98ab760cecb9abbd681840a69b946d2bacbfb;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 95e98ab76..8b2db0eb3 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -22,23 +22,15 @@
  */
 
 #include <iostream>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <libdcp/picture_asset.h>
 #include "encoder.h"
 #include "util.h"
 #include "film.h"
 #include "log.h"
-#include "exceptions.h"
-#include "filter.h"
 #include "config.h"
 #include "dcp_video_frame.h"
 #include "server.h"
-#include "format.h"
 #include "cross.h"
 #include "writer.h"
-#include "player.h"
-#include "audio_mapping.h"
 
 #include "i18n.h"
 
@@ -55,7 +47,7 @@ using boost::optional;
 int const Encoder::_history_size = 25;
 
 /** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
+Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _film (f)
 	, _job (j)
 	, _video_frames_out (0)
@@ -177,7 +169,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Subtitle> sub, Time)
+Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -206,15 +198,12 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub
 		frame_done ();
 	} else {
 		/* Queue this new frame for encoding */
-		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 		TIMING ("adding to queue of %1", _queue.size ());
+		/* XXX: padding */
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
-						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
-						  _film->subtitle_offset(), _film->subtitle_scale(),
-						  _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(), s.second,
-						  _film->colour_lut(), _film->j2k_bandwidth(),
-						  _film->log()
+						  image, _video_frames_out, _film->dcp_video_frame_rate(),
+						  _film->colour_lut(), _film->j2k_bandwidth(), _film->log()
 						  )
 					  ));
 		
@@ -245,6 +234,8 @@ Encoder::terminate_threads ()
 		}
 		delete *i;
 	}
+
+	_threads.clear ();
 }
 
 void