X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fframe_rate_change.cc;h=a1ff2ae650a93d7ec19782763f359b4b6a0c883a;hb=cfbe9d2f44e380efed7a61b5b5c7a2fec7794915;hp=8b2d6cf99c54411d95008f0bc2d29835000d6dec;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index 8b2d6cf99..a1ff2ae65 100644
--- a/src/lib/frame_rate_change.cc
+++ b/src/lib/frame_rate_change.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,55 +18,38 @@
 
 */
 
-#include <cmath>
+
 #include "frame_rate_change.h"
+#include "types.h"
+#include "content.h"
+#include "film.h"
 #include "compose.hpp"
+#include <cmath>
 
 #include "i18n.h"
 
-using std::string;
-
-static bool
-about_equal (double a, double b)
-{
-	/* A film of F seconds at f FPS will be Ff frames;
-	   Consider some delta FPS d, so if we run the same
-	   film at (f + d) FPS it will last F(f + d) seconds.
-
-	   Hence the difference in length over the length of the film will
-	   be F(f + d) - Ff frames
-	    = Ff + Fd - Ff frames
-	    = Fd frames
-	    = Fd/f seconds
 
-	   So if we accept a difference of 1 frame, ie 1/f seconds, we can
-	   say that
+using std::string;
+using std::shared_ptr;
 
-	   1/f = Fd/f
-	ie 1 = Fd
-	ie d = 1/F
 
-	   So for a 3hr film, ie F = 3 * 60 * 60 = 10800, the acceptable
-	   FPS error is 1/F ~= 0.0001 ~= 10-e4
-	*/
+FrameRateChange::FrameRateChange ()
+{
 
-	return (fabs (a - b) < 1e-4);
 }
 
 
 FrameRateChange::FrameRateChange (double source_, int dcp_)
-	: source (source_)
-	, dcp (dcp_)
-	, skip (false)
-	, repeat (1)
-	, change_speed (false)
 {
-	if (fabs (source / 2.0 - dcp) < fabs (source - dcp)) {
+	source = source_;
+	dcp = dcp_;
+
+	if (fabs(source / 2.0 - dcp) < fabs(source - dcp)) {
 		/* The difference between source and DCP frame rate will be lower
 		   (i.e. better) if we skip.
 		*/
 		skip = true;
-	} else if (fabs (source * 2 - dcp) < fabs (source - dcp)) {
+	} else if (fabs(source * 2 - dcp) < fabs(source - dcp)) {
 		/* The difference between source and DCP frame rate would be better
 		   if we repeated each frame once; it may be better still if we
 		   repeated more than once.  Work out the required repeat.
@@ -75,9 +58,29 @@ FrameRateChange::FrameRateChange (double source_, int dcp_)
 	}
 
 	speed_up = dcp / (source * factor());
+
+	auto about_equal = [](double a, double b) {
+		return (fabs (a - b) < VIDEO_FRAME_RATE_EPSILON);
+	};
+
 	change_speed = !about_equal (speed_up, 1.0);
 }
 
+
+FrameRateChange::FrameRateChange (shared_ptr<const Film> film, shared_ptr<const Content> content)
+	: FrameRateChange (content->active_video_frame_rate(film), film->video_frame_rate())
+{
+
+}
+
+
+FrameRateChange::FrameRateChange (shared_ptr<const Film> film, Content const * content)
+	: FrameRateChange (content->active_video_frame_rate(film), film->video_frame_rate())
+{
+
+}
+
+
 string
 FrameRateChange::description () const
 {
@@ -96,7 +99,9 @@ FrameRateChange::description () const
 
 		if (change_speed) {
 			double const pc = dcp * 100 / (source * factor());
-			description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
+			char buffer[256];
+			snprintf (buffer, sizeof(buffer), _("DCP will run at %.1f%% of the content speed.\n"), pc);
+			description += buffer;
 		}
 	}