using namespace libdcp;
FrameInfo::FrameInfo (istream& s)
+ : offset (0)
+ , size (0)
{
- s >> offset >> size >> hash;
+ s >> offset >> size;
+
+ if (!s.good ()) {
+ /* Make sure we zero these if something bad happened, otherwise
+ the caller might try to alloc lots of RAM.
+ */
+ offset = size = 0;
+ }
+
+ s >> hash;
}
void
}
-PictureAssetWriter::PictureAssetWriter (bool overwrite, MXFMetadata const & metadata)
- : _frames_written (0)
+PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite, bool interop, MXFMetadata const & metadata)
+ : _asset (asset)
+ , _frames_written (0)
, _started (false)
, _finalized (false)
, _overwrite (overwrite)
+ , _interop (interop)
, _metadata (metadata)
{
}
-struct MonoPictureAssetWriter::ASDCPState
+struct ASDCPStateBase
{
- ASDCPState()
+ ASDCPStateBase ()
: frame_buffer (4 * Kumu::Megabyte)
{}
ASDCP::JP2K::CodestreamParser j2k_parser;
ASDCP::JP2K::FrameBuffer frame_buffer;
- ASDCP::JP2K::MXFWriter mxf_writer;
ASDCP::WriterInfo writer_info;
ASDCP::JP2K::PictureDescriptor picture_descriptor;
};
-struct StereoPictureAssetWriter::ASDCPState
+struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
+{
+ ASDCP::JP2K::MXFWriter mxf_writer;
+};
+
+struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
{
- ASDCPState()
- : frame_buffer (4 * Kumu::Megabyte)
- {}
-
- ASDCP::JP2K::CodestreamParser j2k_parser;
- ASDCP::JP2K::SFrameBuffer frame_buffer;
ASDCP::JP2K::MXFSWriter mxf_writer;
- ASDCP::WriterInfo writer_info;
- ASDCP::JP2K::PictureDescriptor picture_descriptor;
};
/** @param a Asset to write to. `a' must not be deleted while
* this writer class still exists, or bad things will happen.
*/
-MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* asset, bool overwrite, MXFMetadata const & metadata)
- : PictureAssetWriter (overwrite, metadata)
+MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, bool overwrite, bool interop, MXFMetadata const & metadata)
+ : PictureAssetWriter (asset, overwrite, interop, metadata)
, _state (new MonoPictureAssetWriter::ASDCPState)
- , _asset (asset)
{
}
-StereoPictureAssetWriter::StereoPictureAssetWriter (StereoPictureAsset* asset, bool overwrite, MXFMetadata const & metadata)
- : PictureAssetWriter (overwrite, metadata)
+StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool overwrite, bool interop, MXFMetadata const & metadata)
+ : PictureAssetWriter (asset, overwrite, interop, metadata)
, _state (new StereoPictureAssetWriter::ASDCPState)
- , _asset (asset)
+ , _next_eye (EYE_LEFT)
{
}
template <class P, class Q>
-void start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t* data, int size)
+void
libdcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t* data, int size)
{
if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
boost::throw_exception (MiscError ("could not parse J2K frame"));
state->j2k_parser.FillPictureDescriptor (state->picture_descriptor);
state->picture_descriptor.EditRate = ASDCP::Rational (asset->edit_rate(), 1);
- asset->fill_writer_info (&state->writer_info, asset->uuid(), writer->_metadata);
+ asset->fill_writer_info (&state->writer_info, asset->uuid(), writer->_interop, writer->_metadata);
if (ASDCP_FAILURE (state->mxf_writer.OpenWrite (
asset->path().string().c_str(),
void
MonoPictureAssetWriter::start (uint8_t* data, int size)
{
- ::start (this, _state, _asset, data, size);
+ libdcp::start (this, _state, _asset, data, size);
}
void
StereoPictureAssetWriter::start (uint8_t* data, int size)
{
- ::start (this, _state, _asset, data, size);
+ libdcp::start (this, _state, _asset, data, size);
}
-template <class P, class Q>
-FrameInfo write (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t* data, int size)
+FrameInfo
+MonoPictureAssetWriter::write (uint8_t* data, int size)
{
- assert (!writer->_finalized);
+ assert (!_finalized);
- if (!writer->_started) {
- writer->start (data, size);
+ if (!_started) {
+ 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"));
}
- uint64_t const before_offset = state->mxf_writer.Tell ();
+ uint64_t const before_offset = _state->mxf_writer.Tell ();
string hash;
- if (ASDCP_FAILURE (state->mxf_writer.WriteFrame (state->frame_buffer, 0, 0, &hash))) {
- boost::throw_exception (MXFFileError ("error in writing video MXF", asset->path().string()));
+ if (ASDCP_FAILURE (_state->mxf_writer.WriteFrame (_state->frame_buffer, 0, 0, &hash))) {
+ boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string()));
}
- ++asset->_frames_written;
- return FrameInfo (before_offset, state->mxf_writer.Tell() - before_offset, hash);
-}
-
-FrameInfo
-MonoPictureAssetWriter::write (uint8_t* data, int size)
-{
- return ::write (this, _state, _asset, data, size);
+ ++_frames_written;
+ return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
}
+/** Write a frame for one eye. Frames must be written left, then right, then left etc.
+ * @param data JPEG2000 data.
+ * @param size Size of data.
+ */
FrameInfo
StereoPictureAssetWriter::write (uint8_t* data, int size)
{
- return ::write (this, _state, _asset, data, size);
+ assert (!_finalized);
+
+ if (!_started) {
+ start (data, size);
+ }
+
+ if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) {
+ boost::throw_exception (MiscError ("could not parse J2K frame"));
+ }
+
+ uint64_t const before_offset = _state->mxf_writer.Tell ();
+
+ string hash;
+ if (ASDCP_FAILURE (
+ _state->mxf_writer.WriteFrame (
+ _state->frame_buffer,
+ _next_eye == EYE_LEFT ? ASDCP::JP2K::SP_LEFT : ASDCP::JP2K::SP_RIGHT,
+ 0,
+ 0,
+ &hash)
+ )) {
+
+ boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string()));
+ }
+
+ _next_eye = _next_eye == EYE_LEFT ? EYE_RIGHT : EYE_LEFT;
+
+ return FrameInfo (before_offset, _state->mxf_writer.Tell() - before_offset, hash);
}
void
boost::throw_exception (MXFFileError ("error in writing video MXF", _asset->path().string()));
}
+ _next_eye = _next_eye == EYE_LEFT ? EYE_RIGHT : EYE_LEFT;
++_frames_written;
}
}
_finalized = true;
- _asset->set_intrinsic_duration (_frames_written);
- _asset->set_duration (_frames_written);
+ _asset->set_intrinsic_duration (_frames_written / 2);
+ _asset->set_duration (_frames_written / 2);
}
projects / libdcp.git / blobdiff