Merge.

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

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 6712e06241dc37a9e1c99fcaeb88c92c50f4d01d..bbd4ced6c1a2c114f337729f8fe609f71e1eb353 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -25,6 +25,9 @@
 #include "i18n.h"
 
 using std::stringstream;
+using std::list;
+using std::pair;
+using std::cout;
 using boost::optional;
 using boost::shared_ptr;
 
@@ -112,8 +115,6 @@ AudioDecoder::process_end ()
 void
 AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
 {
-       /* XXX: map audio to 5.1 */
-       
        /* Maybe resample */
        if (_swr_context) {
 
@@ -122,7 +123,7 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
                        (int64_t) data->frames() * _audio_content->output_audio_frame_rate() / _audio_content->content_audio_frame_rate()
                        ) + 32;
 
-               shared_ptr<AudioBuffers> resampled (new AudioBuffers (MAX_AUDIO_CHANNELS, max_resampled_frames));
+               shared_ptr<AudioBuffers> resampled (new AudioBuffers (data->channels(), max_resampled_frames));
 
                /* Resample audio */
                int const resampled_frames = swr_convert (
@@ -139,11 +140,28 @@ AudioDecoder::audio (shared_ptr<const AudioBuffers> data, Time time)
                data = resampled;
        }
 
-       Audio (data, time);
-
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
+       
+       /* Remap channels */
+       shared_ptr<AudioBuffers> dcp_mapped (new AudioBuffers (film->dcp_audio_channels(), data->frames()));
+       dcp_mapped->make_silent ();
+       list<pair<int, libdcp::Channel> > map = _audio_content->audio_mapping().content_to_dcp ();
+       for (list<pair<int, libdcp::Channel> >::iterator i = map.begin(); i != map.end(); ++i) {
+               dcp_mapped->accumulate_channel (data.get(), i->first, i->second);
+       }
+
+       Audio (dcp_mapped, time);
+       cout << "bumping n.a. by " << data->frames() << " ie " << film->audio_frames_to_time(data->frames()) << "\n";
        _next_audio = time + film->audio_frames_to_time (data->frames());
 }
 
-               
+bool
+AudioDecoder::audio_done () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       return (_audio_content->length() - _next_audio) < film->audio_frames_to_time (1);
+}
+