Fix tests again on Windows.

[libdcp.git] / src / mono_picture_asset_writer.cc

diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index 594dae0370ff753464d40f13f29c42dd1e0463e0..7fd58114e737e1d0c5d58cc1e9fd6463458d8b9c 100644 (file)
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -16,51 +16,85 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+
 /** @file  src/mono_picture_asset_writer.cc
  *  @brief MonoPictureAssetWriter class
  */
 
-#include "AS_DCP.h"
-#include "KM_fileio.h"
-#include "mono_picture_asset_writer.h"
+
+#include "crypto_context.h"
+#include "dcp_assert.h"
 #include "exceptions.h"
+#include "mono_picture_asset_writer.h"
 #include "picture_asset.h"
-#include "dcp_assert.h"
+#include "warnings.h"
+LIBDCP_DISABLE_WARNINGS
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 #include "picture_asset_writer_common.cc"
 
-using std::istream;
-using std::ostream;
+
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using namespace dcp;
 
+
 struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 {
        ASDCP::JP2K::MXFWriter mxf_writer;
 };
 
+
 /** @param a Asset to write to.  `a' must not be deleted while
  *  this writer class still exists, or bad things will happen.
  */
-MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite)
-       : PictureAssetWriter (asset, file, standard, overwrite)
+MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+       : PictureAssetWriter (asset, file, overwrite)
        , _state (new MonoPictureAssetWriter::ASDCPState)
 {
 
 }
 
+
+MonoPictureAssetWriter::~MonoPictureAssetWriter()
+{
+       try {
+               /* Last-resort finalization to close the file, at least */
+               if (!_finalized) {
+                       _state->mxf_writer.Finalize();
+               }
+       } catch (...) {}
+}
+
+
 void
-MonoPictureAssetWriter::start (uint8_t* data, int size)
+MonoPictureAssetWriter::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 (_picture_asset->edit_rate());
 }
 
+
 FrameInfo
-MonoPictureAssetWriter::write (uint8_t* data, int size)
+MonoPictureAssetWriter::write (uint8_t const * data, int size)
 {
        DCP_ASSERT (!_finalized);
 
@@ -68,15 +102,17 @@ MonoPictureAssetWriter::write (uint8_t* data, int size)
                start (data, size);
        }
 
-       if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) {
+       if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame(data, size, _state->frame_buffer))) {
                boost::throw_exception (MiscError ("could not parse J2K frame"));
        }
 
+       _state->frame_buffer.PlaintextOffset(0);
+
        uint64_t const before_offset = _state->mxf_writer.Tell ();
 
        string hash;
-       ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context, _hmac_context, &hash);
-       if (ASDCP_FAILURE (r)) {
+       auto const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _crypto_context->context(), _crypto_context->hmac(), &hash);
+       if (ASDCP_FAILURE(r)) {
                boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
        }
 
@@ -84,27 +120,29 @@ MonoPictureAssetWriter::write (uint8_t* data, int size)
        return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
 }
 
+
 void
 MonoPictureAssetWriter::fake_write (int size)
 {
        DCP_ASSERT (_started);
        DCP_ASSERT (!_finalized);
 
-       Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size);
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r));
+       auto r = _state->mxf_writer.FakeWriteFrame (size);
+       if (ASDCP_FAILURE(r)) {
+               boost::throw_exception (MXFFileError("error in writing video MXF", _file.string(), r));
        }
 
        ++_frames_written;
 }
 
+
 bool
 MonoPictureAssetWriter::finalize ()
 {
        if (_started) {
-               Kumu::Result_t r = _state->mxf_writer.Finalize();
-               if (ASDCP_FAILURE (r)) {
-                       boost::throw_exception (MXFFileError ("error in finalizing video MXF", _file.string(), r));
+               auto r = _state->mxf_writer.Finalize();
+               if (ASDCP_FAILURE(r)) {
+                       boost::throw_exception (MXFFileError("error in finalizing video MXF", _file.string(), r));
                }
        }