Remove all use of add_child() from xmlpp.

[dcpomatic.git] / src / lib / ffmpeg_image_proxy.cc

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index dd2f80e0e2a3ea5f94e0fa794fb07743645633d1..0ee41deabd1dd6af427a9a2c6c787fae35eec2b7 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -21,21 +21,23 @@
 
 #include "compose.hpp"
 #include "cross.h"
+#include "dcpomatic_assert.h"
 #include "dcpomatic_socket.h"
 #include "exceptions.h"
 #include "ffmpeg_image_proxy.h"
 #include "image.h"
-#include "util.h"
-#include "warnings.h"
+#include "memory_util.h"
+#include "video_filter_graph.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
@@ -122,7 +124,7 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence)
 
 
 ImageProxy::Result
-FFmpegImageProxy::image (bool aligned, optional<dcp::Size>) const
+FFmpegImageProxy::image (Image::Alignment alignment, optional<dcp::Size>) const
 {
        auto constexpr name_for_errors = "FFmpegImageProxy::image";
 
@@ -205,7 +207,20 @@ FFmpegImageProxy::image (bool aligned, optional<dcp::Size>) const
                throw DecodeError (N_("avcodec_receive_frame"), name_for_errors, r, *_path);
        }
 
-       _image = make_shared<Image>(frame, aligned);
+       if (av_pix_fmt_desc_get(context->pix_fmt)->flags & AV_PIX_FMT_FLAG_ALPHA) {
+               /* XXX: this repeated setup of a the filter graph could be really slow
+                * (haven't measured it though).
+                */
+               VideoFilterGraph graph(dcp::Size(frame->width, frame->height), context->pix_fmt, dcp::Fraction(24, 1));
+               auto filter = Filter::from_id("premultiply");
+               DCPOMATIC_ASSERT(filter);
+               graph.setup({*filter});
+               auto images = graph.process(frame);
+               DCPOMATIC_ASSERT(images.size() == 1);
+               _image = images.front().first;
+       } else {
+               _image = make_shared<Image>(frame, alignment);
+       }
 
        av_packet_unref (&packet);
        av_frame_free (&frame);
@@ -219,9 +234,9 @@ FFmpegImageProxy::image (bool aligned, optional<dcp::Size>) const
 
 
 void
-FFmpegImageProxy::add_metadata (xmlpp::Node* node) const
+FFmpegImageProxy::add_metadata(xmlpp::Element* element) const
 {
-       node->add_child("Type")->add_child_text (N_("FFmpeg"));
+       cxml::add_text_child(element, "Type", N_("FFmpeg"));
 }
 
 void