diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-09 20:36:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-09 20:36:17 +0100 |
| commit | 10e3bfad8164fc1bce19101253cd3bc9a1f973a3 (patch) | |
| tree | 951e30675a5e74f817e979612aeb2ac289b0ff1d | |
| parent | a1c0d5bbd239fa45a412e788da7f3bc9b7d1f89e (diff) | |
Guess a better optimum frame rate when there is content at 24 and 48 fps (#633).
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/playlist.cc | 8 | ||||
| -rw-r--r-- | test/frame_rate_test.cc | 8 |
3 files changed, 17 insertions, 1 deletions
@@ -1,5 +1,7 @@ 2015-07-09 Carl Hetherington <cth@carlh.net> + * Improve 'best' frame rate guess in some cases (#633). + * Version 2.1.20 released. 2015-07-09 c.hetherington <cth@carlh.net> diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index a0afae0ad..e2135a60e 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -237,8 +237,14 @@ Playlist::best_dcp_frame_rate () const continue; } + /* Best error for this content; we could use the content as-is or double its rate */ + float best_error = min ( + float (fabs (i->source - vc->video_frame_rate ())), + float (fabs (i->source - vc->video_frame_rate () * 2)) + ); + /* Use the largest difference between DCP and source as the "error" */ - this_error = max (this_error, float (fabs (i->source - vc->video_frame_rate ()))); + this_error = max (this_error, best_error); } if (this_error < error) { diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc index 0133431ee..b9fd51391 100644 --- a/test/frame_rate_test.cc +++ b/test/frame_rate_test.cc @@ -235,6 +235,14 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double) A->_video_frame_rate = 30; B->_video_frame_rate = 24; BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 25); + + A->_video_frame_rate = 24; + B->_video_frame_rate = 24; + BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24); + + A->_video_frame_rate = 24; + B->_video_frame_rate = 48; + BOOST_CHECK_EQUAL (film->best_video_frame_rate(), 24); } BOOST_AUTO_TEST_CASE (audio_sampling_rate_test) |