X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=1def7e5ccf28a8f8ab85c8063d4bd4a17379e209;hb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;hp=3c0d13ba93c1b98b5bbd1760f33ecc16c38786db;hpb=6d8bcba724be622739a749064466901486304cee;p=dcpomatic.git diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 3c0d13ba9..1def7e5cc 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -149,27 +149,3 @@ AudioContent::technical_summary () const { return String::compose ("audio: channels %1, length %2, raw rate %3, out rate %4", audio_channels(), audio_length(), content_audio_frame_rate(), output_audio_frame_rate()); } - -/** Note: this is not particularly fast, as the FrameRateChange lookup - * is not very intelligent. - * - * @param t Some duration to convert. - * @param at The time within the DCP to get the active frame rate change from; i.e. a point at which - * the `controlling' video content is active. - */ -AudioFrame -AudioContent::time_to_content_audio_frames (DCPTime t, DCPTime at) const -{ - shared_ptr film = _film.lock (); - assert (film); - - /* Consider the case where we're running a 25fps video at 24fps (i.e. slow) - Our audio is at 44.1kHz. We will resample it to 48000 * 25 / 24 and then - run it at 48kHz (i.e. slow, to match). - - After 1 second, we'll have run the equivalent of 44.1kHz * 24 / 25 samples - in the source. - */ - - return rint (t * content_audio_frame_rate() * film->active_frame_rate_change(at).speed_up / TIME_HZ); -}