X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=f95d42661b1ed5d50442beed89c7238fa614f675;hp=b12bd0d48710291ce9e2ae8745137e8ac21bf817;hb=f861018389acd9d277fe34d7621182b9b54f977f;hpb=288e7e64e9be84b8dbe11f5acb490e64a29d9378

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index b12bd0d48..f95d42661 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,85 +17,84 @@
 
 */
 
-#ifndef DVDOMATIC_ENCODER_H
-#define DVDOMATIC_ENCODER_H
+#ifndef DCPOMATIC_ENCODER_H
+#define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
- *  @brief Parent class for classes which can encode video and audio frames.
+ *  @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>
 }
+#ifdef HAVE_SWRESAMPLE
+extern "C" {
+#include <libswresample/swresample.h>
+}
+#endif
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
 
-class Options;
 class Image;
 class Subtitle;
 class AudioBuffers;
 class Film;
+class ServerDescription;
+class DCPVideoFrame;
+class EncodedData;
+class Writer;
 
 /** @class Encoder
- *  @brief Parent class for classes which can encode video and audio frames.
+ *  @brief Encoder to J2K and WAV for DCP.
  *
  *  Video is supplied to process_video as YUV frames, and audio
  *  is supplied as uncompressed PCM in blocks of various sizes.
- *
- *  The subclass is expected to encode the video and/or audio in
- *  some way and write it to disk.
  */
 
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const Options> o);
-	virtual ~Encoder () {}
+	Encoder (boost::shared_ptr<Film> f);
+	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
-	virtual void process_begin () {}
+	virtual void process_begin ();
 
 	/** Call with a frame of video.
 	 *  @param i Video frame image.
+	 *  @param same true if i is the same as the last time we were called.
 	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	void process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s);
+	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
-	virtual void process_end () {}
+	virtual void process_end ();
 
-	float current_frames_per_second () const;
-	bool skipping () const;
-	SourceFrame video_frame () const;
+	float current_encoding_rate () const;
+	int video_frames_out () const;
 
-protected:
-
-	/** Called with a frame of video.
-	 *  @param i Video frame image.
-	 *  @param s A subtitle that should be on this frame, or 0.
-	 */
-	virtual void do_process_video (boost::shared_ptr<Image> i, boost::shared_ptr<Subtitle> s) = 0;
-	
-	/** Called with some audio data */
-	virtual void do_process_audio (boost::shared_ptr<AudioBuffers>) = 0;
+private:
 	
 	void frame_done ();
-	void frame_skipped ();
 	
+	void encoder_thread (ServerDescription *);
+	void terminate_threads ();
+
 	/** Film that we are encoding */
-	boost::shared_ptr<const Film> _film;
-	/** Options */
-	boost::shared_ptr<const Options> _opt;
+	boost::shared_ptr<Film> _film;
 
-	/** Mutex for _time_history, _just_skipped and _last_frame */
+	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
@@ -103,13 +102,24 @@ protected:
 	std::list<struct timeval> _time_history;
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
-	/** true if the last frame we processed was skipped (because it was already done) */
-	bool _just_skipped;
 
 	/** Number of video frames received so far */
-	SourceFrame _video_frame;
-	/** Number of audio frames received so far */
-	int64_t _audio_frame;
+	ContentVideoFrame _video_frames_in;
+	/** Number of video frames written for the DCP so far */
+	int _video_frames_out;
+
+#if HAVE_SWRESAMPLE	
+	SwrContext* _swr_context;
+#endif
+
+	bool _have_a_real_frame;
+	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;
 };
 
 #endif