projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
j2k_image_proxy.h
diff --git
a/src/lib/j2k_image_proxy.h
b/src/lib/j2k_image_proxy.h
index 78f291e5d87426b7e910fb224167aee721627840..91c90dba71bad6cd95cdfe6e095a1ebab1439804 100644
(file)
--- a/
src/lib/j2k_image_proxy.h
+++ b/
src/lib/j2k_image_proxy.h
@@
-19,8
+19,8
@@
*/
#include "image_proxy.h"
*/
#include "image_proxy.h"
+#include <dcp/array_data.h>
#include <dcp/util.h>
#include <dcp/util.h>
-#include <dcp/data.h>
#include <boost/thread/mutex.hpp>
namespace dcp {
#include <boost/thread/mutex.hpp>
namespace dcp {
@@
-34,33
+34,33
@@
public:
J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
J2KImageProxy (
J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
J2KImageProxy (
-
boost
::shared_ptr<const dcp::MonoPictureFrame> frame,
+
std
::shared_ptr<const dcp::MonoPictureFrame> frame,
dcp::Size,
AVPixelFormat pixel_format,
boost::optional<int> forced_reduction
);
J2KImageProxy (
dcp::Size,
AVPixelFormat pixel_format,
boost::optional<int> forced_reduction
);
J2KImageProxy (
-
boost
::shared_ptr<const dcp::StereoPictureFrame> frame,
+
std
::shared_ptr<const dcp::StereoPictureFrame> frame,
dcp::Size,
dcp::Eye,
AVPixelFormat pixel_format,
boost::optional<int> forced_reduction
);
dcp::Size,
dcp::Eye,
AVPixelFormat pixel_format,
boost::optional<int> forced_reduction
);
- J2KImageProxy (
boost::shared_ptr<cxml::Node> xml, boost
::shared_ptr<Socket> socket);
+ J2KImageProxy (
std::shared_ptr<cxml::Node> xml, std
::shared_ptr<Socket> socket);
Result image (
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void add_metadata (xmlpp::Node *) const;
Result image (
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void add_metadata (xmlpp::Node *) const;
- void
send_binary (boost
::shared_ptr<Socket>) const;
+ void
write_to_socket (std
::shared_ptr<Socket>) const;
/** @return true if our image is definitely the same as another, false if it is probably not */
/** @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;
+ bool same (
std
::shared_ptr<const ImageProxy>) const;
int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
-
dcp::Data
j2k () const {
+
std::shared_ptr<const dcp::Data>
j2k () const {
return _data;
}
return _data;
}
@@
-74,12
+74,12
@@
private:
friend struct client_server_test_j2k;
/* For tests */
friend struct client_server_test_j2k;
/* For tests */
- J2KImageProxy (dcp::Data data, dcp::Size size, AVPixelFormat pixel_format);
+ J2KImageProxy (dcp::
Array
Data data, dcp::Size size, AVPixelFormat pixel_format);
-
dcp::Data
_data;
+
std::shared_ptr<const dcp::Data>
_data;
dcp::Size _size;
boost::optional<dcp::Eye> _eye;
dcp::Size _size;
boost::optional<dcp::Eye> _eye;
- mutable
boost
::shared_ptr<Image> _image;
+ mutable
std
::shared_ptr<Image> _image;
mutable boost::optional<dcp::Size> _target_size;
mutable boost::optional<int> _reduce;
AVPixelFormat _pixel_format;
mutable boost::optional<dcp::Size> _target_size;
mutable boost::optional<int> _reduce;
AVPixelFormat _pixel_format;