Add accessors.

[libdcp.git] / src / sound_asset_writer.cc

diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index f7513d9171a4dee55b1f62cb419adfbd4ca8313a..8df4d911a0334377bbe01f7b71e71581cba0f648 100644 (file)
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -36,11 +36,13 @@
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
-#include "encryption_context.h"
+#include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
+#include <iostream>
 
 using std::min;
 using std::max;
+using std::cout;
 using namespace dcp;
 
 struct SoundAssetWriter::ASDCPState
@@ -48,71 +50,64 @@ struct SoundAssetWriter::ASDCPState
        ASDCP::PCM::MXFWriter mxf_writer;
        ASDCP::PCM::FrameBuffer frame_buffer;
        ASDCP::WriterInfo writer_info;
-       ASDCP::PCM::AudioDescriptor audio_desc;
+       ASDCP::PCM::AudioDescriptor desc;
 };
 
-SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path file, Standard standard, ChannelAssignment assign)
-       : AssetWriter (asset, file, standard)
+SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path file)
+       : AssetWriter (asset, file)
        , _state (new SoundAssetWriter::ASDCPState)
-       , _sound_asset (asset)
+       , _asset (asset)
        , _frame_buffer_offset (0)
 {
        /* Derived from ASDCP::Wav::SimpleWaveHeader::FillADesc */
-       _state->audio_desc.EditRate = ASDCP::Rational (_sound_asset->edit_rate().numerator, _sound_asset->edit_rate().denominator);
-       _state->audio_desc.AudioSamplingRate = ASDCP::Rational (_sound_asset->sampling_rate(), 1);
-       _state->audio_desc.Locked = 0;
-       _state->audio_desc.ChannelCount = _sound_asset->channels ();
-       _state->audio_desc.QuantizationBits = 24;
-       _state->audio_desc.BlockAlign = 3 * _sound_asset->channels();
-       _state->audio_desc.AvgBps = _sound_asset->sampling_rate() * _state->audio_desc.BlockAlign;
-       _state->audio_desc.LinkedTrackID = 0;
-       if (standard == INTEROP) {
-               _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_NONE;
+       _state->desc.EditRate = ASDCP::Rational (_asset->edit_rate().numerator, _asset->edit_rate().denominator);
+       _state->desc.AudioSamplingRate = ASDCP::Rational (_asset->sampling_rate(), 1);
+       _state->desc.Locked = 0;
+       _state->desc.ChannelCount = _asset->channels ();
+       _state->desc.QuantizationBits = 24;
+       _state->desc.BlockAlign = 3 * _asset->channels();
+       _state->desc.AvgBps = _asset->sampling_rate() * _state->desc.BlockAlign;
+       _state->desc.LinkedTrackID = 0;
+       if (asset->standard() == INTEROP) {
+               _state->desc.ChannelFormat = ASDCP::PCM::CF_NONE;
        } else {
-               switch (assign) {
-               case CHANNEL_ASSIGNMENT_51:
-                       _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_1;
-                       break;
-               case CHANNEL_ASSIGNMENT_61:
-                       _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_2;
-                       break;
-               case CHANNEL_ASSIGNMENT_71:
-                       _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_3;
-                       break;
-               case CHANNEL_ASSIGNMENT_WTF:
-                       _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_4;
-                       break;
-               case CHANNEL_ASSIGNMENT_71_DS:
-                       _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_5;
-                       break;
-               }
+               /* Just use WTF ("wild track format") for SMPTE for now; searches suggest that this
+                  uses the same assignment as Interop.
+               */
+               _state->desc.ChannelFormat = ASDCP::PCM::CF_CFG_4;
        }
 
-       _state->frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
-       _state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc));
+       /* I'm fairly sure this is not necessary, as ContainerDuration is written
+          in ASDCP's WriteMXFFooter, but it stops a valgrind warning.
+       */
+       _state->desc.ContainerDuration = 0;
+
+       _state->frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_state->desc));
+       _state->frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (_state->desc));
        memset (_state->frame_buffer.Data(), 0, _state->frame_buffer.Capacity());
 
-       _sound_asset->fill_writer_info (&_state->writer_info, _sound_asset->id(), standard);
+       _asset->fill_writer_info (&_state->writer_info, _asset->id());
 }
 
 void
 SoundAssetWriter::write (float const * const * data, int frames)
 {
        DCP_ASSERT (!_finalized);
+       DCP_ASSERT (frames > 0);
 
        static float const clip = 1.0f - (1.0f / pow (2, 23));
 
        if (!_started) {
-               Kumu::Result_t r = _state->mxf_writer.OpenWrite (_file.string().c_str(), _state->writer_info, _state->audio_desc);
+               Kumu::Result_t r = _state->mxf_writer.OpenWrite (_file.string().c_str(), _state->writer_info, _state->desc);
                if (ASDCP_FAILURE (r)) {
                        boost::throw_exception (FileError ("could not open audio MXF for writing", _file.string(), r));
                }
 
-               _sound_asset->set_file (_file);
+               _asset->set_file (_file);
                _started = true;
        }
 
-       int const ch = _sound_asset->channels ();
+       int const ch = _asset->channels ();
 
        for (int i = 0; i < frames; ++i) {
 
@@ -148,7 +143,7 @@ SoundAssetWriter::write (float const * const * data, int frames)
 void
 SoundAssetWriter::write_current_frame ()
 {
-       ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context->encryption(), _encryption_context->hmac());
+       ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _crypto_context->context(), _crypto_context->hmac());
        if (ASDCP_FAILURE (r)) {
                boost::throw_exception (MiscError (String::compose ("could not write audio MXF frame (%1)", int (r))));
        }
@@ -163,10 +158,13 @@ SoundAssetWriter::finalize ()
                write_current_frame ();
        }
 
-       if (_started && ASDCP_FAILURE (_state->mxf_writer.Finalize())) {
-               boost::throw_exception (MiscError ("could not finalise audio MXF"));
+       if (_started) {
+               ASDCP::Result_t const r = _state->mxf_writer.Finalize();
+               if (ASDCP_FAILURE(r)) {
+                       boost::throw_exception (MiscError (String::compose ("could not finalise audio MXF (%1)", int(r))));
+               }
        }
 
-       _sound_asset->_intrinsic_duration = _frames_written;
+       _asset->_intrinsic_duration = _frames_written;
        return AssetWriter::finalize ();
 }