projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 76c87a9f7ad2ea57468a58408ea3ca663821340b..7e6fc4f308c226b767f3dcac42154d7b415a0d00 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>
/*
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.
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/>.
*/
*/
@@
-37,7
+38,7
@@
#include <stdint.h>
class Film;
#include <stdint.h>
class Film;
-class ServerDescription;
+class
Encode
ServerDescription;
class DCPVideo;
class Writer;
class Job;
class DCPVideo;
class Writer;
class Job;
@@
-53,16
+54,16
@@
class PlayerVideo;
class Encoder : public boost::noncopyable, public ExceptionStore
{
public:
class Encoder : public boost::noncopyable, public ExceptionStore
{
public:
- Encoder (boost::shared_ptr<const Film>, boost::
weak_ptr<Job>, boost::
shared_ptr<Writer>);
+ Encoder (boost::shared_ptr<const Film>, boost::shared_ptr<Writer>);
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
void begin ();
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
void begin ();
- /** Call
with a frame of video.
- *
@param f Video
frame.
+ /** Call
ed to pass in zero or more bits of video to be encoded
+ *
as the next DCP
frame.
*/
*/
- void en
queue (boost::shared_ptr<PlayerVideo
> f);
+ void en
code (std::list<boost::shared_ptr<PlayerVideo>
> f);
/** Called when a processing run has finished */
void end ();
/** Called when a processing run has finished */
void end ();
@@
-72,15
+73,15
@@
public:
private:
private:
+ void enqueue (boost::shared_ptr<PlayerVideo> f);
void frame_done ();
void frame_done ();
- void encoder_thread (boost::optional<ServerDescription>);
+ void encoder_thread (boost::optional<
Encode
ServerDescription>);
void terminate_threads ();
void servers_list_changed ();
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
void terminate_threads ();
void servers_list_changed ();
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
- boost::weak_ptr<Job> _job;
/** Mutex for _time_history and _video_frames_enqueued */
mutable boost::mutex _state_mutex;
/** Mutex for _time_history and _video_frames_enqueued */
mutable boost::mutex _state_mutex;
@@
-90,10
+91,8
@@
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;
- /** Number of video frames enqueued so far */
- int _video_frames_enqueued;
- bool _left_done;
- bool _right_done;
+ /** Current DCP frame index */
+ Frame _position;
/* XXX: probably should be atomic */
bool _terminate_enqueue;
/* XXX: probably should be atomic */
bool _terminate_enqueue;