X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=026c44ef2bc46783276aeca4871b12d72ecfaa30;hb=a3aa0f8ee813656b255c24d23f4570ef56e7fca2;hp=014b95a217260ae62a96c7503b080631993fce31;hpb=da0878773b192f52694fe5719fe08bc4fe271c63;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 014b95a2..026c44ef 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include "KM_fileio.h" #include "AS_DCP.h" #include "sound_asset.h" @@ -46,7 +47,10 @@ SoundAsset::SoundAsset ( string directory, string mxf_name, boost::signals2::signal* progress, - int fps, int intrinsic_duration + int fps, + int intrinsic_duration, + bool interop, + MXFMetadata const & metadata ) : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) , _channels (files.size ()) @@ -54,7 +58,7 @@ SoundAsset::SoundAsset ( { assert (_channels); - construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files)); + construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), interop, metadata); } SoundAsset::SoundAsset ( @@ -62,7 +66,11 @@ SoundAsset::SoundAsset ( string directory, string mxf_name, boost::signals2::signal* progress, - int fps, int intrinsic_duration, int channels + int fps, + int intrinsic_duration, + int channels, + bool interop, + MXFMetadata const & metadata ) : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) , _channels (channels) @@ -70,7 +78,7 @@ SoundAsset::SoundAsset ( { assert (_channels); - construct (get_path); + construct (get_path, interop, metadata); } SoundAsset::SoundAsset (string directory, string mxf_name) @@ -111,7 +119,7 @@ SoundAsset::path_from_channel (Channel channel, vector const & files) } void -SoundAsset::construct (boost::function get_path) +SoundAsset::construct (boost::function get_path, bool interop, MXFMetadata const & metadata) { ASDCP::Rational asdcp_edit_rate (_edit_rate, 1); @@ -164,7 +172,7 @@ SoundAsset::construct (boost::function 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, interop, 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 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")); } @@ -208,23 +216,16 @@ SoundAsset::construct (boost::function get_path) } } -void -SoundAsset::write_to_cpl (ostream& s) const +string +SoundAsset::cpl_node_name () const { - s << " \n" - << " urn:uuid:" << _uuid << "\n" - << " " << _file_name << "\n" - << " " << _edit_rate << " 1\n" - << " " << _intrinsic_duration << "\n" - << " " << _entry_point << "\n" - << " " << _duration << "\n" - << " \n"; + return "MainSound"; } bool -SoundAsset::equals (shared_ptr other, EqualityOptions opt, list& notes) const +SoundAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { - if (!MXFAsset::equals (other, opt, notes)) { + if (!MXFAsset::equals (other, opt, note)) { return false; } @@ -260,7 +261,7 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, list other, EqualityOptions opt, list(i) + " differ"); + note (ERROR, "sizes of audio data for frame " + lexical_cast(i) + " differ"); return false; } @@ -285,7 +286,7 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, list opt.max_audio_sample_error) { - notes.push_back ("PCM data difference of " + lexical_cast (d)); + note (ERROR, "PCM data difference of " + lexical_cast (d)); return false; } } @@ -298,14 +299,15 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, list SoundAsset::get_frame (int n) const { - return shared_ptr (new SoundFrame (path().string(), n + _entry_point)); + /* XXX: should add on entry point here? */ + return shared_ptr (new SoundFrame (path().string(), n, _decryption_context)); } shared_ptr -SoundAsset::start_write () +SoundAsset::start_write (bool interop, MXFMetadata const & metadata) { /* XXX: can't we use a shared_ptr here? */ - return shared_ptr (new SoundAssetWriter (this)); + return shared_ptr (new SoundAssetWriter (this, interop, metadata)); } struct SoundAssetWriter::ASDCPState @@ -314,15 +316,19 @@ struct SoundAssetWriter::ASDCPState ASDCP::PCM::FrameBuffer frame_buffer; ASDCP::WriterInfo writer_info; ASDCP::PCM::AudioDescriptor audio_desc; + ASDCP::AESEncContext* encryption_context; }; -SoundAssetWriter::SoundAssetWriter (SoundAsset* a) +SoundAssetWriter::SoundAssetWriter (SoundAsset* a, bool interop, MXFMetadata const & m) : _state (new SoundAssetWriter::ASDCPState) , _asset (a) , _finalized (false) , _frames_written (0) , _frame_buffer_offset (0) + , _metadata (m) { + _state->encryption_context = a->encryption_context (); + /* Derived from ASDCP::Wav::SimpleWaveHeader::FillADesc */ _state->audio_desc.EditRate = ASDCP::Rational (_asset->edit_rate(), 1); _state->audio_desc.AudioSamplingRate = ASDCP::Rational (_asset->sampling_rate(), 1); @@ -338,7 +344,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 (), interop, _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())); @@ -375,7 +381,7 @@ SoundAssetWriter::write (float const * const * data, int frames) void SoundAssetWriter::write_current_frame () { - if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0))) { + if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, _state->encryption_context, 0))) { boost::throw_exception (MiscError ("could not write audio MXF frame")); } @@ -398,7 +404,8 @@ SoundAssetWriter::finalize () _asset->set_duration (_frames_written); } -SoundAssetWriter::~SoundAssetWriter () +string +SoundAsset::key_type () const { - assert (_finalized); + return "MDAK"; }