/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <boost/shared_ptr.hpp>
#include "types.h"
#include "position.h"
+#include "dcpomatic_time.h"
#include "colour_conversion.h"
#include "position_image.h"
+#include "data.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
class Image;
class ImageProxy;
-class Scaler;
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,
boost::shared_ptr<const ImageProxy>,
DCPTime,
Crop,
- boost::optional<float>,
+ boost::optional<double>,
dcp::Size,
dcp::Size,
- Scaler const *,
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);
-
- 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 (AVPixelFormat pix_fmt, dcp::NoteHandler note) const;
+
+ void add_metadata (xmlpp::Node* node) const;
+ void send_binary (boost::shared_ptr<Socket> socket) const;
bool has_j2k () const;
- boost::shared_ptr<EncodedData> j2k () const;
+ Data j2k () const;
DCPTime time () const {
return _time;
return _eyes;
}
- ColourConversion colour_conversion () const {
+ boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
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;
- Scaler const * _scaler;
Eyes _eyes;
Part _part;
- ColourConversion _colour_conversion;
- PositionImage _subtitle;
+ boost::optional<ColourConversion> _colour_conversion;
+ boost::optional<PositionImage> _subtitle;
};