projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[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 3e9c4b50528c4bf0fb3e4fe2fc786015d32c4a43..8b2d6cf99c54411d95008f0bc2d29835000d6dec 100644
(file)
--- a/
src/lib/frame_rate_change.cc
+++ b/
src/lib/frame_rate_change.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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.
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
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/>.
*/
*/
@@
-23,8
+24,10
@@
#include "i18n.h"
#include "i18n.h"
+using std::string;
+
static bool
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
{
/* A film of F seconds at f FPS will be Ff frames;
Consider some delta FPS d, so if we run the same
@@
-35,14
+38,14
@@
about_equal (float a, float b)
= Ff + Fd - Ff frames
= Fd frames
= Fd/f seconds
= 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 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
*/
So for a 3hr film, ie F = 3 * 60 * 60 = 10800, the acceptable
FPS error is 1/F ~= 0.0001 ~= 10-e4
*/
@@
-51,8
+54,10
@@
about_equal (float a, float b)
}
}
-FrameRateChange::FrameRateChange (float source, int dcp)
- : skip (false)
+FrameRateChange::FrameRateChange (double source_, int dcp_)
+ : source (source_)
+ , dcp (dcp_)
+ , skip (false)
, repeat (1)
, change_speed (false)
{
, repeat (1)
, change_speed (false)
{
@@
-71,6
+76,12
@@
FrameRateChange::FrameRateChange (float source, int dcp)
speed_up = dcp / (source * factor());
change_speed = !about_equal (speed_up, 1.0);
speed_up = dcp / (source * factor());
change_speed = !about_equal (speed_up, 1.0);
+}
+
+string
+FrameRateChange::description () const
+{
+ string description;
if (!skip && repeat == 1 && !change_speed) {
description = _("Content and DCP have the same rate.\n");
if (!skip && repeat == 1 && !change_speed) {
description = _("Content and DCP have the same rate.\n");
@@
-84,8
+95,10
@@
FrameRateChange::FrameRateChange (float source, int dcp)
}
if (change_speed) {
}
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);
}
}
description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
}
}
+
+ return description;
}
}