X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=45a656462c8ab6e54f6374d8332f5b892199dcba;hb=f33cc09ad01f4aa57a09d3bfa23193f357240d45;hp=89132f2628d20ab5d4bbc4f907228ed61a3d59e2;hpb=6a5bb039b3bfd508cc87b6b15102b9eb60c62f8d;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 89132f26..45a65646 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,16 +47,18 @@ SoundAsset::SoundAsset ( string directory, string mxf_name, boost::signals2::signal* progress, - int fps, int intrinsic_duration, int start_frame + 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) - , _start_frame (start_frame) { 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 ( @@ -63,45 +66,46 @@ SoundAsset::SoundAsset ( string directory, string mxf_name, boost::signals2::signal* progress, - int fps, int intrinsic_duration, int start_frame, 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) - , _start_frame (start_frame) { assert (_channels); - construct (get_path); + construct (get_path, metadata); } SoundAsset::SoundAsset (string directory, string mxf_name) : MXFAsset (directory, mxf_name) , _channels (0) - , _start_frame (0) { ASDCP::PCM::MXFReader reader; if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string())); } ASDCP::PCM::AudioDescriptor desc; if (ASDCP_FAILURE (reader.FillAudioDescriptor (desc))) { - throw DCPReadError ("could not read audio MXF information"); + boost::throw_exception (DCPReadError ("could not read audio MXF information")); } _sampling_rate = desc.AudioSamplingRate.Numerator / desc.AudioSamplingRate.Denominator; _channels = desc.ChannelCount; - _fps = desc.EditRate.Numerator; + _edit_rate = desc.EditRate.Numerator; assert (desc.EditRate.Denominator == 1); _intrinsic_duration = desc.ContainerDuration; } 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) - , _start_frame (0) { } @@ -115,20 +119,20 @@ SoundAsset::path_from_channel (Channel channel, vector const & files) } void -SoundAsset::construct (boost::function get_path) +SoundAsset::construct (boost::function get_path, MXFMetadata const & metadata) { - ASDCP::Rational asdcp_fps (_fps, 1); + ASDCP::Rational asdcp_edit_rate (_edit_rate, 1); ASDCP::PCM::WAVParser pcm_parser_channel[_channels]; - if (pcm_parser_channel[0].OpenRead (get_path(LEFT).c_str(), asdcp_fps)) { - throw FileError ("could not open WAV file for reading", get_path(LEFT)); + if (pcm_parser_channel[0].OpenRead (get_path(LEFT).c_str(), asdcp_edit_rate)) { + boost::throw_exception (FileError ("could not open WAV file for reading", get_path(LEFT))); } ASDCP::PCM::AudioDescriptor audio_desc; pcm_parser_channel[0].FillAudioDescriptor (audio_desc); audio_desc.ChannelCount = 0; audio_desc.BlockAlign = 0; - audio_desc.EditRate = asdcp_fps; + audio_desc.EditRate = asdcp_edit_rate; audio_desc.AvgBps = audio_desc.AvgBps * _channels; Channel channels[] = { @@ -152,8 +156,8 @@ SoundAsset::construct (boost::function get_path) string const path = get_path (channels[i]); - if (ASDCP_FAILURE (pcm_parser_channel[i].OpenRead (path.c_str(), asdcp_fps))) { - throw FileError ("could not open WAV file for reading", path); + if (ASDCP_FAILURE (pcm_parser_channel[i].OpenRead (path.c_str(), asdcp_edit_rate))) { + boost::throw_exception (FileError ("could not open WAV file for reading", path)); } pcm_parser_channel[i].FillAudioDescriptor (audio_desc_channel[i]); @@ -168,20 +172,11 @@ 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, metadata); ASDCP::PCM::MXFWriter mxf_writer; if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc))) { - throw FileError ("could not open audio MXF for writing", path().string()); - } - - /* Skip through up to our _start_frame; this is pretty inefficient... */ - for (int i = 0; i < _start_frame; ++i) { - for (int j = 0; j < _channels; ++j) { - if (ASDCP_FAILURE (pcm_parser_channel[j].ReadFrame (frame_buffer_channel[j]))) { - throw MiscError ("could not read audio frame"); - } - } + boost::throw_exception (FileError ("could not open audio MXF for writing", path().string())); } for (int i = 0; i < _intrinsic_duration; ++i) { @@ -189,7 +184,7 @@ SoundAsset::construct (boost::function get_path) for (int j = 0; j < _channels; ++j) { memset (frame_buffer_channel[j].Data(), 0, frame_buffer_channel[j].Capacity()); if (ASDCP_FAILURE (pcm_parser_channel[j].ReadFrame (frame_buffer_channel[j]))) { - throw MiscError ("could not read audio frame"); + boost::throw_exception (MiscError ("could not read audio frame")); } } @@ -207,8 +202,8 @@ SoundAsset::construct (boost::function get_path) offset += sample_size; } - if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) { - throw MiscError ("could not write audio MXF frame"); + if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, _encryption_context, 0))) { + boost::throw_exception (MiscError ("could not write audio MXF frame")); } if (_progress) { @@ -217,47 +212,49 @@ SoundAsset::construct (boost::function get_path) } if (ASDCP_FAILURE (mxf_writer.Finalize())) { - throw MiscError ("could not finalise audio MXF"); + boost::throw_exception (MiscError ("could not finalise audio MXF")); } } void -SoundAsset::write_to_cpl (ostream& s) const +SoundAsset::write_to_cpl (xmlpp::Node* node) const { - s << " \n" - << " urn:uuid:" << _uuid << "\n" - << " " << _file_name << "\n" - << " " << _fps << " 1\n" - << " " << _intrinsic_duration << "\n" - << " " << _entry_point << "\n" - << " " << _duration << "\n" - << " \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 (_edit_rate) + " 1"); + ms->add_child ("IntrinsicDuration")->add_child_text (lexical_cast (_intrinsic_duration)); + ms->add_child ("EntryPoint")->add_child_text (lexical_cast (_entry_point)); + ms->add_child ("Duration")->add_child_text (lexical_cast (_duration)); + if (_encrypted) { + ms->add_child("KeyId")->add_child_text("urn:uuid:" + _key_id); + } } 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; } ASDCP::PCM::MXFReader reader_A; if (ASDCP_FAILURE (reader_A.OpenRead (path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string())); } ASDCP::PCM::MXFReader reader_B; if (ASDCP_FAILURE (reader_B.OpenRead (other->path().string().c_str()))) { - throw MXFFileError ("could not open MXF file for reading", path().string()); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string())); } ASDCP::PCM::AudioDescriptor desc_A; if (ASDCP_FAILURE (reader_A.FillAudioDescriptor (desc_A))) { - throw DCPReadError ("could not read audio MXF information"); + boost::throw_exception (DCPReadError ("could not read audio MXF information")); } ASDCP::PCM::AudioDescriptor desc_B; if (ASDCP_FAILURE (reader_B.FillAudioDescriptor (desc_B))) { - throw DCPReadError ("could not read audio MXF information"); + boost::throw_exception (DCPReadError ("could not read audio MXF information")); } if ( @@ -273,7 +270,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; } @@ -298,7 +295,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; } } @@ -311,41 +308,52 @@ 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)); } shared_ptr -SoundAsset::start_write () +SoundAsset::start_write (MXFMetadata const & metadata) { /* XXX: can't we use a shared_ptr here? */ - return shared_ptr (new SoundAssetWriter (this)); + return shared_ptr (new SoundAssetWriter (this, metadata)); } -SoundAssetWriter::SoundAssetWriter (SoundAsset* a) - : _asset (a) +struct SoundAssetWriter::ASDCPState +{ + ASDCP::PCM::MXFWriter mxf_writer; + ASDCP::PCM::FrameBuffer frame_buffer; + ASDCP::WriterInfo writer_info; + ASDCP::PCM::AudioDescriptor audio_desc; +}; + +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 */ - _audio_desc.EditRate = ASDCP::Rational (_asset->frames_per_second(), 1); - _audio_desc.AudioSamplingRate = ASDCP::Rational (_asset->sampling_rate(), 0); - _audio_desc.Locked = 0; - _audio_desc.ChannelCount = _asset->channels (); - _audio_desc.QuantizationBits = 24; - _audio_desc.BlockAlign = 3 * _asset->channels(); - _audio_desc.AvgBps = _asset->sampling_rate() * _audio_desc.BlockAlign; - _audio_desc.LinkedTrackID = 0; - _audio_desc.ChannelFormat = ASDCP::PCM::CF_NONE; + _state->audio_desc.EditRate = ASDCP::Rational (_asset->edit_rate(), 1); + _state->audio_desc.AudioSamplingRate = ASDCP::Rational (_asset->sampling_rate(), 1); + _state->audio_desc.Locked = 0; + _state->audio_desc.ChannelCount = _asset->channels (); + _state->audio_desc.QuantizationBits = 24; + _state->audio_desc.BlockAlign = 3 * _asset->channels(); + _state->audio_desc.AvgBps = _asset->sampling_rate() * _state->audio_desc.BlockAlign; + _state->audio_desc.LinkedTrackID = 0; + _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_NONE; - _frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_audio_desc)); - _frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_audio_desc)); - memset (_frame_buffer.Data(), 0, _frame_buffer.Capacity()); + _state->frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc)); + _state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc)); + memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity()); - MXFAsset::fill_writer_info (&_writer_info, _asset->uuid ()); + _asset->fill_writer_info (&_state->writer_info, _asset->uuid (), _metadata); - if (ASDCP_FAILURE (_mxf_writer.OpenWrite (_asset->path().c_str(), _writer_info, _audio_desc))) { - throw FileError ("could not open audio MXF for writing", _asset->path().string()); + 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())); } } @@ -354,7 +362,7 @@ SoundAssetWriter::write (float const * const * data, int frames) { for (int i = 0; i < frames; ++i) { - byte_t* out = _frame_buffer.Data() + _frame_buffer_offset; + byte_t* out = _state->frame_buffer.Data() + _frame_buffer_offset; /* Write one sample per channel */ for (int j = 0; j < _asset->channels(); ++j) { @@ -365,13 +373,13 @@ SoundAssetWriter::write (float const * const * data, int frames) } _frame_buffer_offset += 3 * _asset->channels(); - assert (_frame_buffer_offset <= int (_frame_buffer.Capacity())); + assert (_frame_buffer_offset <= int (_state->frame_buffer.Capacity())); /* Finish the MXF frame if required */ - if (_frame_buffer_offset == int (_frame_buffer.Capacity())) { + if (_frame_buffer_offset == int (_state->frame_buffer.Capacity())) { write_current_frame (); _frame_buffer_offset = 0; - memset (_frame_buffer.Data(), 0, _frame_buffer.Capacity()); + memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity()); } } } @@ -379,8 +387,8 @@ SoundAssetWriter::write (float const * const * data, int frames) void SoundAssetWriter::write_current_frame () { - if (ASDCP_FAILURE (_mxf_writer.WriteFrame (_frame_buffer, 0, 0))) { - throw MiscError ("could not write audio MXF frame"); + if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0))) { + boost::throw_exception (MiscError ("could not write audio MXF frame")); } ++_frames_written; @@ -393,8 +401,8 @@ SoundAssetWriter::finalize () write_current_frame (); } - if (ASDCP_FAILURE (_mxf_writer.Finalize())) { - throw MiscError ("could not finalise audio MXF"); + if (ASDCP_FAILURE (_state->mxf_writer.Finalize())) { + boost::throw_exception (MiscError ("could not finalise audio MXF")); } _finalized = true; @@ -402,7 +410,8 @@ SoundAssetWriter::finalize () _asset->set_duration (_frames_written); } -SoundAssetWriter::~SoundAssetWriter () +string +SoundAsset::key_type () const { - assert (_finalized); + return "MDAK"; }