diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-01-26 22:44:08 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-01-26 22:44:08 +0000 |
| commit | 078a0f98e3f741210be7f839292f41f28b6a403e (patch) | |
| tree | 08d3e0a8eb93717ddd1ca1f969cff80e7c4ea48e /src/lib/playlist.cc | |
| parent | 755b9af051c73dae5fffbe613fc45d9fd4fbd08d (diff) | |
Suggest that DCP rates <= 30 are used unless the user explictly goes higher (#1441).
Diffstat (limited to 'src/lib/playlist.cc')
| -rw-r--r-- | src/lib/playlist.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index f530d2ee3..a6b633f2c 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -318,6 +318,7 @@ public: int dcp; }; +/** @return the best frame rate from Config::_allowed_dcp_frame_rates for the content in this list */ int Playlist::best_video_frame_rate () const { @@ -327,14 +328,14 @@ Playlist::best_video_frame_rate () const list<FrameRateCandidate> candidates; /* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */ - for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) { - candidates.push_back (FrameRateCandidate (*i, *i)); + BOOST_FOREACH (int i, allowed_dcp_frame_rates) { + candidates.push_back (FrameRateCandidate(i, i)); } /* Then the skip/repeat ones */ - for (list<int>::const_iterator i = allowed_dcp_frame_rates.begin(); i != allowed_dcp_frame_rates.end(); ++i) { - candidates.push_back (FrameRateCandidate (float (*i) / 2, *i)); - candidates.push_back (FrameRateCandidate (float (*i) * 2, *i)); + BOOST_FOREACH (int i, allowed_dcp_frame_rates) { + candidates.push_back (FrameRateCandidate (float(i) / 2, i)); + candidates.push_back (FrameRateCandidate (float(i) * 2, i)); } /* Pick the best one */ |