X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=9b6b48aa06bb2fa698de854127dc701f7d371b4f;hb=af87bfc82beee0b0600558c84c3843dfd5a252f6;hp=71d1d9ff0a29e0f5185a98ea818e1c677da7cfb3;hpb=8d94e57248b7957d62350083a93aa479457f9385;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 71d1d9ff..9b6b48aa 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -30,33 +30,77 @@ #include "sound_asset.h" #include "util.h" #include "exceptions.h" - -using namespace std; -using namespace boost; +#include "sound_frame.h" + +using std::string; +using std::stringstream; +using std::ostream; +using std::vector; +using std::list; +using boost::shared_ptr; +using boost::lexical_cast; using namespace libdcp; SoundAsset::SoundAsset ( - vector const & files, string directory, string mxf_name, sigc::signal1* progress, int fps, int length + vector const & files, + string directory, + string mxf_name, + boost::signals2::signal* progress, + int fps, int intrinsic_duration, + MXFMetadata const & metadata ) - : Asset (directory, mxf_name, progress, fps, length) + : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) , _channels (files.size ()) + , _sampling_rate (0) { - construct (sigc::bind (sigc::mem_fun (*this, &SoundAsset::path_from_channel), files)); + assert (_channels); + + construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), metadata); } SoundAsset::SoundAsset ( - sigc::slot get_path, string directory, string mxf_name, sigc::signal1* progress, int fps, int length, int channels + boost::function get_path, + string directory, + string mxf_name, + boost::signals2::signal* progress, + int fps, int intrinsic_duration, int channels, + MXFMetadata const & metadata ) - : Asset (directory, mxf_name, progress, fps, length) + : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) , _channels (channels) + , _sampling_rate (0) { - construct (get_path); + assert (_channels); + + construct (get_path, metadata); } -SoundAsset::SoundAsset (string directory, string mxf_name, int fps, int length) - : Asset (directory, mxf_name, 0, fps, length) +SoundAsset::SoundAsset (string directory, string mxf_name) + : MXFAsset (directory, mxf_name) , _channels (0) { + ASDCP::PCM::MXFReader reader; + if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) { + boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string())); + } + + ASDCP::PCM::AudioDescriptor desc; + if (ASDCP_FAILURE (reader.FillAudioDescriptor (desc))) { + boost::throw_exception (DCPReadError ("could not read audio MXF information")); + } + + _sampling_rate = desc.AudioSamplingRate.Numerator / desc.AudioSamplingRate.Denominator; + _channels = desc.ChannelCount; + _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) + , _channels (channels) + , _sampling_rate (sampling_rate) +{ } @@ -69,20 +113,20 @@ SoundAsset::path_from_channel (Channel channel, vector const & files) } void -SoundAsset::construct (sigc::slot 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[] = { @@ -91,9 +135,14 @@ SoundAsset::construct (sigc::slot get_path) CENTRE, LFE, LS, - RS + RS, + /* XXX: not quite sure what these should be yet */ + CHANNEL_7, + CHANNEL_8 }; + assert (int(_channels) <= int(sizeof(channels) / sizeof(Channel))); + ASDCP::PCM::FrameBuffer frame_buffer_channel[_channels]; ASDCP::PCM::AudioDescriptor audio_desc_channel[_channels]; @@ -101,8 +150,8 @@ SoundAsset::construct (sigc::slot 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]); @@ -117,31 +166,27 @@ SoundAsset::construct (sigc::slot get_path) frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (audio_desc)); ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info); + MXFAsset::fill_writer_info (&writer_info, _uuid, metadata); ASDCP::PCM::MXFWriter mxf_writer; - if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().string().c_str(), writer_info, audio_desc))) { - throw FileError ("could not open audio MXF for writing", mxf_path().string()); + if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc))) { + boost::throw_exception (FileError ("could not open audio MXF for writing", path().string())); } - - for (int i = 0; i < _length; ++i) { - - byte_t *data_s = frame_buffer.Data(); - byte_t *data_e = data_s + frame_buffer.Capacity(); - byte_t sample_size = ASDCP::PCM::CalcSampleSize (audio_desc_channel[0]); - int offset = 0; + + for (int i = 0; i < _intrinsic_duration; ++i) { 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"); - } - - if (frame_buffer_channel[j].Size() != frame_buffer_channel[j].Capacity()) { - throw MiscError ("short audio frame"); + boost::throw_exception (MiscError ("could not read audio frame")); } } + byte_t *data_s = frame_buffer.Data(); + byte_t *data_e = data_s + frame_buffer.Capacity(); + byte_t sample_size = ASDCP::PCM::CalcSampleSize (audio_desc_channel[0]); + int offset = 0; + while (data_s < data_e) { for (int j = 0; j < _channels; ++j) { byte_t* frame = frame_buffer_channel[j].Data() + offset; @@ -152,14 +197,16 @@ SoundAsset::construct (sigc::slot 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")); } - (*_progress) (0.5 * float (i) / _length); + if (_progress) { + (*_progress) (0.5 * float (i) / _intrinsic_duration); + } } if (ASDCP_FAILURE (mxf_writer.Finalize())) { - throw MiscError ("could not finalise audio MXF"); + boost::throw_exception (MiscError ("could not finalise audio MXF")); } } @@ -168,80 +215,194 @@ SoundAsset::write_to_cpl (ostream& s) const { s << " \n" << " urn:uuid:" << _uuid << "\n" - << " " << _mxf_name << "\n" - << " " << _fps << " 1\n" - << " " << _length << "\n" - << " 0\n" - << " " << _length << "\n" + << " " << _file_name << "\n" + << " " << _edit_rate << " 1\n" + << " " << _intrinsic_duration << "\n" + << " " << _entry_point << "\n" + << " " << _duration << "\n" << " \n"; } -list -SoundAsset::equals (shared_ptr other, EqualityOptions opt) const +bool +SoundAsset::equals (shared_ptr other, EqualityOptions opt, boost::function note) const { - list notes = Asset::equals (other, opt); + if (!MXFAsset::equals (other, opt, note)) { + return false; + } - if (opt.flags & MXF_INSPECT) { - ASDCP::PCM::MXFReader reader_A; - if (ASDCP_FAILURE (reader_A.OpenRead (mxf_path().string().c_str()))) { - cout << "failed " << mxf_path() << "\n"; - throw FileError ("could not open MXF file for reading", mxf_path().string()); - } + ASDCP::PCM::MXFReader reader_A; + if (ASDCP_FAILURE (reader_A.OpenRead (path().string().c_str()))) { + 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->mxf_path().string().c_str()))) { - cout << "failed " << other->mxf_path() << "\n"; - throw FileError ("could not open MXF file for reading", mxf_path().string()); - } + ASDCP::PCM::MXFReader reader_B; + if (ASDCP_FAILURE (reader_B.OpenRead (other->path().string().c_str()))) { + 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"); + ASDCP::PCM::AudioDescriptor desc_A; + if (ASDCP_FAILURE (reader_A.FillAudioDescriptor (desc_A))) { + boost::throw_exception (DCPReadError ("could not read audio MXF information")); + } + ASDCP::PCM::AudioDescriptor desc_B; + if (ASDCP_FAILURE (reader_B.FillAudioDescriptor (desc_B))) { + boost::throw_exception (DCPReadError ("could not read audio MXF information")); + } + + if ( + desc_A.EditRate != desc_B.EditRate || + desc_A.AudioSamplingRate != desc_B.AudioSamplingRate || + desc_A.Locked != desc_B.Locked || + desc_A.ChannelCount != desc_B.ChannelCount || + desc_A.QuantizationBits != desc_B.QuantizationBits || + desc_A.BlockAlign != desc_B.BlockAlign || + desc_A.AvgBps != desc_B.AvgBps || + desc_A.LinkedTrackID != desc_B.LinkedTrackID || + desc_A.ContainerDuration != desc_B.ContainerDuration +// desc_A.ChannelFormat != desc_B.ChannelFormat || + ) { + + note (ERROR, "audio MXF picture descriptors differ"); + return false; + } + + ASDCP::PCM::FrameBuffer buffer_A (1 * Kumu::Megabyte); + ASDCP::PCM::FrameBuffer buffer_B (1 * Kumu::Megabyte); + + for (int i = 0; i < _intrinsic_duration; ++i) { + if (ASDCP_FAILURE (reader_A.ReadFrame (i, buffer_A))) { + boost::throw_exception (DCPReadError ("could not read audio frame")); } - ASDCP::PCM::AudioDescriptor desc_B; - if (ASDCP_FAILURE (reader_B.FillAudioDescriptor (desc_B))) { - throw DCPReadError ("could not read audio MXF information"); + + if (ASDCP_FAILURE (reader_B.ReadFrame (i, buffer_B))) { + boost::throw_exception (DCPReadError ("could not read audio frame")); } - - if ( - desc_A.EditRate != desc_B.EditRate || - desc_A.AudioSamplingRate != desc_B.AudioSamplingRate || - desc_A.Locked != desc_B.Locked || - desc_A.ChannelCount != desc_B.ChannelCount || - desc_A.QuantizationBits != desc_B.QuantizationBits || - desc_A.BlockAlign != desc_B.BlockAlign || - desc_A.AvgBps != desc_B.AvgBps || - desc_A.LinkedTrackID != desc_B.LinkedTrackID || - desc_A.ContainerDuration != desc_B.ContainerDuration -// desc_A.ChannelFormat != desc_B.ChannelFormat || - ) { - notes.push_back ("audio MXF picture descriptors differ"); + if (buffer_A.Size() != buffer_B.Size()) { + note (ERROR, "sizes of audio data for frame " + lexical_cast(i) + " differ"); + return false; + } + + if (memcmp (buffer_A.RoData(), buffer_B.RoData(), buffer_A.Size()) != 0) { + for (uint32_t i = 0; i < buffer_A.Size(); ++i) { + int const d = abs (buffer_A.RoData()[i] - buffer_B.RoData()[i]); + if (d > opt.max_audio_sample_error) { + note (ERROR, "PCM data difference of " + lexical_cast (d)); + return false; + } + } } + } - ASDCP::PCM::FrameBuffer buffer_A (1 * Kumu::Megabyte); - ASDCP::PCM::FrameBuffer buffer_B (1 * Kumu::Megabyte); + return true; +} - for (int i = 0; i < _length; ++i) { - if (ASDCP_FAILURE (reader_A.ReadFrame (0, buffer_A))) { - throw DCPReadError ("could not read audio frame"); - } +shared_ptr +SoundAsset::get_frame (int n) const +{ + /* XXX: should add on entry point here? */ + return shared_ptr (new SoundFrame (path().string(), n)); +} - if (ASDCP_FAILURE (reader_B.ReadFrame (0, buffer_B))) { - throw DCPReadError ("could not read audio frame"); - } +shared_ptr +SoundAsset::start_write (MXFMetadata const & metadata) +{ + /* XXX: can't we use a shared_ptr here? */ + return shared_ptr (new SoundAssetWriter (this, metadata)); +} - if (buffer_A.Size() != buffer_B.Size()) { - notes.push_back ("sizes of video data for frame " + lexical_cast(i) + " differ"); - continue; - } +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 */ + _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; + + _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 (&_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())); + } +} - if (memcmp (buffer_A.RoData(), buffer_B.RoData(), buffer_A.Size()) != 0) { - notes.push_back ("PCM data for frame " + lexical_cast(i) + " differ"); - continue; - } +void +SoundAssetWriter::write (float const * const * data, int frames) +{ + for (int i = 0; i < frames; ++i) { + + byte_t* out = _state->frame_buffer.Data() + _frame_buffer_offset; + + /* Write one sample per channel */ + for (int j = 0; j < _asset->channels(); ++j) { + int32_t const s = data[j][i] * (1 << 23); + *out++ = (s & 0xff); + *out++ = (s & 0xff00) >> 8; + *out++ = (s & 0xff0000) >> 16; + } + _frame_buffer_offset += 3 * _asset->channels(); + + assert (_frame_buffer_offset <= int (_state->frame_buffer.Capacity())); + + /* Finish the MXF frame if required */ + if (_frame_buffer_offset == int (_state->frame_buffer.Capacity())) { + write_current_frame (); + _frame_buffer_offset = 0; + memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity()); } } +} + +void +SoundAssetWriter::write_current_frame () +{ + if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0))) { + boost::throw_exception (MiscError ("could not write audio MXF frame")); + } - return notes; + ++_frames_written; +} + +void +SoundAssetWriter::finalize () +{ + if (_frame_buffer_offset > 0) { + write_current_frame (); + } + + if (ASDCP_FAILURE (_state->mxf_writer.Finalize())) { + 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); }