projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to tidy up internal APIs slightly.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 20f2951b64cbb63ab4d1020ed1a60cba99bb5b6d..27ae64aac589ba577578fb874fcafdffe8557b40 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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.
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
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/>.
*/
*/
@@
-33,6
+34,7
@@
#include <boost/thread.hpp>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
#include <boost/thread.hpp>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
+#include <boost/enable_shared_from_this.hpp>
#include <list>
#include <stdint.h>
#include <list>
#include <stdint.h>
@@
-50,39
+52,39
@@
class PlayerVideo;
* the work around threads and encoding servers.
*/
* the work around threads and encoding servers.
*/
-class Encoder : public boost::noncopyable, public ExceptionStore
+class Encoder : public boost::noncopyable, public ExceptionStore
, public boost::enable_shared_from_this<Encoder>
{
public:
Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
{
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 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, DCPTime time);
/** Called when a processing run has finished */
void end ();
float current_encoding_rate () const;
/** Called when a processing run has finished */
void end ();
float current_encoding_rate () const;
- int video_frames_out () const;
+ int video_frames_enqueued () const;
+
+ void servers_list_changed ();
private:
private:
- void enqueue (boost::shared_ptr<PlayerVideo> f);
+ static void call_servers_list_changed (boost::weak_ptr<Encoder> encoder);
+
void frame_done ();
void encoder_thread (boost::optional<EncodeServerDescription>);
void terminate_threads ();
void frame_done ();
void encoder_thread (boost::optional<EncodeServerDescription>);
void terminate_threads ();
- void servers_list_changed ();
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
/** 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.
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
+92,7
@@
private:
std::list<struct timeval> _time_history;
/** Number of frames that we should keep history for */
static int const _history_size;
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;
/** Mutex for _threads */
mutable boost::mutex _threads_mutex;
std::list<boost::thread *> _threads;
@@
-110,6
+107,7
@@
private:
Waker _waker;
boost::shared_ptr<PlayerVideo> _last_player_video;
Waker _waker;
boost::shared_ptr<PlayerVideo> _last_player_video;
+ boost::optional<DCPTime> _last_player_video_time;
boost::signals2::scoped_connection _server_found_connection;
};
boost::signals2::scoped_connection _server_found_connection;
};