X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=78c1f99088b46aae6506c561912647938143ed01;hp=20f2951b64cbb63ab4d1020ed1a60cba99bb5b6d;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=17df947ac256397311a11894062070f8069c7e75

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 20f2951b6..78c1f9908 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,117 +1,59 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 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 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 "types.h"
+#include "player_text.h"
 #include <boost/signals2.hpp>
-#include <list>
-#include <stdint.h>
 
 class Film;
-class EncodeServerDescription;
-class DCPVideo;
-class Writer;
+class Encoder;
+class Player;
 class Job;
 class PlayerVideo;
+class AudioBuffers;
 
-/** @class Encoder
- *  @brief Class to manage encoding to JPEG2000.
- *
- *  This class keeps a queue of frames to be encoded and distributes
- *  the work around threads and encoding servers.
- */
-
-class Encoder : public boost::noncopyable, public ExceptionStore
+/** @class Encoder */
+class Encoder : public boost::noncopyable
 {
 public:
-	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 ();
-
-	/** Called to pass in zero or more bits of video to be encoded
-	 *  as the next DCP frame.
-	 */
-	void encode (std::list<boost::shared_ptr<PlayerVideo> > f);
-
-	/** Called when a processing run has finished */
-	void end ();
-
-	float current_encoding_rate () const;
-	int video_frames_out () const;
-
-private:
-
-	void enqueue (boost::shared_ptr<PlayerVideo> f);
-	void frame_done ();
-
-	void encoder_thread (boost::optional<EncodeServerDescription>);
-	void terminate_threads ();
-	void servers_list_changed ();
-
-	/** Film that we are encoding */
-	boost::shared_ptr<const Film> _film;
-
-	/** 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.
-	*/
-	std::list<struct timeval> _time_history;
-	/** Number of frames that we should keep history for */
-	static int const _history_size;
-	/** Current DCP frame index */
-	Frame _position;
+	Encoder (std::shared_ptr<const Film> film, std::weak_ptr<Job> job);
+	virtual ~Encoder () {}
 
-	/* 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 _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 */
-	boost::condition _full_condition;
+	virtual void go () = 0;
 
-	boost::shared_ptr<Writer> _writer;
-	Waker _waker;
+	/** @return the current frame rate over the last short while */
+	virtual boost::optional<float> current_rate () const {
+		return boost::optional<float>();
+	}
 
-	boost::shared_ptr<PlayerVideo> _last_player_video;
+	/** @return the number of frames that are done */
+	virtual Frame frames_done () const = 0;
+	virtual bool finishing () const = 0;
 
-	boost::signals2::scoped_connection _server_found_connection;
+protected:
+	std::shared_ptr<const Film> _film;
+	std::weak_ptr<Job> _job;
+	std::shared_ptr<Player> _player;
 };
 
 #endif