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
/
player_video.h
diff --git
a/src/lib/player_video.h
b/src/lib/player_video.h
index 0f5e83b10298ff93c85f0b1dee3ee5dc388d282e..60c9224b0e5254978397e271fb1206584c970c68 100644
(file)
--- a/
src/lib/player_video.h
+++ b/
src/lib/player_video.h
@@
-1,34
+1,36
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
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 <boost/shared_ptr.hpp>
#include "types.h"
#include "position.h"
#include "types.h"
#include "position.h"
+#include "dcpomatic_time.h"
#include "colour_conversion.h"
#include "position_image.h"
#include "colour_conversion.h"
#include "position_image.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
class Image;
class ImageProxy;
class Image;
class ImageProxy;
-class Scaler;
class Socket;
class Socket;
-class Log;
-class EncodedData;
/** Everything needed to describe a video frame coming out of the player, but with the
* bits still their raw form. We may want to combine the bits on a remote machine,
/** Everything needed to describe a video frame coming out of the player, but with the
* bits still their raw form. We may want to combine the bits on a remote machine,
@@
-39,38
+41,39
@@
class PlayerVideo
public:
PlayerVideo (
boost::shared_ptr<const ImageProxy>,
public:
PlayerVideo (
boost::shared_ptr<const ImageProxy>,
- DCPTime,
Crop,
Crop,
- boost::optional<
float
>,
+ boost::optional<
double
>,
dcp::Size,
dcp::Size,
dcp::Size,
dcp::Size,
- Scaler const *,
Eyes,
Part,
Eyes,
Part,
- ColourConversion
+ boost::optional<ColourConversion>
);
);
-
- PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>
, boost::shared_ptr<Log>
);
+
+ PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
void set_subtitle (PositionImage);
void set_subtitle (PositionImage);
-
- boost::shared_ptr<Image> image (bool burn_subtitle) const;
- void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
- void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
+ boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
-
bool has_j2k () const
;
-
boost::shared_ptr<EncodedData> j2k () const
;
+
static AVPixelFormat always_rgb (AVPixelFormat)
;
+
static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat)
;
- DCPTime time () const {
- return _time;
- }
+ void add_metadata (xmlpp::Node* node) const;
+ void send_binary (boost::shared_ptr<Socket> socket) const;
+
+ bool has_j2k () const;
+ dcp::Data j2k () const;
Eyes eyes () const {
return _eyes;
}
Eyes eyes () const {
return _eyes;
}
- ColourConversion colour_conversion () const {
+ void set_eyes (Eyes e) {
+ _eyes = e;
+ }
+
+ boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
return _colour_conversion;
}
@@
-86,14
+89,12
@@
public:
private:
boost::shared_ptr<const ImageProxy> _in;
private:
boost::shared_ptr<const ImageProxy> _in;
- DCPTime _time;
Crop _crop;
Crop _crop;
- boost::optional<
float
> _fade;
+ boost::optional<
double
> _fade;
dcp::Size _inter_size;
dcp::Size _out_size;
dcp::Size _inter_size;
dcp::Size _out_size;
- Scaler const * _scaler;
Eyes _eyes;
Part _part;
Eyes _eyes;
Part _part;
-
ColourConversion
_colour_conversion;
-
PositionImage
_subtitle;
+
boost::optional<ColourConversion>
_colour_conversion;
+
boost::optional<PositionImage>
_subtitle;
};
};