/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <libswresample/swresample.h>
}
#include "util.h"
+#include "config.h"
+#include "cross.h"
class Image;
class AudioBuffers;
class EncodedData;
class Writer;
class Job;
+class ServerFinder;
+class PlayerVideoFrame;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
* is supplied as uncompressed PCM in blocks of various sizes.
*/
-class Encoder : public boost::noncopyable
+class Encoder : public boost::noncopyable, public ExceptionStore
{
public:
- Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
+ 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 ();
/** 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 pvf Video frame image.
+ * @param same true if pvf is the same as the last time we were called.
*/
- void process_video (boost::shared_ptr<const Image> i, Eyes eyes, ColourConversion, bool same);
+ void process_video (boost::shared_ptr<PlayerVideoFrame> pvf, bool same);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
void encoder_thread (boost::optional<ServerDescription>);
void terminate_threads ();
+ void add_worker_threads (ServerDescription);
+ void server_found (ServerDescription);
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
- boost::shared_ptr<Job> _job;
+ boost::weak_ptr<Job> _job;
/** Mutex for _time_history and _last_frame */
mutable boost::mutex _state_mutex;
boost::condition _condition;
boost::shared_ptr<Writer> _writer;
+ Waker _waker;
};
#endif