X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_mxf.cc;h=e338c16165abb2db3b28e519d3edd2f7270d88b9;hb=edf35a7acb05289dc024733efd6e13205def5174;hp=b569c57aa2207745986aa2ebcca92c9a4a2b2125;hpb=9fd79fb05fa47833ed431d83d73fd6d9a4a9f774;p=libdcp.git diff --git a/src/sound_mxf.cc b/src/sound_mxf.cc index b569c57a..e338c161 100644 --- a/src/sound_mxf.cc +++ b/src/sound_mxf.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,21 +17,22 @@ */ -/** @file src/sound_asset.cc - * @brief An asset made up of WAV files +/** @file src/sound_mxf.cc + * @brief SoundMXF class. */ -#include -#include -#include -#include -#include -#include "KM_fileio.h" -#include "AS_DCP.h" #include "sound_mxf.h" #include "util.h" #include "exceptions.h" #include "sound_frame.h" +#include "sound_mxf_writer.h" +#include "compose.hpp" +#include "KM_fileio.h" +#include "AS_DCP.h" +#include +#include +#include +#include using std::string; using std::stringstream; @@ -39,24 +40,17 @@ using std::ostream; using std::vector; using std::list; using boost::shared_ptr; -using boost::lexical_cast; using namespace dcp; -SoundMXF::SoundMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name) - : MXF (directory, mxf_name) +SoundMXF::SoundMXF (boost::filesystem::path file) + : MXF (file) , _channels (0) , _sampling_rate (0) -{ - -} - -void -SoundMXF::read () { ASDCP::PCM::MXFReader reader; - Kumu::Result_t r = reader.OpenRead (path().string().c_str()); + Kumu::Result_t r = reader.OpenRead (file.string().c_str()); if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r)); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", file.string(), r)); } ASDCP::PCM::AudioDescriptor desc; @@ -66,34 +60,44 @@ SoundMXF::read () _sampling_rate = desc.AudioSamplingRate.Numerator / desc.AudioSamplingRate.Denominator; _channels = desc.ChannelCount; - _edit_rate = desc.EditRate.Numerator; - assert (desc.EditRate.Denominator == 1); + _edit_rate = Fraction (desc.EditRate.Numerator, desc.EditRate.Denominator); + _intrinsic_duration = desc.ContainerDuration; + + ASDCP::WriterInfo info; + if (ASDCP_FAILURE (reader.FillWriterInfo (info))) { + boost::throw_exception (DCPReadError ("could not read audio MXF information")); + } + + read_writer_info (info); + } -string -SoundMXF::cpl_node_name () const +SoundMXF::SoundMXF (Fraction edit_rate, int sampling_rate, int channels) + : MXF (edit_rate) + , _channels (channels) + , _sampling_rate (sampling_rate) { - return "MainSound"; + } bool -SoundMXF::equals (shared_ptr other, EqualityOptions opt, boost::function note) const +SoundMXF::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const { if (!MXF::equals (other, opt, note)) { return false; } ASDCP::PCM::MXFReader reader_A; - Kumu::Result_t r = reader_A.OpenRead (path().string().c_str()); + Kumu::Result_t r = reader_A.OpenRead (file().string().c_str()); if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r)); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r)); } ASDCP::PCM::MXFReader reader_B; - r = reader_B.OpenRead (other->path().string().c_str()); + r = reader_B.OpenRead (other->file().string().c_str()); if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r)); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r)); } ASDCP::PCM::AudioDescriptor desc_A; @@ -118,7 +122,7 @@ SoundMXF::equals (shared_ptr other, EqualityOptions opt, boo // desc_A.ChannelFormat != desc_B.ChannelFormat || ) { - note (ERROR, "audio MXF picture descriptors differ"); + note (DCP_ERROR, "audio MXF picture descriptors differ"); return false; } @@ -135,7 +139,7 @@ SoundMXF::equals (shared_ptr other, EqualityOptions opt, boo } if (buffer_A.Size() != buffer_B.Size()) { - note (ERROR, "sizes of audio data for frame " + lexical_cast(i) + " differ"); + note (DCP_ERROR, String::compose ("sizes of audio data for frame %1 differ", i)); return false; } @@ -143,7 +147,7 @@ SoundMXF::equals (shared_ptr other, EqualityOptions opt, boo 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)); + note (DCP_ERROR, String::compose ("PCM data difference of %1", d)); return false; } } @@ -157,113 +161,12 @@ shared_ptr SoundMXF::get_frame (int n) const { /* XXX: should add on entry point here? */ - return shared_ptr (new SoundFrame (path().string(), n, _decryption_context)); + return shared_ptr (new SoundFrame (file(), n, _decryption_context)); } shared_ptr -SoundMXF::start_write () +SoundMXF::start_write (boost::filesystem::path file, Standard standard) { /* XXX: can't we use a shared_ptr here? */ - return shared_ptr (new SoundMXFWriter (this)); -} - -struct SoundMXFWriter::ASDCPState -{ - ASDCP::PCM::MXFWriter mxf_writer; - ASDCP::PCM::FrameBuffer frame_buffer; - ASDCP::WriterInfo writer_info; - ASDCP::PCM::AudioDescriptor audio_desc; - ASDCP::AESEncContext* encryption_context; -}; - -SoundMXFWriter::SoundMXFWriter (SoundMXF* a) - : _state (new SoundMXFWriter::ASDCPState) - , _asset (a) - , _finalized (false) - , _frames_written (0) - , _frame_buffer_offset (0) -{ - _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); - _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()); - - _asset->fill_writer_info (&_state->writer_info); - - Kumu::Result_t r = _state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->audio_desc); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (FileError ("could not open audio MXF for writing", _asset->path().string(), r)); - } -} - -void -SoundMXFWriter::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 -SoundMXFWriter::write_current_frame () -{ - ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _state->encryption_context, 0); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (MiscError ("could not write audio MXF frame (" + lexical_cast (int (r)) + ")")); - } - - ++_frames_written; -} - -void -SoundMXFWriter::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); -} - -string -SoundMXF::key_type () const -{ - return "MDAK"; + return shared_ptr (new SoundMXFWriter (this, file, standard)); }