Split test file up a bit.

[libdcp.git] / src / sound_asset.cc

diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 6e29aadfe0f259b331617ff6806648ae4a071139..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,15 +47,18 @@ 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)
 {
        assert (_channels);
        
-       construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files));
+       construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), metadata);
 }
 
 SoundAsset::SoundAsset (
@@ -62,15 +66,19 @@ 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)
 {
        assert (_channels);
        
-       construct (get_path);
+       construct (get_path, metadata);
 }
 
 SoundAsset::SoundAsset (string directory, string mxf_name)
@@ -95,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)
 {
@@ -111,7 +119,7 @@ SoundAsset::path_from_channel (Channel channel, vector<string> const & files)
 }
 
 void
-SoundAsset::construct (boost::function<string (Channel)> get_path)
+SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata const & metadata)
 {
        ASDCP::Rational asdcp_edit_rate (_edit_rate, 1);
 
@@ -164,7 +172,7 @@ SoundAsset::construct (boost::function<string (Channel)> get_path)
        frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (audio_desc));
 
        ASDCP::WriterInfo writer_info;
-       MXFAsset::fill_writer_info (&writer_info, _uuid);
+       MXFAsset::fill_writer_info (&writer_info, _uuid, metadata);
 
        ASDCP::PCM::MXFWriter mxf_writer;
        if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc))) {
@@ -194,7 +202,7 @@ SoundAsset::construct (boost::function<string (Channel)> get_path)
                        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"));
                }
 
@@ -209,16 +217,18 @@ SoundAsset::construct (boost::function<string (Channel)> get_path)
 }
 
 void
-SoundAsset::write_to_cpl (ostream& s) const
+SoundAsset::write_to_cpl (xmlpp::Node* node) const
 {
-       s << "        <MainSound>\n"
-         << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << _file_name << "</AnnotationText>\n"
-         << "          <EditRate>" << _edit_rate << " 1</EditRate>\n"
-         << "          <IntrinsicDuration>" << _intrinsic_duration << "</IntrinsicDuration>\n"
-         << "          <EntryPoint>" << _entry_point << "</EntryPoint>\n"
-         << "          <Duration>" << _duration << "</Duration>\n"
-         << "        </MainSound>\n";
+       xmlpp::Node* ms = node->add_child ("MainSound");
+       ms->add_child ("Id")->add_child_text ("urn:uuid:" + _uuid);
+       ms->add_child ("AnnotationText")->add_child_text (_file_name);
+       ms->add_child ("EditRate")->add_child_text (lexical_cast<string> (_edit_rate) + " 1");
+       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
@@ -303,10 +313,10 @@ SoundAsset::get_frame (int n) const
 }
 
 shared_ptr<SoundAssetWriter>
-SoundAsset::start_write ()
+SoundAsset::start_write (MXFMetadata const & metadata)
 {
        /* XXX: can't we use a shared_ptr here? */
-       return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this));
+       return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, metadata));
 }
 
 struct SoundAssetWriter::ASDCPState
@@ -317,12 +327,13 @@ struct SoundAssetWriter::ASDCPState
        ASDCP::PCM::AudioDescriptor audio_desc;
 };
 
-SoundAssetWriter::SoundAssetWriter (SoundAsset* a)
+SoundAssetWriter::SoundAssetWriter (SoundAsset* a, MXFMetadata const & m)
        : _state (new SoundAssetWriter::ASDCPState)
        , _asset (a)
        , _finalized (false)
        , _frames_written (0)
        , _frame_buffer_offset (0)
+       , _metadata (m)
 {
        /* Derived from ASDCP::Wav::SimpleWaveHeader::FillADesc */
        _state->audio_desc.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
@@ -339,7 +350,7 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* a)
        _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 ());
+       _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()));
@@ -399,7 +410,8 @@ SoundAssetWriter::finalize ()
        _asset->set_duration (_frames_written);
 }
 
-SoundAssetWriter::~SoundAssetWriter ()
+string
+SoundAsset::key_type () const
 {
-       assert (_finalized);
+       return "MDAK";
 }