X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fanalyse_audio_job.cc;h=88cd65fee64f0227d24960600b6664dc46721ae1;hb=1738f2e7336734190bed7e94ce3d691d4a9c9e4c;hp=5623fdfcc8a462d68e95f53771983e2ceeae6a0b;hpb=cf1e212c30ec7419b96388e4f78b44cb55bf34c5;p=dcpomatic.git

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index 5623fdfcc..88cd65fee 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -25,15 +25,18 @@
 #include "decoder_factory.h"
 #include "audio_decoder.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::max;
+using std::min;
+using std::cout;
 using boost::shared_ptr;
 
 int const AnalyseAudioJob::_num_points = 1024;
 
 AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
 	: Job (f)
-	, _done_for_this_point (0)
 	, _done (0)
 	, _samples_per_point (1)
 {
@@ -43,7 +46,7 @@ AnalyseAudioJob::AnalyseAudioJob (shared_ptr<Film> f)
 string
 AnalyseAudioJob::name () const
 {
-	return String::compose ("Analyse audio of %1", _film->name());
+	return String::compose (_("Analyse audio of %1"), _film->name());
 }
 
 void
@@ -64,8 +67,8 @@ AnalyseAudioJob::run ()
 	decoders.audio->set_audio_stream (_film->audio_stream ());
 	decoders.audio->Audio.connect (bind (&AnalyseAudioJob::audio, this, _1));
 
-	int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->frames_per_second());
-	_samples_per_point = total_audio_frames / _num_points;
+	int64_t total_audio_frames = video_frames_to_audio_frames (_film->length().get(), _film->audio_stream()->sample_rate(), _film->source_frame_rate());
+	_samples_per_point = max (int64_t (1), total_audio_frames / _num_points);
 
 	_current.resize (_film->audio_stream()->channels ());
 	_analysis.reset (new AudioAnalysis (_film->audio_stream()->channels()));
@@ -81,28 +84,28 @@ AnalyseAudioJob::run ()
 }
 
 void
-AnalyseAudioJob::audio (shared_ptr<AudioBuffers> b)
+AnalyseAudioJob::audio (shared_ptr<const AudioBuffers> b)
 {
 	for (int i = 0; i < b->frames(); ++i) {
 		for (int j = 0; j < b->channels(); ++j) {
-			float const s = b->data(j)[i];
+			float s = b->data(j)[i];
+			if (fabsf (s) < 10e-7) {
+				/* stringstream can't serialise and recover inf or -inf, so prevent such
+				   values by replacing with this (140dB down) */
+				s = 10e-7;
+			}
 			_current[j][AudioPoint::RMS] += pow (s, 2);
 			_current[j][AudioPoint::PEAK] = max (_current[j][AudioPoint::PEAK], fabsf (s));
 
-			if (_done_for_this_point == _samples_per_point) {
-				_current[j][AudioPoint::RMS] = 20 * log10 (sqrt (_current[j][AudioPoint::RMS] / _samples_per_point));
-				_current[j][AudioPoint::PEAK] = 20 * log10 (_current[j][AudioPoint::PEAK]);
-				
+			if ((_done % _samples_per_point) == 0) {
+				_current[j][AudioPoint::RMS] = sqrt (_current[j][AudioPoint::RMS] / _samples_per_point);
 				_analysis->add_point (j, _current[j]);
 				
-				_done_for_this_point = 0;
 				_current[j] = AudioPoint ();
 			}
 		}
-		
-		++_done_for_this_point;
-	}
 
-	_done += b->frames ();
+		++_done;
+	}
 }