*/
-#include <boost/shared_ptr.hpp>
#include "types.h"
#include "position.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 Scaler;
class Socket;
-class Log;
class EncodedData;
/** Everything needed to describe a video frame coming out of the player, but with the
class PlayerVideo
{
public:
- PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion);
- PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
+ PlayerVideo (
+ boost::shared_ptr<const ImageProxy>,
+ DCPTime,
+ Crop,
+ boost::optional<float>,
+ dcp::Size,
+ dcp::Size,
+ Scaler const *,
+ Eyes,
+ Part,
+ boost::optional<ColourConversion>
+ );
+
+ PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
void set_subtitle (PositionImage);
- boost::shared_ptr<Image> image (bool burn_subtitle) const;
+ boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, 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;
return _eyes;
}
- ColourConversion colour_conversion () const {
+ boost::optional<ColourConversion> colour_conversion () const {
return _colour_conversion;
}
+ /** @return Position of the content within the overall image once it has been scaled up */
+ Position<int> inter_position () const;
+
+ /** @return Size of the content within the overall image once it has been scaled up */
+ dcp::Size inter_size () const {
+ return _inter_size;
+ }
+
+ bool same (boost::shared_ptr<const PlayerVideo> other) const;
+
private:
boost::shared_ptr<const ImageProxy> _in;
DCPTime _time;
Crop _crop;
+ boost::optional<float> _fade;
dcp::Size _inter_size;
dcp::Size _out_size;
Scaler const * _scaler;
Eyes _eyes;
Part _part;
- ColourConversion _colour_conversion;
+ boost::optional<ColourConversion> _colour_conversion;
PositionImage _subtitle;
};