Add some detail to a verification warning.

[libdcp.git] / src / stereo_picture_asset_writer.cc

diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index 6e43de100e95ac939af2372d3fd69ea21469c3f9..14900e6dac16efb3d745e818d0aee7a0f66070b2 100644 (file)
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -35,6 +35,7 @@
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "picture_asset.h"
+#include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
@@ -49,8 +50,8 @@ struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
        ASDCP::JP2K::MXFSWriter mxf_writer;
 };
 
-StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::filesystem::path file, Standard standard, bool overwrite)
-       : PictureAssetWriter (mxf, file, standard, overwrite)
+StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::filesystem::path file, bool overwrite)
+       : PictureAssetWriter (mxf, file, overwrite)
        , _state (new StereoPictureAssetWriter::ASDCPState)
        , _next_eye (EYE_LEFT)
 {
@@ -58,9 +59,9 @@ StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::fi
 }
 
 void
-StereoPictureAssetWriter::start (uint8_t* data, int size)
+StereoPictureAssetWriter::start (uint8_t const * data, int size)
 {
-       dcp::start (this, _state, _standard, _picture_asset, data, size);
+       dcp::start (this, _state, _picture_asset, data, size);
        _picture_asset->set_frame_rate (Fraction (_picture_asset->edit_rate().numerator * 2, _picture_asset->edit_rate().denominator));
 }
 
@@ -69,7 +70,7 @@ StereoPictureAssetWriter::start (uint8_t* data, int size)
  *  @param size Size of data.
  */
 FrameInfo
-StereoPictureAssetWriter::write (uint8_t* data, int size)
+StereoPictureAssetWriter::write (uint8_t const * data, int size)
 {
        DCP_ASSERT (!_finalized);
 
@@ -87,8 +88,8 @@ StereoPictureAssetWriter::write (uint8_t* data, int size)
        Kumu::Result_t r = _state->mxf_writer.WriteFrame (
                _state->frame_buffer,
                _next_eye == EYE_LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT,
-               _encryption_context,
-               _hmac_context,
+               _crypto_context->context(),
+               _crypto_context->hmac(),
                &hash
                );