X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=ac1d74c57b39af3aa449e43fd628651108701823;hb=39bc73fe192f932ed6695eb87b19de446e8b4f55;hp=e0ee2d41480f3fbf7b413cf0e974a96a4967c735;hpb=9d075e8e4d9751eee153c0f00fb541a4217f116b;p=dcpomatic.git diff --git a/src/lib/encoder.h b/src/lib/encoder.h index e0ee2d414..ac1d74c57 100644 --- a/src/lib/encoder.h +++ b/src/lib/encoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington 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 @@ -48,7 +48,7 @@ class EncodedData; class Writer; class Job; class ServerFinder; -class PlayerImage; +class PlayerVideoFrame; /** @class Encoder * @brief Encoder to J2K and WAV for DCP. @@ -67,10 +67,9 @@ public: 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 i, Eyes eyes, ColourConversion, bool same); + void process_video (boost::shared_ptr f); /** Call with some audio data */ void process_audio (boost::shared_ptr); @@ -106,7 +105,6 @@ private: /** 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 > _queue; std::list _threads;