projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated es_ES translation from Manuel AC.
[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 3eccc213da41c348a73f431f7e5ac3f992b50698..d925bef864fe9129fc59dd8246b4b305325ea55e 100644
(file)
--- a/
src/lib/j2k_image_proxy.h
+++ b/
src/lib/j2k_image_proxy.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,49
+18,56
@@
*/
*/
+
#include "image_proxy.h"
#include <dcp/array_data.h>
#include <dcp/util.h>
#include <boost/thread/mutex.hpp>
#include "image_proxy.h"
#include <dcp/array_data.h>
#include <dcp/util.h>
#include <boost/thread/mutex.hpp>
+
namespace dcp {
class MonoPictureFrame;
class StereoPictureFrame;
}
namespace dcp {
class MonoPictureFrame;
class StereoPictureFrame;
}
+
class J2KImageProxy : public ImageProxy
{
public:
J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
J2KImageProxy (
class J2KImageProxy : public ImageProxy
{
public:
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);
+
+ /* For tests */
+ J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
Result image (
Result image (
+ Image::Alignment alignment,
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void add_metadata (xmlpp::Node *) const;
boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
) const;
void add_metadata (xmlpp::Node *) const;
- void write_to_socket (
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;
- int prepare (boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
+ bool same (
std
::shared_ptr<const ImageProxy>) const;
+ int prepare (
Image::Alignment alignment,
boost::optional<dcp::Size> = boost::optional<dcp::Size>()) const;
-
boost
::shared_ptr<const dcp::Data> j2k () const {
+
std
::shared_ptr<const dcp::Data> j2k () const {
return _data;
}
return _data;
}
@@
-68,18
+75,17
@@
public:
return _size;
}
return _size;
}
+ boost::optional<dcp::Eye> eye () const {
+ return _eye;
+ }
+
size_t memory_used () const;
private:
size_t memory_used () const;
private:
- friend struct client_server_test_j2k;
-
- /* For tests */
- J2KImageProxy (dcp::ArrayData data, dcp::Size size, AVPixelFormat pixel_format);
-
- boost::shared_ptr<const 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;