X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=f59d82ad647b8f957b456a88e375f8d181433bb8;hb=5fdaf6d2cf0377d7a326063065c6af5adbf68a92;hp=b7253917eaa46e2837d48b0f5f1783e2dab934ac;hpb=e04553be273a10e7face6f8f245d9a37e05454d2;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index b7253917..f59d82ad 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -46,16 +46,16 @@ SoundAsset::SoundAsset ( string directory, string mxf_name, boost::signals2::signal* progress, - int fps, int intrinsic_duration, int start_frame + int fps, int intrinsic_duration, + MXFMetadata const & metadata ) : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) , _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,31 +63,30 @@ 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, + MXFMetadata const & metadata ) : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) , _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; @@ -101,7 +100,6 @@ SoundAsset::SoundAsset (string directory, string mxf_name, int fps, int channels : MXFAsset (directory, mxf_name, 0, fps, 0) , _channels (channels) , _sampling_rate (sampling_rate) - , _start_frame (0) { } @@ -115,13 +113,13 @@ 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_edit_rate (_edit_rate, 1); ASDCP::PCM::WAVParser pcm_parser_channel[_channels]; if (pcm_parser_channel[0].OpenRead (get_path(LEFT).c_str(), asdcp_edit_rate)) { - throw FileError ("could not open WAV file for reading", get_path(LEFT)); + boost::throw_exception (FileError ("could not open WAV file for reading", get_path(LEFT))); } ASDCP::PCM::AudioDescriptor audio_desc; @@ -153,7 +151,7 @@ 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_edit_rate))) { - throw FileError ("could not open WAV file for reading", path); + boost::throw_exception (FileError ("could not open WAV file for reading", path)); } pcm_parser_channel[i].FillAudioDescriptor (audio_desc_channel[i]); @@ -168,20 +166,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 +178,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")); } } @@ -208,7 +197,7 @@ SoundAsset::construct (boost::function get_path) } if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) { - throw MiscError ("could not write audio MXF frame"); + boost::throw_exception (MiscError ("could not write audio MXF frame")); } if (_progress) { @@ -217,47 +206,46 @@ 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" - << " " << _edit_rate << " 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)); } 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 +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; } @@ -298,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; } } @@ -311,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)); } 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)); } struct SoundAssetWriter::ASDCPState @@ -329,12 +318,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); @@ -351,10 +341,10 @@ 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 ()); + MXFAsset::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))) { - throw FileError ("could not open audio MXF for writing", _asset->path().string()); + boost::throw_exception (FileError ("could not open audio MXF for writing", _asset->path().string())); } } @@ -389,7 +379,7 @@ void SoundAssetWriter::write_current_frame () { if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0))) { - throw MiscError ("could not write audio MXF frame"); + boost::throw_exception (MiscError ("could not write audio MXF frame")); } ++_frames_written; @@ -403,15 +393,10 @@ SoundAssetWriter::finalize () } if (ASDCP_FAILURE (_state->mxf_writer.Finalize())) { - throw MiscError ("could not finalise audio MXF"); + boost::throw_exception (MiscError ("could not finalise audio MXF")); } _finalized = true; _asset->set_intrinsic_duration (_frames_written); _asset->set_duration (_frames_written); } - -SoundAssetWriter::~SoundAssetWriter () -{ - assert (_finalized); -}