Merge master.

[libdcp.git] / src / sound_asset.cc

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index f59d82ad647b8f957b456a88e375f8d181433bb8..45a656462c8ab6e54f6374d8332f5b892199dcba 100644 (file)
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
+#include <libxml++/nodes/element.h>
 #include "KM_fileio.h"
 #include "AS_DCP.h"
 #include "sound_asset.h"
@@ -46,10 +47,12 @@ SoundAsset::SoundAsset (
        string directory,
        string mxf_name,
        boost::signals2::signal<void (float)>* progress,
-       int fps, int intrinsic_duration,
+       int fps,
+       int intrinsic_duration,
+       bool encrypted,
        MXFMetadata const & metadata
        )
-       : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration)
+       : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted)
        , _channels (files.size ())
        , _sampling_rate (0)
 {
@@ -63,10 +66,13 @@ SoundAsset::SoundAsset (
        string directory,
        string mxf_name,
        boost::signals2::signal<void (float)>* progress,
-       int fps, int intrinsic_duration, int channels,
+       int fps,
+       int intrinsic_duration,
+       int channels,
+       bool encrypted,
        MXFMetadata const & metadata
        )
-       : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration)
+       : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted)
        , _channels (channels)
        , _sampling_rate (0)
 {
@@ -97,7 +103,7 @@ SoundAsset::SoundAsset (string directory, string mxf_name)
 }
 
 SoundAsset::SoundAsset (string directory, string mxf_name, int fps, int channels, int sampling_rate)
-       : MXFAsset (directory, mxf_name, 0, fps, 0)
+       : MXFAsset (directory, mxf_name, 0, fps, 0, false)
        , _channels (channels)
        , _sampling_rate (sampling_rate)
 {
@@ -196,7 +202,7 @@ SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata c
                        offset += sample_size;
                }
 
-               if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) {
+               if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, _encryption_context, 0))) {
                        boost::throw_exception (MiscError ("could not write audio MXF frame"));
                }
 
@@ -220,6 +226,9 @@ SoundAsset::write_to_cpl (xmlpp::Node* node) const
        ms->add_child ("IntrinsicDuration")->add_child_text (lexical_cast<string> (_intrinsic_duration));
        ms->add_child ("EntryPoint")->add_child_text (lexical_cast<string> (_entry_point));
        ms->add_child ("Duration")->add_child_text (lexical_cast<string> (_duration));
+       if (_encrypted) {
+               ms->add_child("KeyId")->add_child_text("urn:uuid:" + _key_id);
+       }
 }
 
 bool
@@ -341,7 +350,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* a, MXFMetadata const & m)
        _state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
        memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity());
        
-       MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid (), _metadata);
+       _asset->fill_writer_info (&_state->writer_info, _asset->uuid (), _metadata);
        
        if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->audio_desc))) {
                boost::throw_exception (FileError ("could not open audio MXF for writing", _asset->path().string()));
@@ -400,3 +409,9 @@ SoundAssetWriter::finalize ()
        _asset->set_intrinsic_duration (_frames_written);
        _asset->set_duration (_frames_written);
 }
+
+string
+SoundAsset::key_type () const
+{
+       return "MDAK";
+}