projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add swaroop-profile start/stop/pause buttons.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.h
diff --git
a/src/lib/dcp_video.h
b/src/lib/dcp_video.h
index 97be0779802b8cc7653feed28b24f68fcb2957bb..32cd1a1699ac56382ee547c04830af88b0808777 100644
(file)
--- a/
src/lib/dcp_video.h
+++ b/
src/lib/dcp_video.h
@@
-1,38
+1,34
@@
/*
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+ Copyright (C) 2012-2016 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 "
util
.h"
-#include
<dcp/picture_asset_writer.h>
+#include "
types
.h"
+#include
"encode_server_description.h"
#include <libcxml/cxml.h>
#include <libcxml/cxml.h>
+#include <dcp/data.h>
/** @file src/dcp_video_frame.h
* @brief A single frame of video destined for a DCP.
*/
/** @file src/dcp_video_frame.h
* @brief A single frame of video destined for a DCP.
*/
-class ServerDescription;
-class Scaler;
-class Image;
class Log;
class Log;
-class Subtitle;
class PlayerVideo;
class PlayerVideo;
-class Data;
/** @class DCPVideo
* @brief A single frame of video destined for a DCP.
/** @class DCPVideo
* @brief A single frame of video destined for a DCP.
@@
-46,11
+42,11
@@
class Data;
class DCPVideo : public boost::noncopyable
{
public:
class DCPVideo : public boost::noncopyable
{
public:
- DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boo
l b, boo
st::shared_ptr<Log>);
+ DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boost::shared_ptr<Log>);
DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
- Data encode_locally (dcp::NoteHandler note);
-
Data encode_remotely (ServerDescription
);
+
dcp::
Data encode_locally (dcp::NoteHandler note);
+
dcp::Data encode_remotely (EncodeServerDescription, int timeout = 30
);
int index () const {
return _index;
int index () const {
return _index;
@@
-60,6
+56,8
@@
public:
bool same (boost::shared_ptr<const DCPVideo> other) const;
bool same (boost::shared_ptr<const DCPVideo> other) const;
+ static boost::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (boost::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+
private:
void add_metadata (xmlpp::Element *) const;
private:
void add_metadata (xmlpp::Element *) const;
@@
-69,7
+67,6
@@
private:
int _frames_per_second; ///< Frames per second that we will use for the DCP
int _j2k_bandwidth; ///< J2K bandwidth to use
Resolution _resolution; ///< Resolution (2K or 4K)
int _frames_per_second; ///< Frames per second that we will use for the DCP
int _j2k_bandwidth; ///< J2K bandwidth to use
Resolution _resolution; ///< Resolution (2K or 4K)
- bool _burn_subtitles; ///< true to burn subtitles into the image
boost::shared_ptr<Log> _log; ///< log
};
boost::shared_ptr<Log> _log; ///< log
};