/*
Copyright (C) 2013-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.
- 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
- 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/>.
*/
+#ifndef DCPOMATIC_PLAYER_VIDEO_H
+#define DCPOMATIC_PLAYER_VIDEO_H
+
#include "types.h"
#include "position.h"
+#include "dcpomatic_time.h"
#include "colour_conversion.h"
#include "position_image.h"
extern "C" {
class Image;
class ImageProxy;
class Socket;
-class Data;
/** 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,
public:
PlayerVideo (
boost::shared_ptr<const ImageProxy>,
- DCPTime,
Crop,
- boost::optional<float>,
+ boost::optional<double>,
dcp::Size,
dcp::Size,
Eyes,
Part,
boost::optional<ColourConversion>
);
-
+
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
void set_subtitle (PositionImage);
-
- boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle, dcp::NoteHandler note) 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<Data> 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;
}
+ void set_eyes (Eyes e) {
+ _eyes = e;
+ }
+
boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
private:
boost::shared_ptr<const ImageProxy> _in;
- DCPTime _time;
Crop _crop;
- boost::optional<float> _fade;
+ boost::optional<double> _fade;
dcp::Size _inter_size;
dcp::Size _out_size;
Eyes _eyes;
Part _part;
boost::optional<ColourConversion> _colour_conversion;
- PositionImage _subtitle;
+ boost::optional<PositionImage> _subtitle;
};
+
+#endif