diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-02 15:08:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-04 11:45:49 +0100 |
| commit | 89c0fc8bf6893ecde5e220dca96444afd069bf7f (patch) | |
| tree | eebee5472ee363ecec35da91746d2d8bc050292f | |
| parent | 2de5d4f8a9ca8c2a684172d439dded71be71c047 (diff) | |
Clarify that in this get_reel_assets() the content and film frame rates will be the same.
| -rw-r--r-- | src/lib/player.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index c5d315f56..d35292a56 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -576,11 +576,13 @@ 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; @@ -600,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 = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, ffr) - DCPTime::from_frames(trim_start, cfr)); + 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 caption: reel->closed_captions()) { - maybe_add_asset (reel_assets, caption, reel_trim_start, reel_trim_end, from, ffr); + maybe_add_asset (reel_assets, caption, reel_trim_start, reel_trim_end, from, frame_rate); } } |