projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 9fcba560f23085988ec4ca9ce8c51b8906ec5d68..6bb97012abaebfceedf57f30960aaa3fb3bfbf30 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-1,5
+1,5
@@
/*
/*
- 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
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
@@
-37,6
+37,8
@@
extern "C" {
}
#include "util.h"
#include "config.h"
}
#include "util.h"
#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
class Image;
class AudioBuffers;
class Image;
class AudioBuffers;
@@
-46,6
+48,8
@@
class DCPVideoFrame;
class EncodedData;
class Writer;
class Job;
class EncodedData;
class Writer;
class Job;
+class ServerFinder;
+class PlayerVideoFrame;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
@@
-54,20
+58,19
@@
class Job;
* is supplied as uncompressed PCM in blocks of various sizes.
*/
* is supplied as uncompressed PCM in blocks of various sizes.
*/
-class Encoder : public boost::noncopyable
+class Encoder : public boost::noncopyable
, public ExceptionStore
{
public:
{
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.
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 f Video frame.
*/
*/
- void process_video (boost::shared_ptr<
const Image> i, Eyes eyes, ColourConversion, bool same
);
+ void process_video (boost::shared_ptr<
PlayerVideoFrame> f
);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
/** Call with some audio data */
void process_audio (boost::shared_ptr<const AudioBuffers>);
@@
-84,13
+87,12
@@
private:
void encoder_thread (boost::optional<ServerDescription>);
void terminate_threads ();
void encoder_thread (boost::optional<ServerDescription>);
void terminate_threads ();
- void broadcast_thread ();
- void listen_thread ();
void add_worker_threads (ServerDescription);
void add_worker_threads (ServerDescription);
+ void server_found (ServerDescription);
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
/** 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;
/** Mutex for _time_history and _last_frame */
mutable boost::mutex _state_mutex;
@@
-104,19
+106,17
@@
private:
/** Number of video frames written for the DCP so far */
int _video_frames_out;
/** Number of video frames written for the DCP so far */
int _video_frames_out;
- bool _have_a_real_frame[EYES_COUNT];
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
- typedef std::list<std::pair<boost::optional<ServerDescription>, boost::thread *> > ThreadList;
- ThreadList _threads;
+ std::list<boost::thread *> _threads;
mutable boost::mutex _mutex;
mutable boost::mutex _mutex;
- boost::condition _condition;
+ /** 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;
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<Writer> _writer;
-
- /** A thread to periodically issue broadcasts to find encoding servers */
- boost::thread* _broadcast_thread;
- boost::thread* _listen_thread;
+ Waker _waker;
};
#endif
};
#endif