X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=f425cf2808cfbf70d53f3ff2bf097a24ab0ba035;hb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;hp=97a088791ad9bbe2c4b5e84cec227d016ce23175;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac;p=dcpomatic.git

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 97a088791..f425cf280 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -19,15 +19,12 @@
 
 #include "audio_decoder.h"
 #include "audio_buffers.h"
-#include "exceptions.h"
-#include "log.h"
+#include "audio_processor.h"
 #include "resampler.h"
 #include "util.h"
-#include "film.h"
 
 #include "i18n.h"
 
-using std::stringstream;
 using std::list;
 using std::pair;
 using std::cout;
@@ -43,13 +40,17 @@ AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content)
 		_resampler.reset (new Resampler (content->audio_frame_rate(), content->resampled_audio_frame_rate(), content->audio_channels ()));
 	}
 
+	if (content->audio_processor ()) {
+		_processor = content->audio_processor()->clone (content->resampled_audio_frame_rate ());
+	}
+
 	reset_decoded_audio ();
 }
 
 void
 AudioDecoder::reset_decoded_audio ()
 {
-	_decoded_audio = ContentAudio (shared_ptr<AudioBuffers> (new AudioBuffers (_audio_content->audio_channels(), 0)), 0);
+	_decoded_audio = ContentAudio (shared_ptr<AudioBuffers> (new AudioBuffers (_audio_content->processed_audio_channels(), 0)), 0);
 }
 
 shared_ptr<ContentAudio>
@@ -125,6 +126,10 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 		data = _resampler->run (data);
 	}
 
+	if (_processor) {
+		data = _processor->run (data);
+	}
+
 	AudioFrame const frame_rate = _audio_content->resampled_audio_frame_rate ();
 
 	if (_seek_reference) {
@@ -162,6 +167,12 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 
 	assert (_audio_position.get() >= (_decoded_audio.frame + _decoded_audio.audio->frames()));
 
+	add (data);
+}
+
+void
+AudioDecoder::add (shared_ptr<const AudioBuffers> data)
+{
 	/* Resize _decoded_audio to fit the new data */
 	int new_size = 0;
 	if (_decoded_audio.audio->frames() == 0) {
@@ -179,9 +190,17 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 	/* Copy new data in */
 	_decoded_audio.audio->copy_from (data.get(), data->frames(), 0, _audio_position.get() - _decoded_audio.frame);
 	_audio_position = _audio_position.get() + data->frames ();
+
+	/* Limit the amount of data we keep in case nobody is asking for it */
+	int const max_frames = _audio_content->resampled_audio_frame_rate () * 10;
+	if (_decoded_audio.audio->frames() > max_frames) {
+		int const to_remove = _decoded_audio.audio->frames() - max_frames;
+		_decoded_audio.frame += to_remove;
+		_decoded_audio.audio->move (to_remove, 0, max_frames);
+		_decoded_audio.audio->set_frames (max_frames);
+	}
 }
 
-/* XXX: called? */
 void
 AudioDecoder::flush ()
 {
@@ -189,13 +208,10 @@ AudioDecoder::flush ()
 		return;
 	}
 
-	/*
 	shared_ptr<const AudioBuffers> b = _resampler->flush ();
 	if (b) {
-		_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (b, _audio_position.get ())));
-		_audio_position = _audio_position.get() + b->frames ();
+		add (b);
 	}
-	*/
 }
 
 void
@@ -206,4 +222,7 @@ AudioDecoder::seek (ContentTime t, bool accurate)
 	if (accurate) {
 		_seek_reference = t;
 	}
+	if (_processor) {
+		_processor->flush ();
+	}
 }