projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak logging format.
[dcpomatic.git]
/
src
/
lib
/
image_proxy.h
diff --git
a/src/lib/image_proxy.h
b/src/lib/image_proxy.h
index 0fdea48ee06e04d2610332d259c442d53ab9f8ba..def4878e3e1e5d6f52d16d29ec0f101e3c8c22f2 100644
(file)
--- a/
src/lib/image_proxy.h
+++ b/
src/lib/image_proxy.h
@@
-24,22
+24,23
@@
* @brief ImageProxy and subclasses.
*/
* @brief ImageProxy and subclasses.
*/
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <dcp/types.h>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
-#include <Magick++.h>
-#include <libxml++/libxml++.h>
+#include <boost/optional.hpp>
+#include <boost/utility.hpp>
class Image;
class Socket;
class Image;
class Socket;
-class Log;
-namespace
cxml
{
+namespace
xmlpp
{
class Node;
}
class Node;
}
-namespace dcp {
- class MonoPictureFrame;
- class StereoPictureFrame;
+namespace cxml {
+ class Node;
}
/** @class ImageProxy
}
/** @class ImageProxy
@@
-50,24
+51,23
@@
namespace dcp {
* of happening in a single-threaded decoder.
*
* For example, large TIFFs are slow to decode, so this class will keep
* of happening in a single-threaded decoder.
*
* For example, large TIFFs are slow to decode, so this class will keep
- * the TIFF data
TIFF until such a time that the actual
image is needed.
+ * the TIFF data
compressed until the decompressed
image is needed.
* At this point, the class decodes the TIFF to an Image.
*/
class ImageProxy : public boost::noncopyable
{
public:
* At this point, the class decodes the TIFF to an Image.
*/
class ImageProxy : public boost::noncopyable
{
public:
- ImageProxy (boost::shared_ptr<Log> log);
virtual ~ImageProxy () {}
/** @return Image (which must be aligned) */
virtual ~ImageProxy () {}
/** @return Image (which must be aligned) */
- virtual boost::shared_ptr<Image> image () const = 0;
+ virtual boost::shared_ptr<Image> image (
boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()
) const = 0;
virtual void add_metadata (xmlpp::Node *) const = 0;
virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
virtual void add_metadata (xmlpp::Node *) const = 0;
virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
-
-protected:
-
boost::shared_ptr<Log> _log
;
+ /** @return true if our image is definitely the same as another, false if it is probably not */
+ virtual bool same (boost::shared_ptr<const ImageProxy>) const = 0;
+
virtual AVPixelFormat pixel_format () const = 0
;
};
};
-boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket
, boost::shared_ptr<Log> log
);
+boost::shared_ptr<ImageProxy> image_proxy_factory (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
#endif
#endif