X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=792029a9164f0ea4ce30054af0496501e113ea49;hp=6c465f816773d12635f1b11dd020a807c7a1b756;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=854f2e5bbb7ffb9758b823af87034033033f3cb8

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6c465f816..792029a91 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,118 +1,60 @@
 /*
-    Copyright (C) 2012 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 to J2K and WAV for DCP.
- */
-
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread.hpp>
-#include <boost/optional.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 "types.h"
+#include "player_text.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/signals2.hpp>
 
-class Image;
-class AudioBuffers;
 class Film;
-class ServerDescription;
-class DCPVideoFrame;
-class EncodedData;
-class Writer;
+class Encoder;
+class Player;
 class Job;
-class ServerFinder;
-class DCPVideo;
-
-/** @class Encoder
- *  @brief Encoder to J2K and WAV for DCP.
- *
- *  Video is supplied to process_video as RGB frames, and audio
- *  is supplied as uncompressed PCM in blocks of various sizes.
- */
+class PlayerVideo;
+class AudioBuffers;
 
-class Encoder : public boost::noncopyable, public ExceptionStore
+/** @class Encoder */
+class Encoder : public boost::noncopyable
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>);
-	virtual ~Encoder ();
-
-	/** Called to indicate that a processing run is about to begin */
-	void process_begin ();
+	Encoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job);
+	virtual ~Encoder () {}
 
-	/** Call with a frame of video.
-	 *  @param f Video frame.
-	 */
-	void process_video (boost::shared_ptr<DCPVideo> f);
+	virtual void go () = 0;
 
-	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>);
+	/** @return the current frame rate over the last short while */
+	virtual boost::optional<float> current_rate () const {
+		return boost::optional<float>();
+	}
 
-	/** Called when a processing run has finished */
-	void process_end ();
+	/** @return the number of frames that are done */
+	virtual Frame frames_done () const = 0;
+	virtual bool finishing () const = 0;
 
-	float current_encoding_rate () const;
-	int video_frames_out () const;
-
-private:
-	
-	void frame_done ();
-	
-	void encoder_thread (boost::optional<ServerDescription>);
-	void terminate_threads ();
-	void add_worker_threads (ServerDescription);
-	void server_found (ServerDescription);
-
-	/** Film that we are encoding */
+protected:
 	boost::shared_ptr<const Film> _film;
 	boost::weak_ptr<Job> _job;
-
-	/** Mutex for _time_history and _last_frame */
-	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;
-
-	/** Number of video frames written for the DCP so far */
-	int _video_frames_out;
-
-	bool _terminate;
-	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
-	std::list<boost::thread *> _threads;
-	mutable boost::mutex _mutex;
-	boost::condition _condition;
-
-	boost::shared_ptr<Writer> _writer;
-	Waker _waker;
+	boost::shared_ptr<Player> _player;
 };
 
 #endif