X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fframe_rate_change.cc;h=80a167029009349913b21e15c35d6aa0c760b4f2;hb=314db80ccee82ef4854400ee7b4e3f4123ec2ef7;hp=31fce6b6d71182625ebc0a43bc4609d1e7f5ab8c;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;p=dcpomatic.git

diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index 31fce6b6d..80a167029 100644
--- a/src/lib/frame_rate_change.cc
+++ b/src/lib/frame_rate_change.cc
@@ -1,59 +1,40 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <cmath>
 #include "frame_rate_change.h"
+#include "types.h"
 #include "compose.hpp"
+#include <cmath>
 
 #include "i18n.h"
 
 using std::string;
 
 static bool
-about_equal (float a, float b)
+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
-
-	   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
-	*/
-
-	return (fabs (a - b) < 1e-4);
+	return (fabs (a - b) < VIDEO_FRAME_RATE_EPSILON);
 }
 
 
-FrameRateChange::FrameRateChange (float source_, int dcp_)
+FrameRateChange::FrameRateChange (double source_, int dcp_)
 	: source (source_)
 	, dcp (dcp_)
 	, skip (false)
@@ -81,7 +62,7 @@ string
 FrameRateChange::description () const
 {
 	string description;
-	
+
 	if (!skip && repeat == 1 && !change_speed) {
 		description = _("Content and DCP have the same rate.\n");
 	} else {
@@ -94,7 +75,7 @@ FrameRateChange::description () const
 		}
 
 		if (change_speed) {
-			float const pc = dcp * 100 / (source * factor());
+			double const pc = dcp * 100 / (source * factor());
 			description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
 		}
 	}