projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resurrect neater repeat-write handling.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index ac1d74c57b39af3aa449e43fd628651108701823..8b7c1f3adfea058c8194f4ca08a0ee7105b387b0 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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,51
+39,39
@@
#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"
-#include "cross.h"
class Image;
class AudioBuffers;
class Film;
class ServerDescription;
class Image;
class AudioBuffers;
class Film;
class ServerDescription;
-class DCPVideoFrame;
-class EncodedData;
+class DCPVideo;
class Writer;
class Job;
class Writer;
class Job;
-class ServerFinder;
-class PlayerVideoFrame;
+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, public ExceptionStore
{
public:
*/
class Encoder : public boost::noncopyable, public ExceptionStore
{
public:
- Encoder (boost::shared_ptr<const Film> f, boost::weak_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.
* @param f Video frame.
*/
/** Call with a frame of video.
* @param f Video frame.
*/
- void process_video (boost::shared_ptr<PlayerVideoFrame> f);
-
- /** 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;
@@
-102,17
+98,24
@@
private:
/** Number of frames that we should keep history for */
static int const _history_size;
/** 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;
bool _terminate;
- std::list<boost::shared_ptr<DCPVideo
Frame
> > _queue;
+ std::list<boost::shared_ptr<DCPVideo> > _queue;
std::list<boost::thread *> _threads;
mutable boost::mutex _mutex;
std::list<boost::thread *> _threads;
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;
Waker _waker;
boost::shared_ptr<Writer> _writer;
Waker _waker;
+
+ boost::shared_ptr<PlayerVideo> _last_player_video;
+
+ boost::signals2::scoped_connection _server_found_connection;
};
#endif
};
#endif