X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=7e6fc4f308c226b767f3dcac42154d7b415a0d00;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=51df0176b575267a50ec75e5596059655811ec9e;hpb=40b654453c2ce0b266f43c36f1b9a5d1705f983c;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 51df0176b..7e6fc4f30 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,54 +1,47 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_ENCODER_H
 #define DCPOMATIC_ENCODER_H
 
-/** @file src/encoder.h
- *  @brief Encoder to J2K and WAV for DCP.
+/** @file  src/encoder.h
+ *  @brief Encoder class.
  */
 
+#include "util.h"
+#include "cross.h"
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 #include <list>
 #include <stdint.h>
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
-#include "util.h"
-#include "config.h"
-#include "cross.h"
-#include "exceptions.h"
 
-class Image;
-class AudioBuffers;
 class Film;
-class ServerDescription;
+class EncodeServerDescription;
 class DCPVideo;
-class EncodedData;
 class Writer;
 class Job;
-class ServerFinder;
 class PlayerVideo;
 
 /** @class Encoder
@@ -61,16 +54,16 @@ class PlayerVideo;
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
+	Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
 	void begin ();
 
-	/** Call with a frame of video.
-	 *  @param f Video frame.
+	/** Called to pass in zero or more bits of video to be encoded
+	 *  as the next DCP frame.
 	 */
-	void enqueue (boost::shared_ptr<PlayerVideo> f);
+	void encode (std::list<boost::shared_ptr<PlayerVideo> > f);
 
 	/** Called when a processing run has finished */
 	void end ();
@@ -79,19 +72,18 @@ public:
 	int video_frames_out () const;
 
 private:
-	
+
+	void enqueue (boost::shared_ptr<PlayerVideo> f);
 	void frame_done ();
-	
-	void encoder_thread (boost::optional<ServerDescription>);
+
+	void encoder_thread (boost::optional<EncodeServerDescription>);
 	void terminate_threads ();
-	void add_worker_threads (ServerDescription);
-	void server_found (ServerDescription);
+	void servers_list_changed ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
-	boost::weak_ptr<Job> _job;
 
-	/** Mutex for _time_history and _last_frame */
+	/** Mutex for _time_history and _video_frames_enqueued */
 	mutable boost::mutex _state_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
@@ -99,14 +91,17 @@ private:
 	std::list<struct timeval> _time_history;
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
-
-	/** Number of video frames written for the DCP so far */
-	int _video_frames_out;
-
-	bool _terminate;
-	std::list<boost::shared_ptr<DCPVideo> > _queue;
+	/** Current DCP frame index */
+	Frame _position;
+
+	/* XXX: probably should be atomic */
+	bool _terminate_enqueue;
+	bool _terminate_encoding;
+	/** Mutex for _threads */
+	mutable boost::mutex _threads_mutex;
 	std::list<boost::thread *> _threads;
-	mutable boost::mutex _mutex;
+	mutable boost::mutex _queue_mutex;
+	std::list<boost::shared_ptr<DCPVideo> > _queue;
 	/** condition to manage thread wakeups when we have nothing to do */
 	boost::condition _empty_condition;
 	/** condition to manage thread wakeups when we have too much to do */
@@ -114,6 +109,10 @@ private:
 
 	boost::shared_ptr<Writer> _writer;
 	Waker _waker;
+
+	boost::shared_ptr<PlayerVideo> _last_player_video;
+
+	boost::signals2::scoped_connection _server_found_connection;
 };
 
 #endif