Handle multiple audio streams in a single piece of content

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

diff --git a/src/lib/player.cc b/src/lib/player.cc
index d5098fed7c455bcb900b0b59d4d3a499ac770cba..b81eb4d807ae4c94422e3a4e41ea7243223b86a2 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -397,7 +397,7 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
                setup_pieces ();
        }
 
-       AudioFrame const length_frames = length.frames (_film->audio_frame_rate ());
+       Frame const length_frames = length.frames (_film->audio_frame_rate ());
 
        shared_ptr<AudioBuffers> audio (new AudioBuffers (_film->audio_channels(), length_frames));
        audio->make_silent ();
@@ -414,16 +414,9 @@ 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);
-               AudioFrame request_frames = length_frames;
+               Frame request_frames = length_frames;
                DCPTime offset;
                if (request < DCPTime ()) {
                        /* We went off the start of the content, so we will need to offset
@@ -437,49 +430,52 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate)
                        request = DCPTime ();
                }
 
-               AudioFrame const content_frame = dcp_to_content_audio (*i, request);
+               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))
+                                                       );
+                                       }
                                }
                        }
-               }
                
-               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 (AudioFrame (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;
 }
 
-VideoFrame
+Frame
 Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 {
        /* s is the offset of t from the start position of this content */
@@ -492,7 +488,7 @@ Player::dcp_to_content_video (shared_ptr<const Piece> piece, DCPTime t) const
 }
 
 DCPTime
-Player::content_video_to_dcp (shared_ptr<const Piece> piece, VideoFrame f) const
+Player::content_video_to_dcp (shared_ptr<const Piece> piece, Frame f) const
 {
        DCPTime t = DCPTime::from_frames (f * piece->frc.factor (), _film->video_frame_rate()) - piece->content->trim_start () + piece->content->position ();
        if (t < DCPTime ()) {
@@ -502,7 +498,7 @@ Player::content_video_to_dcp (shared_ptr<const Piece> piece, VideoFrame f) const
        return t;
 }
 
-AudioFrame
+Frame
 Player::dcp_to_content_audio (shared_ptr<const Piece> piece, DCPTime t) const
 {
        /* s is the offset of t from the start position of this content */