Copy Interop PNG subtitle files correctly (#2640).

diff --git a/src/lib/map_cli.cc b/src/lib/map_cli.cc
index cf07bac8324ab1d19bf13c291853cb735dbf2db6..e38af69cf08e9773dba3d7b00b18683c06ad434b 100644 (file)
--- a/src/lib/map_cli.cc
+++ b/src/lib/map_cli.cc
@@ -277,7 +277,7 @@ map_cli(int argc, char* argv[], std::function<void (string)> out)
                }
        };
 
-       auto maybe_copy_font = [&maybe_copy](shared_ptr<const dcp::SubtitleAsset> asset, bool rename, bool hard_link, bool soft_link) {
+       auto maybe_copy_font_and_images = [&maybe_copy, output_dir, copy](shared_ptr<const dcp::SubtitleAsset> asset, bool rename, bool hard_link, bool soft_link) {
                auto interop = dynamic_pointer_cast<const dcp::InteropSubtitleAsset>(asset);
                boost::optional<boost::filesystem::path> extra;
                if (interop) {
@@ -285,6 +285,12 @@ map_cli(int argc, char* argv[], std::function<void (string)> out)
                        for (auto font_asset: interop->font_assets()) {
                                maybe_copy(font_asset->id(), rename, hard_link, soft_link, extra);
                        }
+                       for (auto subtitle: interop->subtitles()) {
+                               if (auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subtitle)) {
+                                       auto const output_path = *output_dir / asset->id() / image->file()->filename();
+                                       copy(*image->file(), output_path, hard_link, soft_link);
+                               }
+                       }
                }
                return extra;
        };
@@ -296,11 +302,11 @@ map_cli(int argc, char* argv[], std::function<void (string)> out)
                                maybe_copy_from_reel(reel->main_picture(), rename, hard_link, soft_link);
                                maybe_copy_from_reel(reel->main_sound(), rename, hard_link, soft_link);
                                if (reel->main_subtitle()) {
-                                       auto extra = maybe_copy_font(reel->main_subtitle()->asset(), rename, hard_link, soft_link);
+                                       auto extra = maybe_copy_font_and_images(reel->main_subtitle()->asset(), rename, hard_link, soft_link);
                                        maybe_copy_from_reel(reel->main_subtitle(), rename, hard_link, soft_link, extra);
                                }
                                for (auto ccap: reel->closed_captions()) {
-                                       auto extra = maybe_copy_font(ccap->asset(), rename, hard_link, soft_link);
+                                       auto extra = maybe_copy_font_and_images(ccap->asset(), rename, hard_link, soft_link);
                                        maybe_copy_from_reel(ccap, rename, hard_link, soft_link, extra);
                                }
                                maybe_copy_from_reel(reel->atmos(), rename, hard_link, soft_link);

diff --git a/test/map_cli_test.cc b/test/map_cli_test.cc
index a4056dc46009c7255d4355f197b48be84de10184..5505a197bbd1e50aec5c312ca3493f8ef587caba 100644 (file)
--- a/test/map_cli_test.cc
+++ b/test/map_cli_test.cc
@@ -542,3 +542,38 @@ BOOST_AUTO_TEST_CASE(map_uses_config_for_issuer_and_creator)
        BOOST_CHECK(pkl.string_child("Creator") == "Fred");
 }
 
+
+BOOST_AUTO_TEST_CASE(map_handles_interop_png_subs)
+{
+       string const name = "map_handles_interop_png_subs";
+       auto arrietty = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
+       auto film = new_test_film2(name + "_input", { arrietty });
+       film->set_interop(true);
+       arrietty->set_trim_end(dcpomatic::ContentTime::from_seconds(110));
+       arrietty->text[0]->set_use(true);
+       make_and_verify_dcp(
+               film,
+               {
+                       dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME,
+                       dcp::VerificationNote::Code::MISSING_SUBTITLE_LANGUAGE,
+                       dcp::VerificationNote::Code::INVALID_STANDARD
+               });
+
+       auto const out = boost::filesystem::path("build") / "test" / (name + "_output");
+
+       vector<string> const args = {
+               "map_cli",
+               "-o", out.string(),
+               "-d", film->dir(film->dcp_name()).string(),
+               find_cpl(film->dir(film->dcp_name())).string()
+       };
+
+       boost::filesystem::remove_all(out);
+
+       vector<string> output_messages;
+       auto error = run(args, output_messages);
+       BOOST_CHECK(!error);
+
+       verify_dcp(out, { dcp::VerificationNote::Code::INVALID_STANDARD });
+}
+