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

2 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3a36162a7..cbaa1eb0f 100644
--- 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 c7879202f..89db865d5 100644
--- 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