Basics of fake write seem to work.

4 files changed, 46 insertions, 69 deletions

diff --git a/asdcplib/src/AS_DCP_JP2K.cpp b/asdcplib/src/AS_DCP_JP2K.cpp
index 05f5e005..e67bd8df 100755
--- a/asdcplib/src/AS_DCP_JP2K.cpp
+++ b/asdcplib/src/AS_DCP_JP2K.cpp
@@ -996,8 +996,6 @@ lh__Writer::WriteFrame(const JP2K::FrameBuffer& FrameBuf, bool add_index,
     result = m_State.Goto_RUNNING(); // first time through
  
   ui64_t StreamOffset = m_StreamOffset;
-  cout << "Real write @ " << StreamOffset << " (header is " << m_HeaderSize << ")\n";
-  cout << "\tfile @ " << m_File.Tell() << "\n";
 
   if ( ASDCP_SUCCESS(result) )
     result = WriteEKLVPacket(FrameBuf, m_EssenceUL, Ctx, HMAC, hash);
@@ -1022,8 +1020,6 @@ lh__Writer::FakeWriteFrame(int size, bool add_index)
     result = m_State.Goto_RUNNING();
 
   ui64_t StreamOffset = m_StreamOffset;
-  cout << "Fake write @ " << StreamOffset << " (header is " << m_HeaderSize << ")\n";
-  cout << "\tfile @ " << m_File.Tell() << "\n";
 
   if ( ASDCP_SUCCESS(result) )
     result = FakeWriteEKLVPacket(size);
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 11815761..b6120171 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -44,6 +44,7 @@ using std::max;
 using std::pair;
 using std::make_pair;
 using std::istream;
+using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
@@ -396,28 +397,21 @@ StereoPictureAsset::get_frame (int n) const
 }
 
 shared_ptr<MonoPictureAssetWriter>
-MonoPictureAsset::start_write ()
+MonoPictureAsset::start_write (uint8_t* data, int size, bool overwrite)
 {
 	/* XXX: can't we use a shared_ptr here? */
-	return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, false));
-}
-
-shared_ptr<MonoPictureAssetWriter>
-MonoPictureAsset::start_overwrite ()
-{
-	/* XXX: can't we use a shared_ptr here? */
-	return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, true));
+	return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, data, size, overwrite));
 }
 
 FrameInfo::FrameInfo (istream& s)
 {
-	s >> offset >> length >> hash;
+	s >> offset >> size >> hash;
 }
 
 void
 FrameInfo::write (ostream& s)
 {
-	s << offset << " " << length << " " << hash;
+	s << offset << " " << size << " " << hash;
 }
 
 struct MonoPictureAssetWriter::ASDCPState
@@ -437,36 +431,41 @@ struct MonoPictureAssetWriter::ASDCPState
 /** @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* a)
+MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* a, uint8_t* data, int size, bool overwrite)
 	: _state (new MonoPictureAssetWriter::ASDCPState)
 	, _asset (a)
 	, _frames_written (0)
 	, _finalized (false)
 {
+	if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) {
+		throw MiscError ("could not parse J2K frame");
+	}
 
+	_state->j2k_parser.FillPictureDescriptor (_state->picture_descriptor);
+	_state->picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
+	
+	MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid());
+	
+	if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (
+				   _asset->path().string().c_str(),
+				   _state->writer_info,
+				   _state->picture_descriptor,
+				   16384,
+				   overwrite)
+		    )) {
+		
+		throw MXFFileError ("could not open MXF file for writing", _asset->path().string());
+	}
 }
 
 FrameInfo
 MonoPictureAssetWriter::write (uint8_t* data, int size)
 {
 	assert (!_finalized);
-	
-	if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) {
-		throw MiscError ("could not parse J2K frame");
-	}
 
-	if (_frames_written == 0) {
-		/* This is our first frame; set up the writer */
-		
-		_state->j2k_parser.FillPictureDescriptor (_state->picture_descriptor);
-		_state->picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
-	
-		MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid());
-
-		if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->picture_descriptor, 16384, false))) {
-			throw MXFFileError ("could not open MXF file for writing", _asset->path().string());
-		}
-	}
+ 	if (ASDCP_FAILURE (_state->j2k_parser.OpenReadFrame (data, size, _state->frame_buffer))) {
+ 		throw MiscError ("could not parse J2K frame");
+ 	}
 
 	uint64_t const before_offset = _state->mxf_writer.Tell ();
 
