X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Faudio_content.cc;h=83a43f3bd2eae6ee48a54594adf313403dca8df2;hb=521c09170d9e62cd72cc2da66c41816761008a4b;hp=04823d1e6f12a0aa653a6c6a0f3a3c9ae57af29c;hpb=c3da7c64f01420447dbab7f5c2ea42ff1b911cc5;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 04823d1e6..83a43f3bd 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -23,6 +23,7 @@
 #include "job_manager.h"
 #include "film.h"
 #include "exceptions.h"
+#include "config.h"
 
 #include "i18n.h"
 
@@ -39,10 +40,10 @@ int const AudioContentProperty::AUDIO_GAIN = 203;
 int const AudioContentProperty::AUDIO_DELAY = 204;
 int const AudioContentProperty::AUDIO_MAPPING = 205;
 
-AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
+AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
 	: Content (f, s)
 	, _audio_gain (0)
-	, _audio_delay (0)
+	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
@@ -50,7 +51,7 @@ AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
 AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _audio_gain (0)
-	, _audio_delay (0)
+	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
@@ -119,17 +120,17 @@ AudioContent::set_audio_delay (int d)
 	signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
 
-void
+boost::signals2::connection
 AudioContent::analyse_audio (boost::function<void()> finished)
 {
 	shared_ptr<const Film> film = _film.lock ();
-	if (!film) {
-		return;
-	}
+	assert (film);
 	
 	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
-	job->Finished.connect (finished);
+	boost::signals2::connection c = job->Finished.connect (finished);
 	JobManager::instance()->add (job);
+
+	return c;
 }
 
 boost::filesystem::path
@@ -148,3 +149,27 @@ 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.
+ */
+AudioContent::Frame
+AudioContent::time_to_content_audio_frames (DCPTime t, DCPTime at) const
+{
+	shared_ptr<const Film> 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);
+}