summaryrefslogtreecommitdiff
path: root/src/lib/film.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/film.cc')
-rw-r--r--src/lib/film.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index b2abe4759..da664a5a5 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -258,6 +258,7 @@ Film::make_dcp (bool transcode)
o->padding = format()->dcp_padding (shared_from_this ());
o->ratio = format()->ratio_as_float (shared_from_this ());
o->decode_subtitles = with_subtitles ();
+ o->decode_video_skip = dcp_frame_rate (frames_per_second()).skip;
shared_ptr<Job> r;
@@ -685,11 +686,13 @@ Film::target_audio_sample_rate () const
/* Resample to a DCI-approved sample rate */
double t = dcp_audio_sample_rate (audio_sample_rate());
+ DCPFrameRate dfr = dcp_frame_rate (frames_per_second ());
+
/* Compensate for the fact that video will be rounded to the
nearest integer number of frames per second.
*/
- if (rint (frames_per_second()) != frames_per_second()) {
- t *= _frames_per_second / rint (frames_per_second());
+ if (dfr.run_fast) {
+ t *= _frames_per_second * dfr.skip / dfr.frames_per_second;
}
return rint (t);