projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add and use dB/linear conversion functions.
[dcpomatic.git]
/
src
/
lib
/
frame_rate_change.h
diff --git
a/src/lib/frame_rate_change.h
b/src/lib/frame_rate_change.h
index f5244fea2b5d68491039b5c52db71d4ca81dd35f..acb75c0b5764e91257ef21d86ff6474b99134ee0 100644
(file)
--- a/
src/lib/frame_rate_change.h
+++ b/
src/lib/frame_rate_change.h
@@
-1,35
+1,44
@@
/*
/*
- 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/>.
*/
#ifndef DCPOMATIC_FRAME_RATE_CHANGE_H
#define DCPOMATIC_FRAME_RATE_CHANGE_H
*/
#ifndef DCPOMATIC_FRAME_RATE_CHANGE_H
#define DCPOMATIC_FRAME_RATE_CHANGE_H
+#include <boost/shared_ptr.hpp>
#include <string>
#include <string>
-struct FrameRateChange
+class Film;
+class Content;
+
+class FrameRateChange
{
{
- FrameRateChange (float, int);
+public:
+ FrameRateChange ();
+ FrameRateChange (double, int);
+ FrameRateChange (boost::shared_ptr<const Film> film, boost::shared_ptr<const Content> content);
+ FrameRateChange (boost::shared_ptr<const Film> film, Content const * content);
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
*/
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
*/
-
float
factor () const {
+
double
factor () const {
if (skip) {
return 0.5;
}
if (skip) {
return 0.5;
}
@@
-37,7
+46,7
@@
struct FrameRateChange
return repeat;
}
return repeat;
}
-
float
source;
+
double
source;
int dcp;
/** true to skip every other frame */
int dcp;
/** true to skip every other frame */
@@
-58,9
+67,12
@@
struct FrameRateChange
/** Amount by which the video is being sped-up in the DCP; e.g. for a
* 24fps source in a 25fps DCP this would be 25/24.
*/
/** Amount by which the video is being sped-up in the DCP; e.g. for a
* 24fps source in a 25fps DCP this would be 25/24.
*/
-
float
speed_up;
+
double
speed_up;
std::string description () const;
std::string description () const;
+
+private:
+ void construct (double source_, int dcp_);
};
#endif
};
#endif