Clarify that in this get_reel_assets() the content and film frame rates will be the...

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index a1ddd07ba2cbf87b085585867f8dc561adbfe732..d35292a56d9d362ac79fd8c2d68e5ecb0b8ce4cb 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -565,6 +565,10 @@ Player::get_reel_assets ()
                        continue;
                }
 
+               if (!dcp->reference_video() && !dcp->reference_audio() && !dcp->reference_text(TextType::OPEN_SUBTITLE) && !dcp->reference_text(TextType::CLOSED_CAPTION)) {
+                       continue;
+               }
+
                scoped_ptr<DCPDecoder> decoder;
                try {
                        decoder.reset (new DCPDecoder(_film, dcp, false, false, shared_ptr<DCPDecoder>()));
@@ -572,19 +576,21 @@ Player::get_reel_assets ()
                        return reel_assets;
                }
 
+               auto const frame_rate = _film->video_frame_rate();
                DCPOMATIC_ASSERT (dcp->video_frame_rate());
-               double const cfr = dcp->video_frame_rate().get();
-               Frame const trim_start = dcp->trim_start().frames_round(cfr);
-               Frame const trim_end = dcp->trim_end().frames_round(cfr);
-               int const ffr = _film->video_frame_rate ();
+               /* We should only be referencing if the DCP rate is the same as the film rate */
+               DCPOMATIC_ASSERT (std::round(dcp->video_frame_rate().get()) == frame_rate);
+
+               Frame const trim_start = dcp->trim_start().frames_round(frame_rate);
+               Frame const trim_end = dcp->trim_end().frames_round(frame_rate);
 
                /* position in the asset from the start */
                int64_t offset_from_start = 0;
                /* position i the asset from the end */
                int64_t offset_from_end = 0;
-               for (auto k: decoder->reels()) {
+               for (auto reel: decoder->reels()) {
                        /* Assume that main picture duration is the length of the reel */
-                       offset_from_end += k->main_picture()->actual_duration();
+                       offset_from_end += reel->main_picture()->actual_duration();
                }
 
                for (auto reel: decoder->reels()) {
@@ -596,22 +602,22 @@ Player::get_reel_assets ()
                        Frame const reel_trim_start = min(reel_duration, max(int64_t(0), trim_start - offset_from_start));
                        Frame const reel_trim_end =   min(reel_duration, max(int64_t(0), reel_duration - (offset_from_end - trim_end)));
 
-                       auto const from = content->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate());
+                       auto const from = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, frame_rate) - DCPTime::from_frames(trim_start, frame_rate));
                        if (dcp->reference_video()) {
-                               maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, ffr);
+                               maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, frame_rate);
                        }
 
                        if (dcp->reference_audio()) {
-                               maybe_add_asset (reel_assets, reel->main_sound(), reel_trim_start, reel_trim_end, from, ffr);
+                               maybe_add_asset (reel_assets, reel->main_sound(), reel_trim_start, reel_trim_end, from, frame_rate);
                        }
 
                        if (dcp->reference_text(TextType::OPEN_SUBTITLE)) {
-                               maybe_add_asset (reel_assets, reel->main_subtitle(), reel_trim_start, reel_trim_end, from, ffr);
+                               maybe_add_asset (reel_assets, reel->main_subtitle(), reel_trim_start, reel_trim_end, from, frame_rate);
                        }
 
                        if (dcp->reference_text(TextType::CLOSED_CAPTION)) {
-                               for (auto l: reel->closed_captions()) {
-                                       maybe_add_asset (reel_assets, l, reel_trim_start, reel_trim_end, from, ffr);
+                               for (auto caption: reel->closed_captions()) {
+                                       maybe_add_asset (reel_assets, caption, reel_trim_start, reel_trim_end, from, frame_rate);
                                }
                        }