projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Catch exceptions from Encoder threads.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 9fcba560f23085988ec4ca9ce8c51b8906ec5d68..079174f89c96be258109ea339d97076261b3bc7e 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-46,6
+46,8
@@
class DCPVideoFrame;
class EncodedData;
class Writer;
class Job;
class EncodedData;
class Writer;
class Job;
+class ServerFinder;
+class PlayerImage;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
@@
-54,10
+56,10
@@
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 */
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
@@
-67,7
+69,7
@@
public:
* @param i Video frame image.
* @param same true if i is the same as the last time we were called.
*/
* @param i Video frame image.
* @param same true if i 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<
Player
Image> i, Eyes eyes, ColourConversion, bool same);
/** 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
+86,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;
@@
-107,16
+108,11
@@
private:
bool _have_a_real_frame[EYES_COUNT];
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
bool _have_a_real_frame[EYES_COUNT];
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;
boost::condition _condition;
boost::shared_ptr<Writer> _writer;
mutable boost::mutex _mutex;
boost::condition _condition;
boost::shared_ptr<Writer> _writer;
-
- /** A thread to periodically issue broadcasts to find encoding servers */
- boost::thread* _broadcast_thread;
- boost::thread* _listen_thread;
};
#endif
};
#endif