From 0f416fd215fd656e091a03090317328c418eaf67 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Jan 2014 21:43:32 +0000 Subject: Comment. --- src/picture_asset_writer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h index 68ba086b..a62b20b2 100644 --- a/src/picture_asset_writer.h +++ b/src/picture_asset_writer.h @@ -29,6 +29,7 @@ namespace libdcp { class PictureAsset; +/** Information about a single frame (either a monoscopic frame or a left *or* right eye stereoscopic frame) */ struct FrameInfo { FrameInfo (uint64_t o, uint64_t s, std::string h) -- cgit v1.2.3 From 054cc86d5ba734c72780b07a772a55e3a7000a4f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Jan 2014 00:16:28 +0000 Subject: Fix fake-writing of 3D. --- asdcplib/src/AS_DCP.h | 2 +- asdcplib/src/AS_DCP_JP2K.cpp | 21 +++++++++++++++++++-- src/stereo_picture_asset_writer.cc | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/asdcplib/src/AS_DCP.h b/asdcplib/src/AS_DCP.h index 3edd1f74..eb2ce6e6 100755 --- a/asdcplib/src/AS_DCP.h +++ b/asdcplib/src/AS_DCP.h @@ -1289,7 +1289,7 @@ namespace ASDCP { Result_t WriteFrame(const FrameBuffer&, StereoscopicPhase_t phase, AESEncContext* = 0, HMACContext* = 0, std::string* hash = 0); - Result_t FakeWriteFrame(int size); + Result_t FakeWriteFrame(int size, StereoscopicPhase_t phase); // Closes the MXF file, writing the index and revised header. Returns // RESULT_SPHASE if WriteFrame was called an odd number of times. diff --git a/asdcplib/src/AS_DCP_JP2K.cpp b/asdcplib/src/AS_DCP_JP2K.cpp index 903b2e85..05166d68 100755 --- a/asdcplib/src/AS_DCP_JP2K.cpp +++ b/asdcplib/src/AS_DCP_JP2K.cpp @@ -1197,6 +1197,23 @@ public: return lh__Writer::WriteFrame(FrameBuf, false, Ctx, HMAC, hash); } + Result_t FakeWriteFrame(int size, StereoscopicPhase_t phase) + { + if (m_NextPhase != phase) + { + return RESULT_SPHASE; + } + + if (phase == SP_LEFT) + { + m_NextPhase = SP_RIGHT; + return lh__Writer::FakeWriteFrame(size, true); + } + + m_NextPhase = SP_LEFT; + return lh__Writer::FakeWriteFrame(size, false); + } + // Result_t Finalize() { @@ -1338,12 +1355,12 @@ ASDCP::JP2K::MXFSWriter::WriteFrame(const FrameBuffer& FrameBuf, StereoscopicPha } ASDCP::Result_t -ASDCP::JP2K::MXFSWriter::FakeWriteFrame(int size) +ASDCP::JP2K::MXFSWriter::FakeWriteFrame(int size, StereoscopicPhase_t phase) { if ( m_Writer.empty() ) return RESULT_INIT; - return m_Writer->FakeWriteFrame(size, true); + return m_Writer->FakeWriteFrame(size, phase); } // Closes the MXF file, writing the index and other closing information. diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc index 81ce7fc0..b4b0ad52 100644 --- a/src/stereo_picture_asset_writer.cc +++ b/src/stereo_picture_asset_writer.cc @@ -94,7 +94,7 @@ StereoPictureAssetWriter::fake_write (int size) assert (_started); assert (!_finalized); - Kumu::Result_t r = _state->mxf_writer.FakeWriteFrame (size); + Kumu::Result_t 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", _asset->path().string(), r)); } -- cgit v1.2.3