X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_asset_writer.cc;h=b6f8cc1b20e3f6b9dae0b29477ed7ea6d6357a45;hb=880c6f67ca3637c54c97c51081e0649743292af3;hp=1f384c284be8d629fbdace39a87f13e005b454ab;hpb=566608b965e8ec0e08d9de128405d22ec7fedcd6;p=libdcp.git diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc index 1f384c28..b6f8cc1b 100644 --- a/src/mono_picture_asset_writer.cc +++ b/src/mono_picture_asset_writer.cc @@ -1,35 +1,53 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington - 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 . + + 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 "AS_DCP.h" -#include "KM_fileio.h" +/** @file src/mono_picture_asset_writer.cc + * @brief MonoPictureAssetWriter class + */ + #include "mono_picture_asset_writer.h" #include "exceptions.h" #include "picture_asset.h" +#include "dcp_assert.h" +#include "encryption_context.h" +#include +#include #include "picture_asset_writer_common.cc" -using std::istream; -using std::ostream; using std::string; using boost::shared_ptr; -using namespace libdcp; +using namespace dcp; struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase { @@ -39,23 +57,24 @@ struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase /** @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, bool overwrite) - : PictureAssetWriter (asset, overwrite) +MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, Standard standard, bool overwrite) + : PictureAssetWriter (asset, file, standard, overwrite) , _state (new MonoPictureAssetWriter::ASDCPState) { - _state->encryption_context = asset->encryption_context (); + } void MonoPictureAssetWriter::start (uint8_t* data, int size) { - libdcp::start (this, _state, _asset, data, size); + dcp::start (this, _state, _standard, _picture_asset, data, size); + _picture_asset->set_frame_rate (_picture_asset->edit_rate()); } FrameInfo MonoPictureAssetWriter::write (uint8_t* data, int size) { - assert (!_finalized); + DCP_ASSERT (!_finalized); if (!_started) { start (data, size); @@ -68,8 +87,9 @@ MonoPictureAssetWriter::write (uint8_t* data, int size) uint64_t const before_offset = _state->mxf_writer.Tell (); string hash; - if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, _state->encryption_context, 0, &hash))) { - boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string())); + ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _encryption_context->encryption(), _encryption_context->hmac(), &hash); + if (ASDCP_FAILURE (r)) { + boost::throw_exception (MXFFileError ("error in writing video MXF", _file.string(), r)); } ++_frames_written; @@ -79,27 +99,27 @@ MonoPictureAssetWriter::write (uint8_t* data, int size) void MonoPictureAssetWriter::fake_write (int size) { - assert (_started); - assert (!_finalized); + DCP_ASSERT (_started); + DCP_ASSERT (!_finalized); - if (ASDCP_FAILURE (_state->mxf_writer.FakeWriteFrame (size))) { - boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string())); + 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)); } ++_frames_written; } -void +bool MonoPictureAssetWriter::finalize () { - assert (!_finalized); - - if (ASDCP_FAILURE (_state->mxf_writer.Finalize())) { - boost::throw_exception (MXFFileError ("error in finalizing video MXF", _asset->path().string())); + 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)); + } } - _finalized = true; - _asset->set_intrinsic_duration (_frames_written); - _asset->set_duration (_frames_written); + _picture_asset->_intrinsic_duration = _frames_written; + return PictureAssetWriter::finalize (); } -