projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge; other tweaks.
[dcpomatic.git]
/
src
/
lib
/
dcp_video_frame.cc
diff --git
a/src/lib/dcp_video_frame.cc
b/src/lib/dcp_video_frame.cc
index 201c74ec173ca3e3a241e07429000c0120d9c29c..c185de0f4d74ffeef5b6df6cdec2299874db6c3f 100644
(file)
--- a/
src/lib/dcp_video_frame.cc
+++ b/
src/lib/dcp_video_frame.cc
@@
-74,9
+74,9
@@
using boost::shared_ptr;
* @param l Log to write to.
*/
DCPVideoFrame::DCPVideoFrame (
* @param l Log to write to.
*/
DCPVideoFrame::DCPVideoFrame (
- shared_ptr<Image> yuv, shared_ptr<Subtitle> sub,
+ shared_ptr<
const
Image> yuv, shared_ptr<Subtitle> sub,
Size out, int p, int subtitle_offset, float subtitle_scale,
Size out, int p, int subtitle_offset, float subtitle_scale,
- Scaler const * s,
int
f, float fps, string pp, int clut, int bw, Log* l
+ Scaler const * s,
SourceFrame
f, float fps, string pp, int clut, int bw, Log* l
)
: _input (yuv)
, _subtitle (sub)
)
: _input (yuv)
, _subtitle (sub)
@@
-86,8
+86,7
@@
DCPVideoFrame::DCPVideoFrame (
, _subtitle_scale (subtitle_scale)
, _scaler (s)
, _frame (f)
, _subtitle_scale (subtitle_scale)
, _scaler (s)
, _frame (f)
- /* we round here; not sure if this is right */
- , _frames_per_second (rint (fps))
+ , _frames_per_second (dcp_frame_rate(fps).frames_per_second)
, _post_process (pp)
, _colour_lut_index (clut)
, _j2k_bandwidth (bw)
, _post_process (pp)
, _colour_lut_index (clut)
, _j2k_bandwidth (bw)
@@
-377,7
+376,7
@@
DCPVideoFrame::encode_remotely (ServerDescription const * serv)
* @param frame Frame index.
*/
void
* @param frame Frame index.
*/
void
-EncodedData::write (shared_ptr<const Options> opt,
int
frame)
+EncodedData::write (shared_ptr<const Options> opt,
SourceFrame
frame)
{
string const tmp_j2k = opt->frame_out_path (frame, true);
{
string const tmp_j2k = opt->frame_out_path (frame, true);