Bump libdcp for better verification, and make API adjustments.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 758ddea2674174bc4e6d2b68c03811de481c6fc3..4bc090bf4981c622c8a124fe596e57cc3f80c2c0 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -49,16 +49,17 @@
 #include <dcp/subtitle_image.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/reel_atmos_asset.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::list;
 using std::cout;
+using std::map;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::vector;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
 using namespace dcpomatic;
 
@@ -74,7 +75,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
                if (c->audio) {
                        audio.reset (new AudioDecoder (this, c->audio, fast));
                }
-               BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+               for (auto i: c->text) {
                        /* XXX: this time here should be the time of the first subtitle, not 0 */
                        text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, i, ContentTime())));
                }
@@ -104,7 +105,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const Film> film, shared_ptr<const DCPContent
                }
 
                shared_ptr<dcp::CPL> cpl;
-               BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
+               for (auto i: cpl_list) {
                        if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
                                cpl = i;
                        }
@@ -261,7 +262,7 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size)
                ++decoder;
        }
 
-       BOOST_FOREACH (shared_ptr<dcp::ReelClosedCaptionAsset> i, (*_reel)->closed_captions()) {
+       for (auto i: (*_reel)->closed_captions()) {
                pass_texts (
                        next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size
                        );
@@ -279,7 +280,7 @@ DCPDecoder::pass_texts (
        int64_t const frame = next.frames_round (vfr);
 
        if (_decode_referenced || !reference) {
-               list<shared_ptr<dcp::Subtitle> > subs = asset->subtitles_during (
+               auto subs = asset->subtitles_during (
                        dcp::Time (entry_point + frame, vfr, vfr),
                        dcp::Time (entry_point + frame + 1, vfr, vfr),
                        true
@@ -287,11 +288,11 @@ DCPDecoder::pass_texts (
 
                list<dcp::SubtitleString> strings;
 
-               BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
-                       shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+               for (auto i: subs) {
+                       auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
                        if (is) {
                                if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) {
-                                       dcp::SubtitleString b = strings.back();
+                                       auto b = strings.back();
                                        decoder->emit_plain (
                                                ContentTimePeriod (
                                                        ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -309,7 +310,7 @@ DCPDecoder::pass_texts (
                           this would need to be done both here and in DCPSubtitleDecoder.
                        */
 
-                       shared_ptr<dcp::SubtitleImage> ii = dynamic_pointer_cast<dcp::SubtitleImage> (i);
+                       auto ii = dynamic_pointer_cast<const dcp::SubtitleImage>(i);
                        if (ii) {
                                emit_subtitle_image (
                                        ContentTimePeriod (
@@ -324,7 +325,7 @@ DCPDecoder::pass_texts (
                }
 
                if (!strings.empty()) {
-                       dcp::SubtitleString b = strings.back();
+                       auto b = strings.back();
                        decoder->emit_plain (
                                ContentTimePeriod (
                                        ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()),
@@ -469,7 +470,7 @@ string
 DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
 {
        Digester d;
-       BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
+       for (auto i: c->paths()) {
                d.add (i.string());
        }
        if (_dcp_content->kdm()) {
@@ -487,3 +488,20 @@ DCPDecoder::position () const
 {
        return ContentTime::from_frames(_offset, _dcp_content->active_video_frame_rate(film())) + _next;
 }
+
+
+vector<FontData>
+DCPDecoder::fonts () const
+{
+       vector<FontData> data;
+       for (auto i: _reels) {
+               if (i->main_subtitle() && i->main_subtitle()->asset()) {
+                       map<string, dcp::ArrayData> fm = i->main_subtitle()->asset()->font_data();
+                       for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
+                               data.push_back (FontData(j->first, j->second));
+                       }
+               }
+       }
+       return data;
+}
+