Decode DCP audio too.

1 files changed, 21 insertions, 2 deletions

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index e9c110108..d0642d8b6 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -23,8 +23,10 @@
 #include <dcp/mono_picture_mxf.h>
 #include <dcp/stereo_picture_mxf.h>
 #include <dcp/reel_picture_asset.h>
+#include <dcp/reel_sound_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
+#include <dcp/sound_frame.h>
 #include "dcp_decoder.h"
 #include "dcp_content.h"
 #include "j2k_image_proxy.h"
@@ -57,13 +59,13 @@ DCPDecoder::pass ()
 	}
 
 	float const vfr = _dcp_content->video_frame_rate ();
+	int64_t const frame = _next.frames (vfr);
 	
 	if ((*_reel)->main_picture ()) {
 		shared_ptr<dcp::PictureMXF> mxf = (*_reel)->main_picture()->mxf ();
 		shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (mxf);
 		shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
 		int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
-		int64_t const frame = _next.frames (vfr);
 		if (mono) {
 			video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size(), _log)), frame);
 		} else {
@@ -79,7 +81,24 @@ DCPDecoder::pass ()
 		}
 	}
 
-	/* XXX: sound */
+	if ((*_reel)->main_sound ()) {
+		int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
+		shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->mxf()->get_frame (entry_point + frame);
+		uint8_t const * from = sf->data ();
+
+		int const channels = _dcp_content->audio_channels ();
+		int const frames = sf->size() / (3 * channels);
+		shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
+		for (int i = 0; i < frames; ++i) {
+			for (int j = 0; j < channels; ++j) {
+				data->data()[j][i] = float (from[0] | (from[1] << 8) | (from[2] << 16)) / (1 << 23);
+				from += 3;
+			}
+		}
+
+		audio (data, _next);
+	}
+
 	/* XXX: subtitle */
 
 	_next += ContentTime::from_frames (1, vfr);