Fix confusion with AUDIO_STREAMS property.

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index be00aebc7d7657449a88cf94666693c439a5d3f9..1a55a84728c886549ba8eaf518c8904297e45374 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -45,6 +45,7 @@
 #include "dcp_decoder.h"
 #include "dcp_subtitle_content.h"
 #include "dcp_subtitle_decoder.h"
+#include "audio_processor.h"
 #include <boost/foreach.hpp>
 #include <stdint.h>
 #include <algorithm>
@@ -77,6 +78,8 @@ Player::Player (shared_ptr<const Film> f, shared_ptr<const Playlist> p)
        _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3));
        _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1));
        set_video_container_size (_film->frame_size ());
+
+       film_changed (Film::AUDIO_PROCESSOR);
 }
 
 void
@@ -247,6 +250,10 @@ Player::film_changed (Film::Property p)
 
        if (p == Film::CONTAINER || p == Film::VIDEO_FRAME_RATE) {
                Changed (false);
+       } else if (p == Film::AUDIO_PROCESSOR) {
+               if (_film->audio_processor ()) {
+                       _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ());
+               }
        }
 }
 
@@ -414,13 +421,6 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
                shared_ptr<AudioDecoder> decoder = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
                DCPOMATIC_ASSERT (decoder);
 
-               if (content->audio_frame_rate() == 0) {
-                       /* This AudioContent has no audio (e.g. if it is an FFmpegContent with no
-                        * audio stream).
-                        */
-                       continue;
-               }
-
                /* The time that we should request from the content */
                DCPTime request = time - DCPTime::from_seconds (content->audio_delay() / 1000.0);
                Frame request_frames = length_frames;
@@ -439,41 +439,48 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
 
                Frame const content_frame = dcp_to_content_audio (*i, request);
 
-               /* Audio from this piece's decoder (which might be more or less than what we asked for) */
-               shared_ptr<ContentAudio> all = decoder->get_audio (content_frame, request_frames, accurate);
-
-               /* Gain */
-               if (content->audio_gain() != 0) {
-                       shared_ptr<AudioBuffers> gain (new AudioBuffers (all->audio));
-                       gain->apply_gain (content->audio_gain ());
-                       all->audio = gain;
-               }
+               BOOST_FOREACH (AudioStreamPtr j, content->audio_streams ()) {
+                       
+                       /* Audio from this piece's decoder stream (which might be more or less than what we asked for) */
+                       ContentAudio all = decoder->get_audio (j, content_frame, request_frames, accurate);
+
+                       /* Gain */
+                       if (content->audio_gain() != 0) {
+                               shared_ptr<AudioBuffers> gain (new AudioBuffers (all.audio));
+                               gain->apply_gain (content->audio_gain ());
+                               all.audio = gain;
+                       }
 
-               /* Remap channels */
-               shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all->audio->frames()));
-               dcp_mapped->make_silent ();
-               AudioMapping map = content->audio_mapping ();
-               for (int i = 0; i < map.content_channels(); ++i) {
-                       for (int j = 0; j < _film->audio_channels(); ++j) {
-                               if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
-                                       dcp_mapped->accumulate_channel (
-                                               all->audio.get(),
-                                               i,
-                                               j,
-                                               map.get (i, static_cast<dcp::Channel> (j))
-                                               );
+                       /* Remap channels */
+                       shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (_film->audio_channels(), all.audio->frames()));
+                       dcp_mapped->make_silent ();
+                       AudioMapping map = j->mapping ();
+                       for (int i = 0; i < map.content_channels(); ++i) {
+                               for (int j = 0; j < _film->audio_channels(); ++j) {
+                                       if (map.get (i, static_cast<dcp::Channel> (j)) > 0) {
+                                               dcp_mapped->accumulate_channel (
+                                                       all.audio.get(),
+                                                       i,
+                                                       j,
+                                                       map.get (i, static_cast<dcp::Channel> (j))
+                                                       );
+                                       }
                                }
                        }
-               }
+
+                       if (_audio_processor) {
+                               dcp_mapped = _audio_processor->run (dcp_mapped);
+                       }
                
-               all->audio = dcp_mapped;
+                       all.audio = dcp_mapped;
 
-               audio->accumulate_frames (
-                       all->audio.get(),
-                       content_frame - all->frame,
-                       offset.frames (_film->audio_frame_rate()),
-                       min (Frame (all->audio->frames()), request_frames)
-                       );
+                       audio->accumulate_frames (
+                               all.audio.get(),
+                               content_frame - all.frame,
+                               offset.frames (_film->audio_frame_rate()),
+                               min (Frame (all.audio->frames()), request_frames)
+                               );
+               }
        }
 
        return audio;