From 10e3bfad8164fc1bce19101253cd3bc9a1f973a3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 9 Jul 2015 20:36:17 +0100 Subject: Guess a better optimum frame rate when there is content at 24 and 48 fps (#633). --- src/lib/playlist.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') 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) { -- cgit v1.2.3