projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some improvements in progress reporting, especially for long jobs.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 8f724525cbe791c965d67c3b1e13f06f08f7a1b4..ab3f40762e4f512ae94012778ae8422171ac6261 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-36,8
+36,6
@@
extern "C" {
#include <libswresample/swresample.h>
}
#include "util.h"
#include <libswresample/swresample.h>
}
#include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
class Image;
class AudioBuffers;
class Image;
class AudioBuffers;
@@
-55,10
+53,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
VideoSink, public AudioSink
+class Encoder : public
boost::noncopyable
{
public:
{
public:
- Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
+ Encoder (boost::shared_ptr<
const
Film> f, boost::shared_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 */
@@
-68,10
+66,10
@@
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,
bool same, Ti
me);
+ void process_video (boost::shared_ptr<const Image> i,
Eyes eyes, ColourConversion, bool sa
me);
/** Call with some audio data */
/** Call with some audio data */
- void process_audio (boost::shared_ptr<const AudioBuffers>
, Time
);
+ void process_audio (boost::shared_ptr<const AudioBuffers>);
/** Called when a processing run has finished */
void process_end ();
/** Called when a processing run has finished */
void process_end ();
@@
-83,15
+81,15
@@
private:
void frame_done ();
void frame_done ();
- void encoder_thread (
ServerDescription *
);
+ void encoder_thread (
boost::optional<ServerDescription>
);
void terminate_threads ();
/** Film that we are encoding */
void terminate_threads ();
/** Film that we are encoding */
- boost::shared_ptr<Film> _film;
+ boost::shared_ptr<
const
Film> _film;
boost::shared_ptr<Job> _job;
/** Mutex for _time_history and _last_frame */
boost::shared_ptr<Job> _job;
/** Mutex for _time_history and _last_frame */
- mutable boost::mutex _
history
_mutex;
+ mutable boost::mutex _
state
_mutex;
/** List of the times of completion of the last _history_size frames;
first is the most recently completed.
*/
/** List of the times of completion of the last _history_size frames;
first is the most recently completed.
*/
@@
-102,7
+100,7
@@
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;
+ bool _have_a_real_frame
[EYES_COUNT]
;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;