diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mono_picture_asset_writer.cc | 15 | ||||
| -rw-r--r-- | src/picture_asset_writer_common.cc | 3 | ||||
| -rw-r--r-- | src/stereo_picture_asset_writer.cc | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc index c8f17cbc..df6e3d45 100644 --- a/src/mono_picture_asset_writer.cc +++ b/src/mono_picture_asset_writer.cc @@ -109,7 +109,7 @@ MonoPictureAssetWriter::write (uint8_t const * data, int size) uint64_t const before_offset = _state->mxf_writer.Tell (); string hash; - auto const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _crypto_context->context(), _crypto_context->hmac(), &hash); + 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)); } @@ -120,17 +120,18 @@ MonoPictureAssetWriter::write (uint8_t const * data, int size) void -MonoPictureAssetWriter::fake_write (int size) +MonoPictureAssetWriter::fake_write(int) { DCP_ASSERT (_started); DCP_ASSERT (!_finalized); - auto r = _state->mxf_writer.FakeWriteFrame (size); - if (ASDCP_FAILURE(r)) { - boost::throw_exception (MXFFileError("error in writing video MXF", _file.string(), r)); - } + DCP_ASSERT(false); + // 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; + // ++_frames_written; } diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc index e719be72..ed17ee98 100644 --- a/src/picture_asset_writer_common.cc +++ b/src/picture_asset_writer_common.cc @@ -80,8 +80,7 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint asset->file()->string().c_str(), state->writer_info, state->picture_descriptor, - 16384, - writer->_overwrite + 16384 ); if (ASDCP_FAILURE(r)) { diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc index 872c59cf..edc0eebe 100644 --- a/src/stereo_picture_asset_writer.cc +++ b/src/stereo_picture_asset_writer.cc @@ -107,8 +107,7 @@ StereoPictureAssetWriter::write (uint8_t const * data, int size) _state->frame_buffer, _next_eye == Eye::LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT, _crypto_context->context(), - _crypto_context->hmac(), - &hash + _crypto_context->hmac() ); if (ASDCP_FAILURE (r)) { @@ -131,6 +130,7 @@ StereoPictureAssetWriter::fake_write (int size) DCP_ASSERT (_started); DCP_ASSERT (!_finalized); + DCP_ASSERT(false); auto 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", _file.string(), r)); |