*/
+#include "raw_image_proxy.h"
+#include "image.h"
+#include "raw_convert.h"
+#include <dcp/util.h>
+#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
-#include <libcxml/cxml.h>
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
-#include "raw_image_proxy.h"
-#include "image.h"
+#include <libxml++/libxml++.h>
#include "i18n.h"
using std::string;
using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+using boost::optional;
-RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log)
- : ImageProxy (log)
- , _image (image)
+RawImageProxy::RawImageProxy (shared_ptr<Image> image)
+ : _image (image)
{
}
-RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
- : ImageProxy (log)
+RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
dcp::Size size (
xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
}
shared_ptr<Image>
-RawImageProxy::image () const
+RawImageProxy::image (optional<dcp::NoteHandler>) const
{
return _image;
}
RawImageProxy::add_metadata (xmlpp::Node* node) const
{
node->add_child("Type")->add_child_text (N_("Raw"));
- node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_image->size().width));
- node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
- node->add_child("PixelFormat")->add_child_text (dcp::raw_convert<string> (_image->pixel_format ()));
+ node->add_child("Width")->add_child_text (raw_convert<string> (_image->size().width));
+ node->add_child("Height")->add_child_text (raw_convert<string> (_image->size().height));
+ node->add_child("PixelFormat")->add_child_text (raw_convert<string> (_image->pixel_format ()));
}
void
{
_image->write_to_socket (socket);
}
+
+bool
+RawImageProxy::same (shared_ptr<const ImageProxy> other) const
+{
+ shared_ptr<const RawImageProxy> rp = dynamic_pointer_cast<const RawImageProxy> (other);
+ if (!rp) {
+ return false;
+ }
+
+ return (*_image.get()) == (*rp->image().get());
+}
+
+AVPixelFormat
+RawImageProxy::pixel_format () const
+{
+ return _image->pixel_format ();
+}