X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_analysis.cc;h=10e02232292c30f9dbf17975f49a8c0e88d388d4;hb=765f90586c498860aa687e2b0cd6cedf1e0b1bf0;hp=19a0d876ebc75ab962de69a5408ef42abaa640a0;hpb=91bd51ff82e99113860570b519459303802bd98f;p=dcpomatic.git

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 19a0d876e..10e022322 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,14 +18,19 @@
 */
 
 #include "audio_analysis.h"
-#include "dcpomatic_assert.h"
 #include "cross.h"
+#include "util.h"
+#include "raw_convert.h"
+#include "playlist.h"
+#include "audio_content.h"
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
 #include <stdint.h>
 #include <cmath>
-#include <cassert>
 #include <cstdio>
 #include <iostream>
+#include <inttypes.h>
 
 using std::ostream;
 using std::istream;
@@ -34,53 +39,8 @@ using std::vector;
 using std::cout;
 using std::max;
 using std::list;
-
-AudioPoint::AudioPoint ()
-{
-	for (int i = 0; i < COUNT; ++i) {
-		_data[i] = 0;
-	}
-}
-
-AudioPoint::AudioPoint (FILE* f)
-{
-	for (int i = 0; i < COUNT; ++i) {
-		int n = fscanf (f, "%f", &_data[i]);
-		if (n != 1) {
-			_data[i] = 0;
-		}
-	}
-}
-
-AudioPoint::AudioPoint (AudioPoint const & other)
-{
-	for (int i = 0; i < COUNT; ++i) {
-		_data[i] = other._data[i];
-	}
-}
-
-AudioPoint &
-AudioPoint::operator= (AudioPoint const & other)
-{
-	if (this == &other) {
-		return *this;
-	}
-	
-	for (int i = 0; i < COUNT; ++i) {
-		_data[i] = other._data[i];
-	}
-
-	return *this;
-}
-
-void
-AudioPoint::write (FILE* f) const
-{
-	for (int i = 0; i < COUNT; ++i) {
-		fprintf (f, "%f\n", _data[i]);
-	}
-}
-	
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 AudioAnalysis::AudioAnalysis (int channels)
 {
@@ -89,33 +49,22 @@ AudioAnalysis::AudioAnalysis (int channels)
 
 AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
-	FILE* f = fopen_boost (filename, "r");
-	if (!f) {
-		throw OpenFileError (filename);
-	}
+	cxml::Document f ("AudioAnalysis");
+	f.read_file (filename);
 
-	int channels = 0;
-	fscanf (f, "%d", &channels);
-	_data.resize (channels);
+	BOOST_FOREACH (cxml::NodePtr i, f.node_children ("Channel")) {
+		vector<AudioPoint> channel;
 
-	for (int i = 0; i < channels; ++i) {
-		int points;
-		fscanf (f, "%d", &points);
-		if (feof (f)) {
-			fclose (f);
-			return;
-		}
-		
-		for (int j = 0; j < points; ++j) {
-			_data[i].push_back (AudioPoint (f));
-			if (feof (f)) {
-				fclose (f);
-				return;
-			}
+		BOOST_FOREACH (cxml::NodePtr j, i->node_children ("Point")) {
+			channel.push_back (AudioPoint (j));
 		}
+
+		_data.push_back (channel);
 	}
 
-	fclose (f);
+	_peak = f.number_child<float> ("Peak");
+	_peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
+	_analysis_gain = f.optional_number_child<double> ("AnalysisGain");
 }
 
 void
@@ -148,22 +97,40 @@ AudioAnalysis::points (int c) const
 void
 AudioAnalysis::write (boost::filesystem::path filename)
 {
-	boost::filesystem::path tmp = filename;
-	tmp.replace_extension (".tmp");
+	shared_ptr<xmlpp::Document> doc (new xmlpp::Document);
+	xmlpp::Element* root = doc->create_root_node ("AudioAnalysis");
 
-	FILE* f = fopen_boost (tmp, "w");
-	if (!f) {
-		throw OpenFileError (tmp);
+	BOOST_FOREACH (vector<AudioPoint>& i, _data) {
+		xmlpp::Element* channel = root->add_child ("Channel");
+		BOOST_FOREACH (AudioPoint& j, i) {
+			j.as_xml (channel->add_child ("Point"));
+		}
 	}
 
-	fprintf (f, "%ld\n", _data.size ());
-	for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
-		fprintf (f, "%ld\n", i->size ());
-		for (vector<AudioPoint>::iterator j = i->begin(); j != i->end(); ++j) {
-			j->write (f);
-		}
+	if (_peak) {
+		root->add_child("Peak")->add_child_text (raw_convert<string> (_peak.get ()));
+		root->add_child("PeakTime")->add_child_text (raw_convert<string> (_peak_time.get().get ()));
+	}
+
+	if (_analysis_gain) {
+		root->add_child("AnalysisGain")->add_child_text (raw_convert<string> (_analysis_gain.get ()));
+	}
+
+	doc->write_to_file_formatted (filename.string ());
+}
+
+float
+AudioAnalysis::gain_correction (shared_ptr<const Playlist> playlist)
+{
+	if (playlist->content().size() == 1 && analysis_gain ()) {
+		/* In this case we know that the analysis was of a single piece of content and
+		   we know that content's gain when the analysis was run.  Hence we can work out
+		   what correction is now needed to make it look `right'.
+		*/
+		shared_ptr<const AudioContent> ac = dynamic_pointer_cast<const AudioContent> (playlist->content().front ());
+		DCPOMATIC_ASSERT (ac);
+		return ac->audio_gain() - analysis_gain().get ();
 	}
 
-	fclose (f);
-	boost::filesystem::rename (tmp, filename);
+	return 0.0f;
 }