diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-04 13:10:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-04 13:10:28 +0100 |
| commit | 4a74ca2cb973585122e84c21ff48ff4ff1ebd488 (patch) | |
| tree | e73cc4ef0850326f1f45037b0c22ab00a0f94685 /src/lib/audio_content.cc | |
| parent | 418f17235e05d5f8c449e848c6a81e1b9017bd8a (diff) | |
Back-port v2's rename and slight extension of FrameRateConversion.
Diffstat (limited to 'src/lib/audio_content.cc')
| -rw-r--r-- | src/lib/audio_content.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 79912f1ae..7d77154e1 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -25,6 +25,7 @@ #include "film.h" #include "exceptions.h" #include "config.h" +#include "frame_rate_change.h" #include "i18n.h" @@ -159,7 +160,7 @@ AudioContent::output_audio_frame_rate () const /* Resample to a DCI-approved sample rate */ double t = dcp_audio_frame_rate (content_audio_frame_rate ()); - FrameRateConversion frc (video_frame_rate(), film->video_frame_rate()); + FrameRateChange frc (video_frame_rate(), film->video_frame_rate()); /* Compensate if the DCP is being run at a different frame rate to the source; that is, if the video is run such that it will @@ -168,7 +169,7 @@ AudioContent::output_audio_frame_rate () const */ if (frc.change_speed) { - t *= video_frame_rate() * frc.factor() / film->video_frame_rate(); + t /= frc.speed_up; } return rint (t); |