Clean up of 3D->2D conversion.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index d5b1455d7517430f33653909d725f111ec62a1b1..b188e3be304ac4f8d3a04985cdd7218758d203f7 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -37,7 +38,7 @@
 #include <stdint.h>
 
 class Film;
-class ServerDescription;
+class EncodeServerDescription;
 class DCPVideo;
 class Writer;
 class Job;
@@ -54,35 +55,32 @@ class Encoder : public boost::noncopyable, public ExceptionStore
 {
 public:
        Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
-       virtual ~Encoder ();
+       ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
        void begin ();
 
-       /** Called to pass in zero or more bits of video to be encoded
-        *  as the next DCP frame.
-        */
-       void encode (std::list<boost::shared_ptr<PlayerVideo> > f);
+       /** Called to pass a bit of video to be encoded as the next DCP frame */
+       void encode (boost::shared_ptr<PlayerVideo> f);
 
        /** Called when a processing run has finished */
        void end ();
 
        float current_encoding_rate () const;
-       int video_frames_out () const;
+       int video_frames_enqueued () const;
 
 private:
 
-       void enqueue (boost::shared_ptr<PlayerVideo> f);
        void frame_done ();
 
-       void encoder_thread (boost::optional<ServerDescription>);
+       void encoder_thread (boost::optional<EncodeServerDescription>);
        void terminate_threads ();
        void servers_list_changed ();
 
        /** Film that we are encoding */
        boost::shared_ptr<const Film> _film;
 
-       /** Mutex for _time_history and _video_frames_enqueued */
+       /** Mutex for _time_history */
        mutable boost::mutex _state_mutex;
        /** List of the times of completion of the last _history_size frames;
            first is the most recently completed.
@@ -90,12 +88,7 @@ private:
        std::list<struct timeval> _time_history;
        /** Number of frames that we should keep history for */
        static int const _history_size;
-       /** Current DCP frame index */
-       Frame _position;
 
-       /* XXX: probably should be atomic */
-       bool _terminate_enqueue;
-       bool _terminate_encoding;
        /** Mutex for _threads */
        mutable boost::mutex _threads_mutex;
        std::list<boost::thread *> _threads;