Decode DCP audio too.

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 8b809a1bda04141d019ae54273cd255c06246f64..8ecd52f24e26513ff6ff10705a6b5d9e8386ed44 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -68,6 +68,7 @@ DCPContent::examine (shared_ptr<Job> job)
        Content::examine (job);
        shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
        take_from_video_examiner (examiner);
        Content::examine (job);
        shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ()));
        take_from_video_examiner (examiner);

+       take_from_audio_examiner (examiner);

 
        boost::mutex::scoped_lock lm (_mutex);
        _name = examiner->name ();
 
        boost::mutex::scoped_lock lm (_mutex);
        _name = examiner->name ();

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index e9c1101083c69fc15e3ea5d9bb83478630e22bed..d0642d8b6ca9f6fe06edd76a6f1b3611aa7a5496 100644 (file)
--- 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/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/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"
 #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 ();
        }
 
        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 ();
        
        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 {
                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);
        /* XXX: subtitle */
 
        _next += ContentTime::from_frames (1, vfr);

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 3051a46701265d714a4d6084226a1378f2eda183..39bf2d0983c3c59c1eb6b1c6ddf63fa102ba0896 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -81,6 +81,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        } else if (_audio_frame_rate.get() != mxf->sampling_rate ()) {
                                throw DCPError (_("Mismatched audio frame rates in DCP"));
                        }
                        } else if (_audio_frame_rate.get() != mxf->sampling_rate ()) {
                                throw DCPError (_("Mismatched audio frame rates in DCP"));
                        }

+
+                       _audio_length += ContentTime::from_frames ((*i)->main_sound()->duration(), _video_frame_rate.get ());

                }
        }
 }
                }
        }
 }

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index a2793c7880ca907b99ddb8d242e2736e4ea16c40..24a59dd342ebcbdd9bd4b142f7a9e6eddc8946fc 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -18,10 +18,11 @@
 */
 
 #include "video_examiner.h"
 */
 
 #include "video_examiner.h"

+#include "audio_examiner.h"

 
 class DCPContent;
 
 
 class DCPContent;
 

-class DCPExaminer : public VideoExaminer
+class DCPExaminer : public VideoExaminer, public AudioExaminer

 {
 public:
        DCPExaminer (boost::shared_ptr<const DCPContent>);
 {
 public:
        DCPExaminer (boost::shared_ptr<const DCPContent>);


@@ -42,12 +43,24 @@ public:
                return _name;
        }
 
                return _name;
        }
 

+       int audio_channels () const {
+               return _audio_channels.get_value_or (0);
+       }
+       
+       ContentTime audio_length () const {
+               return _audio_length;
+       }
+       
+       int audio_frame_rate () const {
+               return _audio_frame_rate.get_value_or (48000);
+       }
+

 private:
        boost::optional<float> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
        ContentTime _video_length;
 private:
        boost::optional<float> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
        ContentTime _video_length;

-       /* XXX: used? */

        boost::optional<int> _audio_channels;
        boost::optional<int> _audio_frame_rate;
        boost::optional<int> _audio_channels;
        boost::optional<int> _audio_frame_rate;

+       ContentTime _audio_length;

        std::string _name;
 };
        std::string _name;
 };