projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tinker with layout.
[dcpomatic.git]
/
src
/
lib
/
analyse_audio_job.h
diff --git
a/src/lib/analyse_audio_job.h
b/src/lib/analyse_audio_job.h
index 4d657951b7123d57d21438c50ee273f9c807d178..ce86e62cf0c9741663dca3e56f41f4b0e171d0d0 100644
(file)
--- a/
src/lib/analyse_audio_job.h
+++ b/
src/lib/analyse_audio_job.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,39
+23,53
@@
*/
#include "job.h"
*/
#include "job.h"
-#include "audio_
analysis
.h"
+#include "audio_
point
.h"
#include "types.h"
#include "types.h"
-#include "dcpomatic_time.h"
class AudioBuffers;
class AudioBuffers;
-class AudioContent;
+class AudioAnalysis;
+class Playlist;
+class AudioPoint;
+class AudioFilterGraph;
+class Filter;
/** @class AnalyseAudioJob
/** @class AnalyseAudioJob
- * @brief A job to analyse the audio of a
piece of AudioContent
and make a note of its
+ * @brief A job to analyse the audio of a
film
and make a note of its
* broad peak and RMS levels.
*
* broad peak and RMS levels.
*
- * After computing the peak and RMS levels
over the length of the content, the job
- *
will write a file to Content
::audio_analysis_path.
+ * After computing the peak and RMS levels
the job will write a file
+ *
to Film
::audio_analysis_path.
*/
class AnalyseAudioJob : public Job
{
public:
*/
class AnalyseAudioJob : public Job
{
public:
- AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<AudioContent>);
+ AnalyseAudioJob (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
+ ~AnalyseAudioJob ();
std::string name () const;
std::string json_name () const;
void run ();
std::string name () const;
std::string json_name () const;
void run ();
+ boost::shared_ptr<const Playlist> playlist () const {
+ return _playlist;
+ }
+
private:
void analyse (boost::shared_ptr<const AudioBuffers>);
private:
void analyse (boost::shared_ptr<const AudioBuffers>);
- boost::weak_ptr<AudioContent> _content;
+ boost::shared_ptr<const Playlist> _playlist;
+
int64_t _done;
int64_t _samples_per_point;
int64_t _done;
int64_t _samples_per_point;
- std::vector<AudioPoint> _current;
+ AudioPoint* _current;
+
+ float _sample_peak;
+ Frame _sample_peak_frame;
boost::shared_ptr<AudioAnalysis> _analysis;
boost::shared_ptr<AudioAnalysis> _analysis;
+ boost::shared_ptr<AudioFilterGraph> _ebur128;
+ std::vector<Filter const *> _filters;
+
static const int _num_points;
};
static const int _num_points;
};
-