Try to add basic decryption support to dcpdiff.

[libdcp.git] / src / stereo_picture_mxf_writer.cc

diff --git a/src/stereo_picture_mxf_writer.cc b/src/stereo_picture_mxf_writer.cc
index b988d75a1db010e85080567680031b82c290b6d0..2c0468f6956d5e341465dfaa5a7c87c0df6694e2 100644 (file)
--- a/src/stereo_picture_mxf_writer.cc
+++ b/src/stereo_picture_mxf_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 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
@@ -17,11 +17,12 @@
 
 */
 
-#include "AS_DCP.h"
-#include "KM_fileio.h"
 #include "stereo_picture_mxf_writer.h"
 #include "exceptions.h"
+#include "dcp_assert.h"
 #include "picture_mxf.h"
+#include "AS_DCP.h"
+#include "KM_fileio.h"
 
 #include "picture_mxf_writer_common.cc"
 
@@ -36,18 +37,19 @@ struct StereoPictureMXFWriter::ASDCPState : public ASDCPStateBase
        ASDCP::JP2K::MXFSWriter mxf_writer;
 };
 
-StereoPictureMXFWriter::StereoPictureMXFWriter (PictureMXF* asset, bool overwrite)
-       : PictureMXFWriter (asset, overwrite)
+StereoPictureMXFWriter::StereoPictureMXFWriter (PictureMXF* mxf, boost::filesystem::path file, Standard standard, bool overwrite)
+       : PictureMXFWriter (mxf, file, standard, overwrite)
        , _state (new StereoPictureMXFWriter::ASDCPState)
        , _next_eye (EYE_LEFT)
 {
-       _state->encryption_context = asset->encryption_context ();
+       _state->encryption_context = mxf->encryption_context ();
 }
 
 void
 StereoPictureMXFWriter::start (uint8_t* data, int size)
 {
-       dcp::start (this, _state, _asset, data, size);
+       dcp::start (this, _state, _standard, _picture_mxf, data, size);
+       _picture_mxf->set_frame_rate (Fraction (_picture_mxf->edit_rate().numerator * 2, _picture_mxf->edit_rate().denominator));
 }
 
 /** Write a frame for one eye.  Frames must be written left, then right, then left etc.
@@ -57,7 +59,7 @@ StereoPictureMXFWriter::start (uint8_t* data, int size)
 FrameInfo
 StereoPictureMXFWriter::write (uint8_t* data, int size)
 {
-       assert (!_finalized);
+       DCP_ASSERT (!_finalized);
 
        if (!_started) {
                start (data, size);
@@ -79,41 +81,42 @@ StereoPictureMXFWriter::write (uint8_t* data, int size)
                );
 
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string(), r));
+               boost::throw_exception (MXFFileError ("error in writing video MXF", _mxf->file().string(), r));
        }
 
        _next_eye = _next_eye == EYE_LEFT ? EYE_RIGHT : EYE_LEFT;
 
-       ++_frames_written;
+       if (_next_eye == EYE_LEFT) {
+               ++_frames_written;
+       }
+                       
        return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
 }
 
 void
 StereoPictureMXFWriter::fake_write (int size)
 {
-       assert (_started);
-       assert (!_finalized);
+       DCP_ASSERT (_started);
+       DCP_ASSERT (!_finalized);
 
-       Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size);
+       Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size, _next_eye == EYE_LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT);
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string(), r));
+               boost::throw_exception (MXFFileError ("error in writing video MXF", _mxf->file().string(), r));
        }
 
        _next_eye = _next_eye == EYE_LEFT ? EYE_RIGHT : EYE_LEFT;
-       ++_frames_written;
+       if (_next_eye == EYE_LEFT) {
+               ++_frames_written;
+       }
 }
 
 void
 StereoPictureMXFWriter::finalize ()
 {
-       assert (!_finalized);
-       
        Kumu::Result_t r = _state->mxf_writer.Finalize();
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in finalizing video MXF", _asset->path().string(), r));
+               boost::throw_exception (MXFFileError ("error in finalizing video MXF", _mxf->file().string(), r));
        }
 
-       _finalized = true;
-       _asset->set_intrinsic_duration (_frames_written / 2);
-       _asset->set_duration (_frames_written / 2);
+       PictureMXFWriter::finalize ();
 }