More float -> double.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 3bfbd7720c9e04cf99b951db455e306bd2be3cb9..531a33c03491bb4c05991f97c4f6853c5c8f3a13 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,13 +25,15 @@
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
-#include <dcp/mono_picture_mxf.h>
-#include <dcp/stereo_picture_mxf.h>
+#include <dcp/mono_picture_asset.h>
+#include <dcp/stereo_picture_asset.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_frame.h>
+#include <boost/foreach.hpp>
 
 using std::list;
 using std::cout;
@@ -55,30 +57,30 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c)
 }
 
 bool
-DCPDecoder::pass (PassReason)
+DCPDecoder::pass ()
 {
        if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
                return true;
        }
 
-       float const vfr = _dcp_content->video_frame_rate ();
+       double const vfr = _dcp_content->video_frame_rate ();
        int64_t const frame = _next.frames (vfr);
-       
+
        if ((*_reel)->main_picture ()) {
-               shared_ptr<dcp::PictureMXF> mxf = (*_reel)->main_picture()->mxf ();
-               shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (mxf);
-               shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
+               shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
+               shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
+               shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
                int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
                if (mono) {
-                       video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size())), frame);
+                       video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame);
                } else {
                        video (
-                               shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT)),
+                               shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
                                frame
                                );
-                       
+
                        video (
-                               shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT)),
+                               shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
                                frame
                                );
                }
@@ -86,10 +88,10 @@ DCPDecoder::pass (PassReason)
 
        if ((*_reel)->main_sound ()) {
                int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
-               shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->mxf()->get_frame (entry_point + frame);
+               shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame);
                uint8_t const * from = sf->data ();
 
-               int const channels = _dcp_content->audio_channels ();
+               int const channels = _dcp_content->audio_stream()->channels ();
                int const frames = sf->size() / (3 * channels);
                shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
                for (int i = 0; i < frames; ++i) {
@@ -99,10 +101,28 @@ DCPDecoder::pass (PassReason)
                        }
                }
 
-               audio (data, _next);
+               audio (_dcp_content->audio_stream(), data, _next);
        }
 
-       /* XXX: subtitle */
+       if ((*_reel)->main_subtitle ()) {
+               int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
+               list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during (
+                       dcp::Time (entry_point + frame, vfr, vfr),
+                       dcp::Time (entry_point + frame + 1, vfr, vfr),
+                       true
+                       );
+
+               if (!subs.empty ()) {
+                       /* XXX: assuming that all `subs' are at the same time; maybe this is ok */
+                       text_subtitle (
+                               ContentTimePeriod (
+                                       ContentTime::from_seconds (subs.front().in().as_seconds ()),
+                                       ContentTime::from_seconds (subs.front().out().as_seconds ())
+                                       ),
+                               subs
+                               );
+               }
+       }
 
        _next += ContentTime::from_frames (1, vfr);
 
@@ -111,7 +131,7 @@ DCPDecoder::pass (PassReason)
                        ++_reel;
                }
        }
-       
+
        return false;
 }
 
@@ -139,8 +159,35 @@ DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const
 }
 
 list<ContentTimePeriod>
-DCPDecoder::text_subtitles_during (ContentTimePeriod, bool) const
+DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const
 {
-       /* XXX */
-       return list<ContentTimePeriod> ();
+       /* XXX: inefficient */
+
+       list<ContentTimePeriod> ctp;
+       double const vfr = _dcp_content->video_frame_rate ();
+
+       BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
+               if (!r->main_subtitle ()) {
+                       continue;
+               }
+
+               int64_t const entry_point = r->main_subtitle()->entry_point ();
+
+               list<dcp::SubtitleString> subs = r->main_subtitle()->subtitle_asset()->subtitles_during (
+                       dcp::Time (period.from.seconds ()) - dcp::Time (entry_point, vfr, vfr),
+                       dcp::Time (period.to.seconds ()) - dcp::Time (entry_point, vfr, vfr),
+                       starting
+                       );
+
+               BOOST_FOREACH (dcp::SubtitleString const & s, subs) {
+                       ctp.push_back (
+                               ContentTimePeriod (
+                                       ContentTime::from_seconds (s.in().as_seconds ()),
+                                       ContentTime::from_seconds (s.out().as_seconds ())
+                                       )
+                               );
+               }
+       }
+
+       return ctp;
 }