Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / smpte_subtitle_asset.cc

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 267ff27e692f0a79efa321391f395e68d6318623..8408a57e40217f8ecd4bacbb72ddac9855b782db 100644 (file)
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -47,6 +47,7 @@
 #include "subtitle_image.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_util.h>
+#include <asdcp/KM_log.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
@@ -173,17 +174,19 @@ SMPTESubtitleAsset::read_mxf_descriptor (shared_ptr<ASDCP::TimedText::MXFReader>
                i != descriptor.ResourceList.end();
                ++i) {
 
-               if (i->Type == ASDCP::TimedText::MT_OPENTYPE) {
-                       ASDCP::TimedText::FrameBuffer buffer;
-                       buffer.Capacity (10 * 1024 * 1024);
-                       reader->ReadAncillaryResource (i->ResourceID, buffer, dec->context(), dec->hmac());
+               ASDCP::TimedText::FrameBuffer buffer;
+               buffer.Capacity (10 * 1024 * 1024);
+               reader->ReadAncillaryResource (i->ResourceID, buffer, dec->context(), dec->hmac());
 
-                       char id[64];
-                       Kumu::bin2UUIDhex (i->ResourceID, ASDCP::UUIDlen, id, sizeof (id));
+               char id[64];
+               Kumu::bin2UUIDhex (i->ResourceID, ASDCP::UUIDlen, id, sizeof (id));
 
-                       shared_array<uint8_t> data (new uint8_t[buffer.Size()]);
-                       memcpy (data.get(), buffer.RoData(), buffer.Size());
+               shared_array<uint8_t> data (new uint8_t[buffer.Size()]);
+               memcpy (data.get(), buffer.RoData(), buffer.Size());
 
+               switch (i->Type) {
+               case ASDCP::TimedText::MT_OPENTYPE:
+               {
                        list<shared_ptr<SMPTELoadFontNode> >::const_iterator j = _load_font_nodes.begin ();
                        while (j != _load_font_nodes.end() && (*j)->urn != id) {
                                ++j;
@@ -192,6 +195,22 @@ SMPTESubtitleAsset::read_mxf_descriptor (shared_ptr<ASDCP::TimedText::MXFReader>
                        if (j != _load_font_nodes.end ()) {
                                _fonts.push_back (Font ((*j)->id, (*j)->urn, Data (data, buffer.Size ())));
                        }
+                       break;
+               }
+               case ASDCP::TimedText::MT_PNG:
+               {
+                       list<shared_ptr<Subtitle> >::const_iterator j = _subtitles.begin ();
+                       while (j != _subtitles.end() && ((!dynamic_pointer_cast<SubtitleImage>(*j)) || dynamic_pointer_cast<SubtitleImage>(*j)->id() != id)) {
+                               ++j;
+                       }
+
+                       if (j != _subtitles.end()) {
+                               dynamic_pointer_cast<SubtitleImage>(*j)->set_png_image (Data(data, buffer.Size()));
+                       }
+                       break;
+               }
+               default:
+                       break;
                }
        }
 
@@ -250,7 +269,9 @@ bool
 SMPTESubtitleAsset::valid_mxf (boost::filesystem::path file)
 {
        ASDCP::TimedText::MXFReader reader;
+       Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
        Kumu::Result_t r = reader.OpenRead (file.string().c_str ());
+       Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL);
        return !ASDCP_FAILURE (r);
 }
 
@@ -323,13 +344,16 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
 
        /* Image subtitle references */
 
-       for (ImageUUIDMap::const_iterator i = _image_subtitle_uuid.begin(); i != _image_subtitle_uuid.end(); ++i) {
-               ASDCP::TimedText::TimedTextResourceDescriptor res;
-               unsigned int c;
-               Kumu::hex2bin (i->second.c_str(), res.ResourceID, Kumu::UUID_Length, &c);
-               DCP_ASSERT (c == Kumu::UUID_Length);
-               res.Type = ASDCP::TimedText::MT_PNG;
-               descriptor.ResourceList.push_back (res);
+       BOOST_FOREACH (shared_ptr<Subtitle> i, _subtitles) {
+               shared_ptr<SubtitleImage> si = dynamic_pointer_cast<SubtitleImage>(i);
+               if (si) {
+                       ASDCP::TimedText::TimedTextResourceDescriptor res;
+                       unsigned int c;
+                       Kumu::hex2bin (si->id().c_str(), res.ResourceID, Kumu::UUID_Length, &c);
+                       DCP_ASSERT (c == Kumu::UUID_Length);
+                       res.Type = ASDCP::TimedText::MT_PNG;
+                       descriptor.ResourceList.push_back (res);
+               }
        }
 
        descriptor.NamespaceName = "dcst";
@@ -367,13 +391,16 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
 
        /* Image subtitle payload */
 
-       for (ImageUUIDMap::const_iterator i = _image_subtitle_uuid.begin(); i != _image_subtitle_uuid.end(); ++i) {
-               ASDCP::TimedText::FrameBuffer buffer;
-               buffer.SetData (i->first->png_image().data().get(), i->first->png_image().size());
-               buffer.Size (i->first->png_image().size());
-               r = writer.WriteAncillaryResource (buffer, enc.context(), enc.hmac());
-               if (ASDCP_FAILURE(r)) {
-                       boost::throw_exception (MXFFileError ("could not write PNG data to timed text resource", p.string(), r));
+       BOOST_FOREACH (shared_ptr<Subtitle> i, _subtitles) {
+               shared_ptr<SubtitleImage> si = dynamic_pointer_cast<SubtitleImage>(i);
+               if (si) {
+                       ASDCP::TimedText::FrameBuffer buffer;
+                       buffer.SetData (si->png_image().data().get(), si->png_image().size());
+                       buffer.Size (si->png_image().size());
+                       r = writer.WriteAncillaryResource (buffer, enc.context(), enc.hmac());
+                       if (ASDCP_FAILURE(r)) {
+                               boost::throw_exception (MXFFileError ("could not write PNG data to timed text resource", p.string(), r));
+                       }
                }
        }