/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "raw_image_proxy.h"
#include "image.h"
#include <dcp/raw_convert.h>
#include <dcp/util.h>
+#include <dcp/warnings.h>
#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
#include "i18n.h"
+
+using std::dynamic_pointer_cast;
+using std::make_pair;
+using std::make_shared;
+using std::pair;
+using std::shared_ptr;
using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
using boost::optional;
using dcp::raw_convert;
+
RawImageProxy::RawImageProxy (shared_ptr<Image> image)
: _image (image)
{
}
+
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
dcp::Size size (
- xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
+ xml->number_child<int>("Width"), xml->number_child<int>("Height")
);
- _image.reset (new Image (static_cast<AVPixelFormat> (xml->number_child<int> ("PixelFormat")), size, true));
+ _image = make_shared<Image>(static_cast<AVPixelFormat>(xml->number_child<int>("PixelFormat")), size, Image::Alignment::PADDED);
_image->read_from_socket (socket);
}
-shared_ptr<Image>
-RawImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
+
+ImageProxy::Result
+RawImageProxy::image (Image::Alignment alignment, optional<dcp::Size>) const
{
- return _image;
+ /* This ensure_alignment could be wasteful */
+ return Result (Image::ensure_alignment(_image, alignment), 0);
}
+
void
RawImageProxy::add_metadata (xmlpp::Node* node) const
{
- node->add_child("Type")->add_child_text (N_("Raw"));
- 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> (static_cast<int> (_image->pixel_format ())));
+ node->add_child("Type")->add_child_text(N_("Raw"));
+ 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>(static_cast<int>(_image->pixel_format())));
}
+
void
-RawImageProxy::send_binary (shared_ptr<Socket> socket) const
+RawImageProxy::write_to_socket (shared_ptr<Socket> socket) const
{
_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);
+ auto rp = dynamic_pointer_cast<const RawImageProxy> (other);
if (!rp) {
return false;
}
- return (*_image.get()) == (*rp->image().get());
+ return (*_image.get()) == (*rp->image(_image->alignment()).image.get());
}
-AVPixelFormat
-RawImageProxy::pixel_format () const
-{
- return _image->pixel_format ();
-}
size_t
RawImageProxy::memory_used () const