X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmono_picture_mxf_writer.cc;h=01292876a0ef0438469b8719134cb7c9d4341e5d;hb=edf35a7acb05289dc024733efd6e13205def5174;hp=619d298e26ef1db3bff596227f2b7462d4c86e32;hpb=59886567974bd3e79d30a4a9425d86d50bf425f3;p=libdcp.git diff --git a/src/mono_picture_mxf_writer.cc b/src/mono_picture_mxf_writer.cc index 619d298e..01292876 100644 --- a/src/mono_picture_mxf_writer.cc +++ b/src/mono_picture_mxf_writer.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington 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,16 @@ */ +/** @file src/mono_picture_mxf_writer.cc + * @brief MonoPictureMXFWriter class + */ + #include "AS_DCP.h" #include "KM_fileio.h" #include "mono_picture_mxf_writer.h" #include "exceptions.h" #include "picture_mxf.h" +#include "dcp_assert.h" #include "picture_mxf_writer_common.cc" @@ -29,7 +34,6 @@ using std::istream; using std::ostream; using std::string; using boost::shared_ptr; -using boost::lexical_cast; using namespace dcp; struct MonoPictureMXFWriter::ASDCPState : public ASDCPStateBase @@ -51,12 +55,13 @@ void MonoPictureMXFWriter::start (uint8_t* data, int size) { dcp::start (this, _state, _standard, _picture_mxf, data, size); + _picture_mxf->set_frame_rate (_picture_mxf->edit_rate()); } FrameInfo MonoPictureMXFWriter::write (uint8_t* data, int size) { - assert (!_finalized); + DCP_ASSERT (!_finalized); if (!_started) { start (data, size); @@ -81,8 +86,8 @@ MonoPictureMXFWriter::write (uint8_t* data, int size) void MonoPictureMXFWriter::fake_write (int size) { - assert (_started); - assert (!_finalized); + DCP_ASSERT (_started); + DCP_ASSERT (!_finalized); Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size); if (ASDCP_FAILURE (r)) {