projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix detection of same-frame to speed up simple encodes (#548).
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 902dae2d5e1f113ea8ebdaa0e9e4cb40a30a8779..a4fe558740de69b8673de52027137120e3d06d58 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
@@
-21,9
+21,17
@@
#define DCPOMATIC_ENCODER_H
/** @file src/encoder.h
#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/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
@@
-31,50
+39,41
@@
#include <boost/optional.hpp>
#include <list>
#include <stdint.h>
#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"
class Image;
class AudioBuffers;
class Film;
class ServerDescription;
class Image;
class AudioBuffers;
class Film;
class ServerDescription;
-class DCPVideo
Frame
;
+class DCPVideo;
class EncodedData;
class Writer;
class Job;
class ServerFinder;
class EncodedData;
class Writer;
class Job;
class ServerFinder;
+class PlayerVideo;
/** @class Encoder
/** @class Encoder
- * @brief
Encoder to J2K and WAV for DCP
.
+ * @brief
Class to manage encoding to JPEG2000
.
*
*
- *
Video is supplied to process_video as RGB frames, and audio
- *
is supplied as uncompressed PCM in blocks of various size
s.
+ *
This class keeps a queue of frames to be encoded and distributes
+ *
the work around threads and encoding server
s.
*/
*/
-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>, boost::shared_ptr<Writer
>);
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 */
- void
process_
begin ();
+ void begin ();
/** Call with a frame of video.
/** 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);
-
- /** Call with some audio data */
- void process_audio (boost::shared_ptr<const AudioBuffers>);
+ void enqueue (boost::shared_ptr<PlayerVideo> f);
/** Called when a processing run has finished */
/** Called when a processing run has finished */
- void
process_
end ();
+ void end ();
float current_encoding_rate () const;
int video_frames_out () const;
float current_encoding_rate () const;
int video_frames_out () const;
@@
-90,7
+89,7
@@
private:
/** 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,16
+103,19
@@
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;
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::shared_ptr<DCPVideo> > _queue;
+ 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;
- boost::shared_ptr<ServerFinder> _server_finder;
+ Waker _waker;
+
+ boost::signals2::scoped_connection _server_found_connection;
};
#endif
};
#endif