/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
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
#include <stdexcept>
#include <boost/filesystem.hpp>
#include <boost/lexical_cast.hpp>
+#include <libxml++/nodes/element.h>
#include "KM_fileio.h"
#include "AS_DCP.h"
#include "sound_asset.h"
using boost::lexical_cast;
using namespace libdcp;
-SoundAsset::SoundAsset (
- vector<string> const & files,
- string directory,
- string mxf_name,
- boost::signals2::signal<void (float)>* progress,
- int fps, int intrinsic_duration,
- MXFMetadata const & metadata
- )
- : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration)
- , _channels (files.size ())
+SoundAsset::SoundAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name)
+ : MXFAsset (directory, mxf_name)
+ , _channels (0)
, _sampling_rate (0)
{
- assert (_channels);
-
- construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), metadata);
+
}
-SoundAsset::SoundAsset (
- boost::function<string (Channel)> get_path,
- string directory,
- string mxf_name,
- boost::signals2::signal<void (float)>* progress,
- int fps, int intrinsic_duration, int channels,
- MXFMetadata const & metadata
- )
- : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration)
- , _channels (channels)
- , _sampling_rate (0)
+void
+SoundAsset::create (vector<boost::filesystem::path> const & files)
{
- assert (_channels);
-
- construct (get_path, metadata);
+ create (boost::bind (&SoundAsset::path_from_channel, this, _1, files));
}
-SoundAsset::SoundAsset (string directory, string mxf_name)
- : MXFAsset (directory, mxf_name)
- , _channels (0)
+void
+SoundAsset::read ()
{
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()));
+ Kumu::Result_t r = reader.OpenRead (path().string().c_str());
+ if (ASDCP_FAILURE (r)) {
+ boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r));
}
ASDCP::PCM::AudioDescriptor desc;
_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)
-{
-
-}
-
-string
-SoundAsset::path_from_channel (Channel channel, vector<string> const & files)
+boost::filesystem::path
+SoundAsset::path_from_channel (Channel channel, vector<boost::filesystem::path> const & files)
{
unsigned int const c = int (channel);
assert (c < files.size ());
}
void
-SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata const & metadata)
+SoundAsset::create (boost::function<boost::filesystem::path (Channel)> get_path)
{
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)) {
- boost::throw_exception (FileError ("could not open WAV file for reading", get_path(LEFT)));
+ assert (_channels > 0);
+ ASDCP::PCM::WAVParser* pcm_parser_channel[_channels];
+ for (int i = 0; i < _channels; ++i) {
+ pcm_parser_channel[i] = new ASDCP::PCM::WAVParser ();
+ }
+
+ Kumu::Result_t r = pcm_parser_channel[0]->OpenRead (get_path(LEFT).string().c_str(), asdcp_edit_rate);
+ if (ASDCP_FAILURE (r)) {
+ boost::throw_exception (FileError ("could not open WAV file for reading", get_path(LEFT), r));
}
ASDCP::PCM::AudioDescriptor audio_desc;
- pcm_parser_channel[0].FillAudioDescriptor (audio_desc);
+ pcm_parser_channel[0]->FillAudioDescriptor (audio_desc);
audio_desc.ChannelCount = 0;
audio_desc.BlockAlign = 0;
audio_desc.EditRate = asdcp_edit_rate;
assert (int(_channels) <= int(sizeof(channels) / sizeof(Channel)));
- ASDCP::PCM::FrameBuffer frame_buffer_channel[_channels];
- ASDCP::PCM::AudioDescriptor audio_desc_channel[_channels];
+ ASDCP::PCM::FrameBuffer* frame_buffer_channel[_channels];
+ ASDCP::PCM::AudioDescriptor* audio_desc_channel[_channels];
+ for (int i = 0; i < _channels; ++i) {
+ frame_buffer_channel[i] = new ASDCP::PCM::FrameBuffer ();
+ audio_desc_channel[i] = new ASDCP::PCM::AudioDescriptor ();
+ }
for (int i = 0; i < _channels; ++i) {
- string const path = get_path (channels[i]);
+ boost::filesystem::path const path = get_path (channels[i]);
- 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));
+ Kumu::Result_t r = pcm_parser_channel[i]->OpenRead (path.string().c_str(), asdcp_edit_rate);
+ if (ASDCP_FAILURE (r)) {
+ boost::throw_exception (FileError ("could not open WAV file for reading", path, r));
}
- pcm_parser_channel[i].FillAudioDescriptor (audio_desc_channel[i]);
- frame_buffer_channel[i].Capacity (ASDCP::PCM::CalcFrameBufferSize (audio_desc_channel[i]));
+ 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[i].ChannelCount;
- audio_desc.BlockAlign += audio_desc_channel[i].BlockAlign;
+ audio_desc.ChannelCount += audio_desc_channel[i]->ChannelCount;
+ audio_desc.BlockAlign += audio_desc_channel[i]->BlockAlign;
}
ASDCP::PCM::FrameBuffer frame_buffer;
frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (audio_desc));
ASDCP::WriterInfo writer_info;
- MXFAsset::fill_writer_info (&writer_info, _uuid, metadata);
+ MXFAsset::fill_writer_info (&writer_info);
ASDCP::PCM::MXFWriter mxf_writer;
- 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()));
+ r = mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc);
+ if (ASDCP_FAILURE (r)) {
+ boost::throw_exception (FileError ("could not open audio MXF for writing", path().string(), r));
}
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]))) {
+ memset (frame_buffer_channel[j]->Data(), 0, frame_buffer_channel[j]->Capacity());
+ if (ASDCP_FAILURE (pcm_parser_channel[j]->ReadFrame (*frame_buffer_channel[j]))) {
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]);
+ 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;
+ byte_t* frame = frame_buffer_channel[j]->Data() + offset;
memcpy (data_s, frame, sample_size);
data_s += sample_size;
}
offset += sample_size;
}
- if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) {
+ if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, _encryption_context, 0))) {
boost::throw_exception (MiscError ("could not write audio MXF frame"));
}
}
}
- if (ASDCP_FAILURE (mxf_writer.Finalize())) {
+ bool const failed = ASDCP_FAILURE (mxf_writer.Finalize());
+
+ for (int i = 0; i < _channels; ++i) {
+ delete pcm_parser_channel[i];
+ delete frame_buffer_channel[i];
+ delete audio_desc_channel[i];
+ }
+
+ if (failed) {
boost::throw_exception (MiscError ("could not finalise audio MXF"));
}
}
-void
-SoundAsset::write_to_cpl (xmlpp::Node* node) const
+string
+SoundAsset::cpl_node_name () const
{
- 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<string> (_edit_rate) + " 1");
- ms->add_child ("IntrinsicDuration")->add_child_text (lexical_cast<string> (_intrinsic_duration));
- ms->add_child ("EntryPoint")->add_child_text (lexical_cast<string> (_entry_point));
- ms->add_child ("Duration")->add_child_text (lexical_cast<string> (_duration));
+ return "MainSound";
}
bool
}
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()));
+ Kumu::Result_t r = reader_A.OpenRead (path().string().c_str());
+ if (ASDCP_FAILURE (r)) {
+ boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r));
}
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()));
+ r = reader_B.OpenRead (other->path().string().c_str());
+ if (ASDCP_FAILURE (r)) {
+ boost::throw_exception (MXFFileError ("could not open MXF file for reading", path().string(), r));
}
ASDCP::PCM::AudioDescriptor desc_A;
SoundAsset::get_frame (int n) const
{
/* XXX: should add on entry point here? */
- return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n));
+ return shared_ptr<const SoundFrame> (new SoundFrame (path().string(), n, _decryption_context));
}
shared_ptr<SoundAssetWriter>
-SoundAsset::start_write (MXFMetadata const & metadata)
+SoundAsset::start_write ()
{
/* XXX: can't we use a shared_ptr here? */
- return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, metadata));
+ return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this));
}
struct SoundAssetWriter::ASDCPState
ASDCP::PCM::FrameBuffer frame_buffer;
ASDCP::WriterInfo writer_info;
ASDCP::PCM::AudioDescriptor audio_desc;
+ ASDCP::AESEncContext* encryption_context;
};
-SoundAssetWriter::SoundAssetWriter (SoundAsset* a, MXFMetadata const & m)
+SoundAssetWriter::SoundAssetWriter (SoundAsset* a)
: _state (new SoundAssetWriter::ASDCPState)
, _asset (a)
, _finalized (false)
, _frames_written (0)
, _frame_buffer_offset (0)
- , _metadata (m)
{
+ _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->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);
+ _asset->fill_writer_info (&_state->writer_info);
- 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()));
+ 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
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"));
+ 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<string> (int (r)) + ")"));
}
++_frames_written;
_asset->set_duration (_frames_written);
}
-SoundAssetWriter::~SoundAssetWriter ()
+string
+SoundAsset::key_type () const
{
- assert (_finalized);
+ return "MDAK";
}
projects / libdcp.git / blobdiff