No-op: remove all trailing whitespace.

[dcpomatic.git] / src / lib / audio_analysis.cc

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 0cf08c5bdf1b42078f571b0b6105a99572d7e66c..7e1dc6e7884f619765c4a927bb31af85ddde9871 100644 (file)
--- 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
@@ -17,22 +17,27 @@
 
 */
 
+#include "audio_analysis.h"
+#include "cross.h"
+#include "util.h"
+#include "raw_convert.h"
+#include <libxml++/libxml++.h>
+#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
 #include <stdint.h>
 #include <cmath>
-#include <cassert>
-#include <fstream>
-#include <boost/filesystem.hpp>
-#include "audio_analysis.h"
+#include <cstdio>
+#include <iostream>
+#include <inttypes.h>
 
 using std::ostream;
 using std::istream;
 using std::string;
-using std::ofstream;
-using std::ifstream;
 using std::vector;
 using std::cout;
 using std::max;
 using std::list;
+using boost::shared_ptr;
 
 AudioPoint::AudioPoint ()
 {
@@ -41,55 +46,75 @@ AudioPoint::AudioPoint ()
        }
 }
 
-AudioPoint::AudioPoint (istream& s)
+AudioPoint::AudioPoint (cxml::ConstNodePtr node)
+{
+       _data[PEAK] = node->number_child<float> ("Peak");
+       _data[RMS] = node->number_child<float> ("RMS");
+}
+
+AudioPoint::AudioPoint (AudioPoint const & other)
 {
        for (int i = 0; i < COUNT; ++i) {
-               s >> _data[i];
+               _data[i] = other._data[i];
        }
 }
 
-void
-AudioPoint::write (ostream& s) const
+AudioPoint &
+AudioPoint::operator= (AudioPoint const & other)
 {
+       if (this == &other) {
+               return *this;
+       }
+
        for (int i = 0; i < COUNT; ++i) {
-               s << _data[i] << "\n";
+               _data[i] = other._data[i];
        }
+
+       return *this;
+}
+
+void
+AudioPoint::as_xml (xmlpp::Element* parent) const
+{
+       parent->add_child ("Peak")->add_child_text (raw_convert<string> (_data[PEAK]));
+       parent->add_child ("RMS")->add_child_text (raw_convert<string> (_data[RMS]));
 }
-       
 
 AudioAnalysis::AudioAnalysis (int channels)
 {
        _data.resize (channels);
 }
 
-AudioAnalysis::AudioAnalysis (string filename)
+AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
-       ifstream f (filename.c_str ());
+       cxml::Document f ("AudioAnalysis");
+       f.read_file (filename);
 
-       int channels;
-       f >> 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;
-               f >> points;
-               for (int j = 0; j < points; ++j) {
-                       _data[i].push_back (AudioPoint (f));
+               BOOST_FOREACH (cxml::NodePtr j, i->node_children ("Point")) {
+                       channel.push_back (AudioPoint (j));
                }
+
+               _data.push_back (channel);
        }
+
+       _peak = f.number_child<float> ("Peak");
+       _peak_time = DCPTime (f.number_child<DCPTime::Type> ("PeakTime"));
 }
 
 void
 AudioAnalysis::add_point (int c, AudioPoint const & p)
 {
-       assert (c < channels ());
+       DCPOMATIC_ASSERT (c < channels ());
        _data[c].push_back (p);
 }
 
 AudioPoint
 AudioAnalysis::get_point (int c, int p) const
 {
-       assert (p < points (c));
+       DCPOMATIC_ASSERT (p < points (c));
        return _data[c][p];
 }
 
@@ -102,50 +127,27 @@ AudioAnalysis::channels () const
 int
 AudioAnalysis::points (int c) const
 {
-       assert (c < channels ());
+       DCPOMATIC_ASSERT (c < channels ());
        return _data[c].size ();
 }
 
 void
-AudioAnalysis::write (string filename)
+AudioAnalysis::write (boost::filesystem::path filename)
 {
-       string tmp = filename + ".tmp";
-       
-       ofstream f (tmp.c_str ());
-       f << _data.size() << "\n";
-       for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
-               f << i->size () << "\n";
-               for (vector<AudioPoint>::iterator j = i->begin(); j != i->end(); ++j) {
-                       j->write (f);
+       shared_ptr<xmlpp::Document> doc (new xmlpp::Document);
+       xmlpp::Element* root = doc->create_root_node ("AudioAnalysis");
+
+       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"));
                }
        }
 
-       f.close ();
-       boost::filesystem::rename (tmp, filename);
-}
-
-float
-AudioAnalysis::smooth (list<float> const & data, AudioPoint::Type t)
-{
-       float val;
-
-       switch (t) {
-       case AudioPoint::PEAK:
-               /* XXX: fall-off, or something...? */
-               val = -200;
-               for (list<float>::const_iterator i = data.begin(); i != data.end(); ++i) {
-                       val = max (val, *i);
-               }
-               return val;
-       case AudioPoint::RMS:
-               val = 0;
-               for (list<float>::const_iterator i = data.begin(); i != data.end(); ++i) {
-                       val += pow (*i, 2);
-               }
-               return sqrt (val / data.size());
-       default:
-               assert (false);
+       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 ()));
        }
 
-       return 0;
+       doc->write_to_file_formatted (filename.string ());
 }