std::shared_ptr

[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 f17e3d2f0f9be3b063c04524d539118d4ac82596..124d01857ed0e266961a8a44ae7af67b4ed49894 100644 (file)
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -1,35 +1,48 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    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.
 */
 
 #include "stereo_picture_asset_writer.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "picture_asset.h"
-#include "AS_DCP.h"
-#include "KM_fileio.h"
+#include "crypto_context.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
 
 #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 StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
@@ -37,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)
 {
@@ -46,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));
 }
 
@@ -57,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);
 
@@ -75,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,
-               0,
+               _crypto_context->context(),
+               _crypto_context->hmac(),
                &hash
                );
 
@@ -110,14 +123,16 @@ StereoPictureAssetWriter::fake_write (int size)
        }
 }
 
-void
+bool
 StereoPictureAssetWriter::finalize ()
 {
-       Kumu::Result_t r = _state->mxf_writer.Finalize();
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("error in finalizing video MXF", _file.string(), r));
+       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));
+               }
        }
 
        _picture_asset->_intrinsic_duration = _frames_written;
-       PictureAssetWriter::finalize ();
+       return PictureAssetWriter::finalize ();
 }