projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix deadlock on examining DCP subtitle content.
[dcpomatic.git]
/
src
/
lib
/
transcoder.h
diff --git
a/src/lib/transcoder.h
b/src/lib/transcoder.h
index f7da3bd013eb9241d0b2cb4b550558145ff09ca0..a01b6a64ad4048d336e6c9b871a80e6517644755 100644
(file)
--- a/
src/lib/transcoder.h
+++ b/
src/lib/transcoder.h
@@
-1,57
+1,52
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 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/>.
*/
#include "types.h"
*/
#include "types.h"
-/** @file src/transcoder.h
- *
- * A decoder is selected according to the content type, and the encoder can be specified
- * as a parameter to the constructor.
- */
-
class Film;
class Film;
-class Job;
class Encoder;
class Encoder;
-class VideoFilter;
class Player;
class Player;
+class Writer;
+class Job;
-/** @class Transcoder
- *
- * A decoder is selected according to the content type, and the encoder can be specified
- * as a parameter to the constructor.
- */
-class Transcoder
+/** @class Transcoder */
+class Transcoder : public boost::noncopyable
{
public:
{
public:
- Transcoder (
- boost::shared_ptr<Film> f,
- boost::shared_ptr<Job> j
- );
+ Transcoder (boost::shared_ptr<const Film>, boost::shared_ptr<Job>);
void go ();
float current_encoding_rate () const;
int video_frames_out () const;
void go ();
float current_encoding_rate () const;
int video_frames_out () const;
+ /** @return true if we are in the process of calling Encoder::process_end */
+ bool finishing () const {
+ return _finishing;
+ }
+
private:
private:
- /** A Job that is running this Transcoder, or 0 */
+ boost::shared_ptr<const Film> _film;
boost::shared_ptr<Job> _job;
boost::shared_ptr<Player> _player;
boost::shared_ptr<Job> _job;
boost::shared_ptr<Player> _player;
+ boost::shared_ptr<Writer> _writer;
boost::shared_ptr<Encoder> _encoder;
boost::shared_ptr<Encoder> _encoder;
+ bool _finishing;
};
};