X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=af58e77ac59058097be12614c8c8499656ccff93;hp=50096d7c125f183d694d4534febbadb4f20f4739;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=d62877ae6c4e316e43f4052e4b9ba673610012cf

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 50096d7c1..af58e77ac 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -18,6 +18,7 @@
 */
 
 #include "audio_analysis.h"
+#include "audio_buffers.h"
 #include "analyse_audio_job.h"
 #include "compose.hpp"
 #include "film.h"
@@ -33,8 +34,9 @@ using boost::shared_ptr;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
-AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
+AnalyseAudioJob::AnalyseAudioJob (shared_ptr<const Film> f, shared_ptr<AudioContent> c)
 	: Job (f)
+	, _content (c)
 	, _done (0)
 	, _samples_per_point (1)
 {
@@ -44,34 +46,48 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
 string
 AnalyseAudioJob::name () const
 {
-	return String::compose (_("Analyse audio of %1"), _film->name());
+	return _("Analyse audio");
+}
+
+string
+AnalyseAudioJob::json_name () const
+{
+	return N_("analyse_audio");
 }
 
 void
 AnalyseAudioJob::run ()
 {
-	shared_ptr<Player> player = _film->player ();
-	player->disable_video ();
+	shared_ptr<AudioContent> content = _content.lock ();
+	if (!content) {
+		return;
+	}
+
+	shared_ptr<Playlist> playlist (new Playlist);
+	playlist->add (content);
+	shared_ptr<Player> player (new Player (_film, playlist));
 	
-	player->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
+	int64_t const len = _film->length().frames (_film->audio_frame_rate());
+	_samples_per_point = max (int64_t (1), len / _num_points);
 
-	_samples_per_point = max (int64_t (1), _film->audio_length() / _num_points);
+	_current.resize (_film->audio_channels ());
+	_analysis.reset (new AudioAnalysis (_film->audio_channels ()));
 
-	_current.resize (MAX_AUDIO_CHANNELS);
-	_analysis.reset (new AudioAnalysis (MAX_AUDIO_CHANNELS));
-			 
-	while (!player->pass()) {
-		set_progress (float (_done) / _film->audio_length ());
+	_done = 0;
+	DCPTime const block = DCPTime::from_seconds (1.0 / 8);
+	for (DCPTime t; t < _film->length(); t += block) {
+		analyse (player->get_audio (t, block, false));
+		set_progress (t.seconds() / _film->length().seconds());
 	}
 
-	_analysis->write (_film->audio_analysis_path ());
+	_analysis->write (content->audio_analysis_path ());
 	
 	set_progress (1);
 	set_state (FINISHED_OK);
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::analyse (shared_ptr<const AudioBuffers> b)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {
@@ -87,7 +103,7 @@ AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
 			if ((_done % _samples_per_point) == 0) {
 				_current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
 				_analysis->add_point (j, _current[j]);
-				
+
 				_current[j] = AudioPoint ();
 			}
 		}