*/
+/** @file src/sound_asset.cc
+ * @brief An asset made up of WAV files
+ */
+
#include <iostream>
#include <stdexcept>
#include <boost/filesystem.hpp>
-#include <AS_DCP.h>
+#include "AS_DCP.h"
#include "sound_asset.h"
#include "util.h"
+#include "exceptions.h"
using namespace std;
using namespace boost;
using namespace libdcp;
-SoundAsset::SoundAsset (list<string> const & files, string p, int fps, int len)
- : Asset (p, fps, len)
+SoundAsset::SoundAsset (
+ vector<string> const & files, string mxf_path, sigc::signal1<void, float>* progress, int fps, int length
+ )
+ : Asset (mxf_path, progress, fps, length)
+ , _channels (files.size ())
+{
+ construct (sigc::bind (sigc::mem_fun (*this, &SoundAsset::path_from_channel), files));
+}
+
+SoundAsset::SoundAsset (
+ sigc::slot<string, Channel> get_path, string mxf_path, sigc::signal1<void, float>* progress, int fps, int length, int channels
+ )
+ : Asset (mxf_path, progress, fps, length)
+ , _channels (channels)
+{
+ construct (get_path);
+}
+
+string
+SoundAsset::path_from_channel (Channel channel, vector<string> const & files)
+{
+ unsigned int const c = int (channel);
+ assert (c < files.size ());
+ return files[c];
+}
+
+void
+SoundAsset::construct (sigc::slot<string, Channel> get_path)
{
ASDCP::Rational asdcp_fps (_fps, 1);
- ASDCP::PCM::WAVParser pcm_parser_channel[files.size()];
- if (pcm_parser_channel[0].OpenRead (files.front().c_str(), asdcp_fps)) {
- throw runtime_error ("could not open WAV file for reading");
+ 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));
}
ASDCP::PCM::AudioDescriptor audio_desc;
audio_desc.ChannelCount = 0;
audio_desc.BlockAlign = 0;
audio_desc.EditRate = asdcp_fps;
- audio_desc.AvgBps = audio_desc.AvgBps * files.size ();
+ audio_desc.AvgBps = audio_desc.AvgBps * _channels;
- ASDCP::PCM::FrameBuffer frame_buffer_channel[files.size()];
- ASDCP::PCM::AudioDescriptor audio_desc_channel[files.size()];
-
- int j = 0;
- for (list<string>::const_iterator i = files.begin(); i != files.end(); ++i) {
+ Channel channels[] = {
+ LEFT,
+ RIGHT,
+ CENTRE,
+ LFE,
+ LS,
+ RS
+ };
+
+ ASDCP::PCM::FrameBuffer frame_buffer_channel[_channels];
+ ASDCP::PCM::AudioDescriptor audio_desc_channel[_channels];
+
+ for (int i = 0; i < _channels; ++i) {
+
+ string const path = get_path (channels[i]);
- if (ASDCP_FAILURE (pcm_parser_channel[j].OpenRead (i->c_str(), asdcp_fps))) {
- throw runtime_error ("could not open WAV file for reading");
+ if (ASDCP_FAILURE (pcm_parser_channel[i].OpenRead (path.c_str(), asdcp_fps))) {
+ throw FileError ("could not open WAV file for reading", path);
}
- pcm_parser_channel[j].FillAudioDescriptor (audio_desc_channel[j]);
- frame_buffer_channel[j].Capacity (ASDCP::PCM::CalcFrameBufferSize (audio_desc_channel[j]));
+ pcm_parser_channel[i].FillAudioDescriptor (audio_desc_channel[i]);
+ frame_buffer_channel[i].Capacity (ASDCP::PCM::CalcFrameBufferSize (audio_desc_channel[i]));
- audio_desc.ChannelCount += audio_desc_channel[j].ChannelCount;
- audio_desc.BlockAlign += audio_desc_channel[j].BlockAlign;
- ++j;
+ audio_desc.ChannelCount += audio_desc_channel[i].ChannelCount;
+ audio_desc.BlockAlign += audio_desc_channel[i].BlockAlign;
}
ASDCP::PCM::FrameBuffer frame_buffer;
ASDCP::PCM::MXFWriter mxf_writer;
if (ASDCP_FAILURE (mxf_writer.OpenWrite (_mxf_path.c_str(), writer_info, audio_desc))) {
- throw runtime_error ("could not open audio MXF for writing");
+ throw FileError ("could not open audio MXF for writing", _mxf_path);
}
for (int i = 0; i < _length; ++i) {
byte_t sample_size = ASDCP::PCM::CalcSampleSize (audio_desc_channel[0]);
int offset = 0;
- for (list<string>::size_type j = 0; j < files.size(); ++j) {
+ 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 runtime_error ("could not read audio frame");
+ throw MiscError ("could not read audio frame");
}
if (frame_buffer_channel[j].Size() != frame_buffer_channel[j].Capacity()) {
- throw runtime_error ("short audio frame");
+ throw MiscError ("short audio frame");
}
}
while (data_s < data_e) {
- for (list<string>::size_type j = 0; j < files.size(); ++j) {
+ for (int j = 0; j < _channels; ++j) {
byte_t* frame = frame_buffer_channel[j].Data() + offset;
memcpy (data_s, frame, sample_size);
data_s += sample_size;
}
if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) {
- throw runtime_error ("could not write audio MXF frame");
+ throw MiscError ("could not write audio MXF frame");
}
- Progress (float (i) / _length);
+ (*_progress) (0.5 * float (i) / _length);
}
if (ASDCP_FAILURE (mxf_writer.Finalize())) {
- throw runtime_error ("could not finalise audio MXF");
+ throw MiscError ("could not finalise audio MXF");
}
- _digest = make_digest (_mxf_path);
+ _digest = make_digest (_mxf_path, _progress);
}
void
SoundAsset::write_to_cpl (ostream& s) const
{
s << " <MainSound>\n"
- << " <Id>" << _uuid << "</Id>\n"
+ << " <Id>urn:uuid:" << _uuid << "</Id>\n"
+#if BOOST_FILESYSTEM_VERSION == 3
+ << " <AnnotationText>" << filesystem::path(_mxf_path).filename().string() << "</AnnotationText>\n"
+#else
<< " <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
- << " <EditRate>" << _fps << "</EditRate>\n"
+#endif
+ << " <EditRate>" << _fps << " 1</EditRate>\n"
<< " <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
<< " <EntryPoint>0</EntryPoint>\n"
<< " <Duration>" << _length << "</Duration>\n"