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 e0ee2d41480f3fbf7b413cf0e974a96a4967c735..6c465f816773d12635f1b11dd020a807c7a1b756 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-48,7
+48,7
@@
class EncodedData;
class Writer;
class Job;
class ServerFinder;
class Writer;
class Job;
class ServerFinder;
-class
PlayerImage
;
+class
DCPVideo
;
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
/** @class Encoder
* @brief Encoder to J2K and WAV for DCP.
@@
-67,10
+67,9
@@
public:
void process_begin ();
/** Call with a frame of video.
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<
PlayerImage> i, Eyes eyes, ColourConversion, bool same
);
+ void process_video (boost::shared_ptr<
DCPVideo> 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>);
@@
-106,7
+105,6
@@
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;
std::list<boost::thread *> _threads;
bool _terminate;
std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
std::list<boost::thread *> _threads;