Merge master.

[dcpomatic.git] / src / lib / encoder.h

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6c465f816773d12635f1b11dd020a807c7a1b756..51df0176b575267a50ec75e5596059655811ec9e 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
@@ -38,44 +38,42 @@ extern "C" {
 #include "util.h"
 #include "config.h"
 #include "cross.h"
+#include "exceptions.h"
 
 class Image;
 class AudioBuffers;
 class Film;
 class ServerDescription;
-class DCPVideoFrame;
+class DCPVideo;
 class EncodedData;
 class Writer;
 class Job;
 class ServerFinder;
-class DCPVideo;
+class PlayerVideo;
 
 /** @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 sizes.
+ *  This class keeps a queue of frames to be encoded and distributes
+ *  the work around threads and encoding servers.
  */
 
 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 */
-       void process_begin ();
+       void begin ();
 
        /** Call with a frame of video.
         *  @param f Video frame.
         */
-       void process_video (boost::shared_ptr<DCPVideo> 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 */
-       void process_end ();
+       void end ();
 
        float current_encoding_rate () const;
        int video_frames_out () const;
@@ -106,10 +104,13 @@ private:
        int _video_frames_out;
 
        bool _terminate;
-       std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+       std::list<boost::shared_ptr<DCPVideo> > _queue;
        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;