/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 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
#define DCPOMATIC_ENCODER_H
/** @file src/encoder.h
- * @brief Encoder to J2K and WAV for DCP.
+ * @brief Encoder class.
*/
+#include "util.h"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+extern "C" {
+#include <libavutil/samplefmt.h>
+#include <libswresample/swresample.h>
+}
#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.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 "exceptions.h"
class Image;
class AudioBuffers;
class Film;
class ServerDescription;
class DCPVideo;
-class EncodedData;
class Writer;
class Job;
-class ServerFinder;
class PlayerVideo;
/** @class Encoder
class Encoder : public boost::noncopyable, public ExceptionStore
{
public:
- Encoder (boost::shared_ptr<const Film> f, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
+ Encoder (boost::shared_ptr<const Film>, boost::weak_ptr<Job>, boost::shared_ptr<Writer>);
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
/** 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;
+ /** Number of video frames enqueued so far */
+ int _video_frames_enqueued;
bool _terminate;
std::list<boost::shared_ptr<DCPVideo> > _queue;
boost::shared_ptr<Writer> _writer;
Waker _waker;
+
+ boost::shared_ptr<PlayerVideo> _last_player_video;
+
+ boost::signals2::scoped_connection _server_found_connection;
};
#endif