Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / lib / frame_rate_change.cc

diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index 31fce6b6d71182625ebc0a43bc4609d1e7f5ab8c..8ad6de9425aa2675158ed5b7a3421658e4c0aedf 100644 (file)
--- a/src/lib/frame_rate_change.cc
+++ b/src/lib/frame_rate_change.cc
@@ -1,65 +1,66 @@
 /*
-    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 "content.h"
+#include "film.h"
 #include "compose.hpp"
+#include <cmath>
 
 #include "i18n.h"
 
 using std::string;
+using boost::shared_ptr;
 
 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_)
-       : source (source_)
-       , dcp (dcp_)
+FrameRateChange::FrameRateChange ()
+       : source (24)
+       , dcp (24)
        , skip (false)
        , repeat (1)
        , change_speed (false)
+       , speed_up (1)
+{
+
+}
+
+FrameRateChange::FrameRateChange (double source_, int dcp_)
+       : skip (false)
+       , repeat (1)
+       , change_speed (false)
 {
+       construct (source_, dcp_);
+}
+
+void
+FrameRateChange::construct (double source_, int 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.
@@ -77,11 +78,25 @@ FrameRateChange::FrameRateChange (float source_, int dcp_)
        change_speed = !about_equal (speed_up, 1.0);
 }
 
+FrameRateChange::FrameRateChange (shared_ptr<const Film> film, shared_ptr<const Content> content)
+       : skip (false)
+       , repeat (1)
+{
+       construct (content->active_video_frame_rate(film), film->video_frame_rate());
+}
+
+FrameRateChange::FrameRateChange (shared_ptr<const Film> film, Content const * content)
+       : skip (false)
+       , repeat (1)
+{
+       construct (content->active_video_frame_rate(film), film->video_frame_rate());
+}
+
 string
 FrameRateChange::description () const
 {
        string description;
-       
+
        if (!skip && repeat == 1 && !change_speed) {
                description = _("Content and DCP have the same rate.\n");
        } else {
@@ -94,8 +109,10 @@ FrameRateChange::description () const
                }
 
                if (change_speed) {
-                       float const pc = dcp * 100 / (source * factor());
-                       description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
+                       double const pc = dcp * 100 / (source * factor());
+                       char buffer[256];
+                       snprintf (buffer, sizeof(buffer), _("DCP will run at %.1f%% of the content speed.\n"), pc);
+                       description += buffer;
                }
        }