/*
- Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#ifndef DCPOMATIC_PLAYER_VIDEO_H
#define DCPOMATIC_PLAYER_VIDEO_H
+
#include "types.h"
#include "position.h"
#include "dcpomatic_time.h"
#include <libavutil/pixfmt.h>
}
#include <boost/thread/mutex.hpp>
-#include <boost/noncopyable.hpp>
+
class Image;
class ImageProxy;
class Film;
class Socket;
+
/** 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,
* or maybe not even bother to combine them at all.
*/
-class PlayerVideo : public boost::noncopyable
+class PlayerVideo
{
public:
PlayerVideo (
- std::shared_ptr<const ImageProxy>,
- Crop,
- boost::optional<double>,
- dcp::Size,
- dcp::Size,
- Eyes,
- Part,
- boost::optional<ColourConversion>,
+ std::shared_ptr<const ImageProxy> image,
+ Crop crop,
+ boost::optional<double> fade,
+ dcp::Size inter_size,
+ dcp::Size out_size,
+ Eyes eyes,
+ Part part,
+ boost::optional<ColourConversion> colour_conversion,
VideoRange video_range,
- std::weak_ptr<Content>,
- boost::optional<Frame>,
+ std::weak_ptr<Content> content,
+ boost::optional<Frame> video_frame,
bool error
);
PlayerVideo (std::shared_ptr<cxml::Node>, std::shared_ptr<Socket>);
+ PlayerVideo (PlayerVideo const&) = delete;
+ PlayerVideo& operator= (PlayerVideo const&) = delete;
+
std::shared_ptr<PlayerVideo> shallow_copy () const;
void set_text (PositionImage);
- void prepare (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast);
- std::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
+ void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast);
+ std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
}
private:
- void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
+ void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
std::shared_ptr<const ImageProxy> _in;
Crop _crop;
mutable bool _error;
};
+
#endif