@@ -484,19 +483,6 @@ MonoPictureAssetWriter::fake_write (int size)
 {
 	assert (!_finalized);
 
-	if (_frames_written == 0) {
-		/* This is our first frame; set up the writer */
-		
-		_state->j2k_parser.FillPictureDescriptor (_state->picture_descriptor);
-		_state->picture_descriptor.EditRate = ASDCP::Rational (_asset->edit_rate(), 1);
-	
-		MXFAsset::fill_writer_info (&_state->writer_info, _asset->uuid());
-
-		if (ASDCP_FAILURE (_state->mxf_writer.OpenWrite (_asset->path().string().c_str(), _state->writer_info, _state->picture_descriptor, 16384, true))) {
-			throw MXFFileError ("could not open MXF file for writing", _asset->path().string());
-		}
-	}
-
 	if (ASDCP_FAILURE (_state->mxf_writer.FakeWriteFrame (size))) {
 		throw MiscError ("error in writing video MXF");
 	}
@@ -507,6 +493,8 @@ MonoPictureAssetWriter::fake_write (int size)
 void
 MonoPictureAssetWriter::finalize ()
 {
+	assert (!_finalized);
+	
 	if (ASDCP_FAILURE (_state->mxf_writer.Finalize())) {
 		throw MiscError ("error in finalizing video MXF");
 	}
diff --git a/src/picture_asset.h b/src/picture_asset.h
index 9df85bad..2ec17235 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -84,9 +84,9 @@ class MonoPictureAsset;
 
 struct FrameInfo
 {
-	FrameInfo (uint64_t o, uint64_t l, std::string h)
+	FrameInfo (uint64_t o, uint64_t s, std::string h)
 		: offset (o)
-		, length (l)
+		, size (s)
 		, hash (h)
 	{}
 
@@ -95,7 +95,7 @@ struct FrameInfo
 	void write (std::ostream& s);
 	
 	uint64_t offset;
-	uint64_t length;
+	uint64_t size;
 	std::string hash;
 };
 
@@ -121,7 +121,7 @@ public:
 private:
 	friend class MonoPictureAsset;
 
-	MonoPictureAssetWriter (MonoPictureAsset *, bool);
+	MonoPictureAssetWriter (MonoPictureAsset *, uint8_t *, int, bool);
 
 	/* no copy construction */
 	MonoPictureAssetWriter (MonoPictureAssetWriter const &);
@@ -204,9 +204,7 @@ public:
 	MonoPictureAsset (std::string directory, std::string mxf_name, int fps, Size size);
 
 	/** Start a progressive write to a MonoPictureAsset */
-	boost::shared_ptr<MonoPictureAssetWriter> start_write ();
-
-	boost::shared_ptr<MonoPictureAssetWriter> start_overwrite ();
+	boost::shared_ptr<MonoPictureAssetWriter> start_write (uint8_t *, int, bool);
 
 	boost::shared_ptr<const MonoPictureFrame> get_frame (int n) const;
 	bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
diff --git a/test/tests.cc b/test/tests.cc
index c9243b88..fb0e0430 100644
--- a/test/tests.cc
+++ b/test/tests.cc
@@ -584,15 +584,13 @@ BOOST_AUTO_TEST_CASE (recovery)
 {
 	Kumu::libdcp_test = true;
 
-	cout << "=== recovery.\n";
-
 	string const picture = "test/data/32x32_red_square.j2c";
-	int const length = boost::filesystem::file_size (picture);
-	uint8_t* data = new uint8_t[length];
+	int const size = boost::filesystem::file_size (picture);
+	uint8_t* data = new uint8_t[size];
 	{
 		FILE* f = fopen (picture.c_str(), "rb");
 		BOOST_CHECK (f);
-		fread (data, 1, length, f);
+		fread (data, 1, size, f);
 		fclose (f);
 	}
 
@@ -601,25 +599,22 @@ BOOST_AUTO_TEST_CASE (recovery)
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
 	shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/baz", "video1.mxf", 24, libdcp::Size (32, 32)));
-	shared_ptr<libdcp::MonoPictureAssetWriter> writer = mp->start_write ();
+	shared_ptr<libdcp::MonoPictureAssetWriter> writer = mp->start_write (data, size, false);
 
-	int written_length = 0;
+	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
-		libdcp::FrameInfo info = writer->write (data, length);
-		written_length = info.length;
-		cout << "- written length " << written_length << "\n";
+		libdcp::FrameInfo info = writer->write (data, size);
+		written_size = info.size;
 	}
 
 	writer->finalize ();
 	writer.reset ();
 
-	cout << "=== recovery part 2.\n";
-	
 	boost::filesystem::copy_file ("build/test/baz/video1.mxf", "build/test/baz/video2.mxf");
 	boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
 
 	{
-		FILE* f = fopen ("build/test/baz/video2.mxf", "wa");
+		FILE* f = fopen ("build/test/baz/video2.mxf", "r+");
 		rewind (f);
 		char zeros[256];
 		memset (zeros, 0, 256);
@@ -630,14 +625,14 @@ BOOST_AUTO_TEST_CASE (recovery)
 	Kumu::ResetTestRNG ();
 
 	mp.reset (new libdcp::MonoPictureAsset ("build/test/baz", "video2.mxf", 24, libdcp::Size (32, 32)));
-	writer = mp->start_overwrite ();
+	writer = mp->start_write (data, size, true);
 
 	for (int i = 0; i < 4; ++i) {
-		writer->fake_write (written_length);
+		writer->fake_write (written_size);
 	}
 
-	for (int i = 0; i < 20; ++i) {
-		writer->write (data, length);
+	for (int i = 4; i < 24; ++i) {
+		writer->write (data, size);
 	}
 	
 	writer->finalize ();