/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "image_proxy.h"
#include <dcp/util.h>
#include <dcp/data.h>
+#include <boost/thread/mutex.hpp>
namespace dcp {
class MonoPictureFrame;
{
public:
J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
- J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size, AVPixelFormat pixel_format);
- J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format);
+
+ J2KImageProxy (
+ boost::shared_ptr<const dcp::MonoPictureFrame> frame,
+ dcp::Size,
+ AVPixelFormat pixel_format,
+ boost::optional<int> forced_reduction
+ );
+
+ J2KImageProxy (
+ boost::shared_ptr<const dcp::StereoPictureFrame> frame,
+ dcp::Size,
+ dcp::Eye,
+ AVPixelFormat pixel_format,
+ boost::optional<int> forced_reduction
+ );
+
J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
- boost::shared_ptr<Image> image (
- boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+ std::pair<boost::shared_ptr<Image>, int> image (
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void send_binary (boost::shared_ptr<Socket>) const;
/** @return true if our image is definitely the same as another, false if it is probably not */
bool same (boost::shared_ptr<const ImageProxy>) const;
- AVPixelFormat pixel_format () const {
- return _pixel_format;
- }
+ int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
dcp::Data j2k () const {
return _data;
return _size;
}
+ size_t memory_used () const;
+
private:
friend struct client_server_test_j2k;
dcp::Data _data;
dcp::Size _size;
boost::optional<dcp::Eye> _eye;
- mutable boost::shared_ptr<dcp::OpenJPEGImage> _decompressed;
+ mutable boost::shared_ptr<Image> _image;
mutable boost::optional<dcp::Size> _target_size;
+ mutable boost::optional<int> _reduce;
AVPixelFormat _pixel_format;
+ mutable boost::mutex _mutex;
+ boost::optional<int> _forced_reduction;
};