X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=7e6fc4f308c226b767f3dcac42154d7b415a0d00;hb=b93599eb990cdad18c3de47d62575031ed688cea;hp=caadda591d20a606e97c0d9388c0a8abe533539f;hpb=52b928b4901aa11b00888ce6880de1c64debf426;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index caadda591..7e6fc4f30 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -37,7 +38,7 @@
 #include <stdint.h>
 
 class Film;
-class ServerDescription;
+class EncodeServerDescription;
 class DCPVideo;
 class Writer;
 class Job;
@@ -53,16 +54,16 @@ class PlayerVideo;
 class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
-	Encoder (boost::shared_ptr<const Film>, 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 ();
@@ -72,15 +73,15 @@ public:
 
 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 servers_list_changed ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<const Film> _film;
-	boost::weak_ptr<Job> _job;
 
 	/** Mutex for _time_history and _video_frames_enqueued */
 	mutable boost::mutex _state_mutex;
@@ -90,13 +91,12 @@ 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 enqueued so far */
-	int _video_frames_enqueued;
-	bool _left_done;
-	bool _right_done;
+	/** Current DCP frame index */
+	Frame _position;
 
 	/* XXX: probably should be atomic */
-	bool _terminate;
+	bool _terminate_enqueue;
+	bool _terminate_encoding;
 	/** Mutex for _threads */
 	mutable boost::mutex _threads_mutex;
 	std::list<boost::thread *> _threads;