boost::signals2::signal<void (float)>* progress,
int fps,
int intrinsic_duration,
- bool encrypted,
+ bool interop,
MXFMetadata const & metadata
)
- : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted)
+ : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration)
, _channels (files.size ())
, _sampling_rate (0)
{
assert (_channels);
- construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), metadata);
+ construct (boost::bind (&SoundAsset::path_from_channel, this, _1, files), interop, metadata);
}
SoundAsset::SoundAsset (
int fps,
int intrinsic_duration,
int channels,
- bool encrypted,
+ bool interop,
MXFMetadata const & metadata
)
- : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration, encrypted)
+ : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration)
, _channels (channels)
, _sampling_rate (0)
{
assert (_channels);
- construct (get_path, metadata);
+ construct (get_path, interop, metadata);
}
SoundAsset::SoundAsset (string directory, string mxf_name)
}
SoundAsset::SoundAsset (string directory, string mxf_name, int fps, int channels, int sampling_rate)
- : MXFAsset (directory, mxf_name, 0, fps, 0, false)
+ : MXFAsset (directory, mxf_name, 0, fps, 0)
, _channels (channels)
, _sampling_rate (sampling_rate)
{
}
void
-SoundAsset::construct (boost::function<string (Channel)> get_path, MXFMetadata const & metadata)
+SoundAsset::construct (boost::function<string (Channel)> get_path, bool interop, MXFMetadata const & metadata)
{
ASDCP::Rational asdcp_edit_rate (_edit_rate, 1);
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, _uuid, interop, metadata);
ASDCP::PCM::MXFWriter mxf_writer;
if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc))) {
}
}
-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));
- if (_encrypted) {
- ms->add_child("KeyId")->add_child_text("urn:uuid:" + _key_id);
- }
+ return "MainSound";
}
bool
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 (bool interop, MXFMetadata const & metadata)
{
/* XXX: can't we use a shared_ptr here? */
- return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, metadata));
+ return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, interop, metadata));
}
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, bool interop, MXFMetadata const & m)
: _state (new SoundAssetWriter::ASDCPState)
, _asset (a)
, _finalized (false)
, _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());
- _asset->fill_writer_info (&_state->writer_info, _asset->uuid (), _metadata);
+ _asset->fill_writer_info (&_state->writer_info, _asset->uuid (), interop, _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()));
void
SoundAssetWriter::write_current_frame ()
{
- if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0))) {
+ if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, _state->encryption_context, 0))) {
boost::throw_exception (MiscError ("could not write audio MXF frame"));
}