Fix erroneous full_length() in SndfileContent; it's at least a bit more correct now.

diff --git a/ChangeLog b/ChangeLog
index 3a36162a7e987bad27fa1f8331ab01ed66cdd51b..cbaa1eb0f2101b7a533689b105fe929ea2effac3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-05  Carl Hetherington  <cth@carlh.net>
+
+       * Improve the correctness of lengths reported by sound files to fix
+       short DCPs when using non-DCI-rate sound files with stills.
+
 2013-12-04  Carl Hetherington  <cth@carlh.net>
 
        * Make signatures optional (#273).

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index c7879202f471c6ac5a2f2f978215b35cffc39300..89db865d530b2d721cff9d0b82a392d16ec792a8 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -146,8 +146,16 @@ SndfileContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
+
+       OutputAudioFrame const len = audio_length() * output_audio_frame_rate() / content_audio_frame_rate ();
+       
+       /* XXX: this depends on whether, alongside this audio, we are running video slower or faster than
+          it should be.  The calculation above works out the output audio frames assuming that we are just
+          resampling the audio: it would be incomplete if, for example, we were running this audio alongside
+          25fps video that was being run at 24fps.
+       */
        
-       return film->audio_frames_to_time (audio_length ());
+       return film->audio_frames_to_time (len);
 }
 
 int