From 2489080f9a5d2891da0fc313b2c0ac1450a630ad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 18 Jan 2013 20:25:02 +0000 Subject: [PATCH] Allow incremental writing of picture MXFs. --- asdcplib/src/AS_DCP.h | 2 + asdcplib/src/JP2K_Codestream_Parser.cpp | 29 +++++++++ src/asset.h | 5 +- src/mxf_asset.cc | 4 +- src/mxf_asset.h | 13 ++++- src/picture_asset.cc | 78 ++++++++++++++++++++++--- src/picture_asset.h | 37 +++++++++++- src/sound_asset.cc | 2 +- 8 files changed, 153 insertions(+), 17 deletions(-) diff --git a/asdcplib/src/AS_DCP.h b/asdcplib/src/AS_DCP.h index b227c063..3d679413 100755 --- a/asdcplib/src/AS_DCP.h +++ b/asdcplib/src/AS_DCP.h @@ -1090,6 +1090,8 @@ namespace ASDCP { // encrypted headers. Result_t OpenReadFrame(const char* filename, FrameBuffer&) const; + Result_t OpenReadFrame(const unsigned char * data, unsigned int size, FrameBuffer&) const; + // Fill a PictureDescriptor struct with the values from the file's codestream. // Returns RESULT_INIT if the file is not open. Result_t FillPictureDescriptor(PictureDescriptor&) const; diff --git a/asdcplib/src/JP2K_Codestream_Parser.cpp b/asdcplib/src/JP2K_Codestream_Parser.cpp index c7891231..5ab7a322 100755 --- a/asdcplib/src/JP2K_Codestream_Parser.cpp +++ b/asdcplib/src/JP2K_Codestream_Parser.cpp @@ -91,6 +91,26 @@ public: return result; } + + Result_t OpenReadFrame(const unsigned char * data, unsigned int size, FrameBuffer& FB) + { + if ( FB.Capacity() < size ) + { + DefaultLogSink().Error("FrameBuf.Capacity: %u frame length: %u\n", FB.Capacity(), (ui32_t) size); + return RESULT_SMALLBUF; + } + + memcpy (FB.Data(), data, size); + FB.Size(size); + + byte_t start_of_data = 0; // out param + const Result_t result = ParseMetadataIntoDesc(FB, m_PDesc, &start_of_data); + + if ( ASDCP_SUCCESS(result) ) + FB.PlaintextOffset(start_of_data); + + return result; + } }; ASDCP::Result_t @@ -224,6 +244,15 @@ ASDCP::JP2K::CodestreamParser::OpenReadFrame(const char* filename, FrameBuffer& return m_Parser->OpenReadFrame(filename, FB); } +// Opens the stream for reading, parses enough data to provide a complete +// set of stream metadata for the MXFWriter below. +ASDCP::Result_t +ASDCP::JP2K::CodestreamParser::OpenReadFrame(const unsigned char* data, unsigned int size, FrameBuffer& FB) const +{ + const_cast(this)->m_Parser = new h__CodestreamParser; + return m_Parser->OpenReadFrame(data, size, FB); +} + // ASDCP::Result_t ASDCP::JP2K::CodestreamParser::FillPictureDescriptor(PictureDescriptor& PDesc) const diff --git a/src/asset.h b/src/asset.h index cc6fbcb7..3ba0a0cf 100644 --- a/src/asset.h +++ b/src/asset.h @@ -70,14 +70,13 @@ public: return _uuid; } + boost::filesystem::path path () const; + virtual bool equals (boost::shared_ptr other, EqualityOptions opt, std::list& notes) const = 0; protected: - friend class PictureAsset; - friend class SoundAsset; std::string digest () const; - boost::filesystem::path path () const; /** Directory that our MXF or XML file is in */ std::string _directory; diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc index 77e4b098..af3c74dc 100644 --- a/src/mxf_asset.cc +++ b/src/mxf_asset.cc @@ -60,7 +60,7 @@ MXFAsset::set_duration (int d) } void -MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info) const +MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info, string uuid) { writer_info->ProductVersion = Metadata::instance()->product_version; writer_info->CompanyName = Metadata::instance()->company_name; @@ -68,7 +68,7 @@ MXFAsset::fill_writer_info (ASDCP::WriterInfo* writer_info) const writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE; unsigned int c; - Kumu::hex2bin (_uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c); + Kumu::hex2bin (uuid.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c); assert (c == Kumu::UUID_Length); } diff --git a/src/mxf_asset.h b/src/mxf_asset.h index 95261353..fd786cc6 100644 --- a/src/mxf_asset.h +++ b/src/mxf_asset.h @@ -45,12 +45,21 @@ public: virtual bool equals (boost::shared_ptr other, EqualityOptions opt, std::list& notes) const; int intrinsic_duration () const; + int frames_per_second () const { + return _fps; + } + + void set_intrinsic_duration (int d) { + _intrinsic_duration = d; + } -protected: /** Fill in a ADSCP::WriteInfo struct. * @param w struct to fill in. + * @param uuid uuid to use. */ - void fill_writer_info (ASDCP::WriterInfo* w) const; + static void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid); + +protected: /** Signal to emit to report progress */ boost::signals2::signal* _progress; diff --git a/src/picture_asset.cc b/src/picture_asset.cc index 3058c13d..f3d52396 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -46,8 +46,9 @@ using boost::dynamic_pointer_cast; using boost::lexical_cast; using namespace libdcp; -PictureAsset::PictureAsset (string directory, string mxf_name, boost::signals2::signal* progress, int fps, int intrinsic_duration) +PictureAsset::PictureAsset (string directory, string mxf_name, boost::signals2::signal* progress, int fps, int intrinsic_duration, Size size) : MXFAsset (directory, mxf_name, progress, fps, intrinsic_duration) + , _size (size) { } @@ -136,9 +137,8 @@ MonoPictureAsset::MonoPictureAsset ( int fps, int intrinsic_duration, Size size) - : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration) + : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size) { - _size = size; construct (get_path); } @@ -150,14 +150,19 @@ MonoPictureAsset::MonoPictureAsset ( int fps, int intrinsic_duration, Size size) - : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration) + : PictureAsset (directory, mxf_name, progress, fps, intrinsic_duration, size) { - _size = size; construct (boost::bind (&MonoPictureAsset::path_from_list, this, _1, files)); } +MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, Size size) + : PictureAsset (directory, mxf_name, 0, fps, 0, size) +{ + +} + MonoPictureAsset::MonoPictureAsset (string directory, string mxf_name, int fps, int intrinsic_duration) - : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration) + : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration, Size (0, 0)) { ASDCP::JP2K::MXFReader reader; if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) { @@ -187,7 +192,7 @@ MonoPictureAsset::construct (boost::function get_path) picture_desc.EditRate = ASDCP::Rational (_fps, 1); ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info); + fill_writer_info (&writer_info, _uuid); ASDCP::JP2K::MXFWriter mxf_writer; if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, picture_desc))) { @@ -357,7 +362,7 @@ PictureAsset::frame_buffer_equals ( StereoPictureAsset::StereoPictureAsset (string directory, string mxf_name, int fps, int intrinsic_duration) - : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration) + : PictureAsset (directory, mxf_name, 0, fps, intrinsic_duration, Size (0, 0)) { ASDCP::JP2K::MXFSReader reader; if (ASDCP_FAILURE (reader.OpenRead (path().string().c_str()))) { @@ -378,3 +383,60 @@ StereoPictureAsset::get_frame (int n) const { return shared_ptr (new StereoPictureFrame (path().string(), n + _entry_point)); } + +shared_ptr +MonoPictureAsset::start_write () +{ + /* XXX: can't we use a shared_ptr here? */ + return shared_ptr (new MonoPictureAssetWriter (this)); +} + +MonoPictureAssetWriter::MonoPictureAssetWriter (MonoPictureAsset* a) + : _frame_buffer (4 * Kumu::Megabyte) + , _asset (a) + , _frames_written (0) + , _finalized (false) +{ + +} + +void +MonoPictureAssetWriter::write (uint8_t* data, int size) +{ + if (ASDCP_FAILURE (_j2k_parser.OpenReadFrame (data, size, _frame_buffer))) { + throw MiscError ("could not parse J2K frame"); + } + + if (_frames_written == 0) { + _j2k_parser.FillPictureDescriptor (_picture_descriptor); + _picture_descriptor.EditRate = ASDCP::Rational (_asset->frames_per_second(), 1); + + MXFAsset::fill_writer_info (&_writer_info, _asset->uuid()); + + if (ASDCP_FAILURE (_mxf_writer.OpenWrite (_asset->path().c_str(), _writer_info, _picture_descriptor))) { + throw MXFFileError ("could not open MXF file for writing", _asset->path().string()); + } + } + + if (ASDCP_FAILURE (_mxf_writer.WriteFrame (_frame_buffer, 0, 0))) { + throw MiscError ("error in writing video MXF"); + } + + _frames_written++; +} + +void +MonoPictureAssetWriter::finalize () +{ + if (ASDCP_FAILURE (_mxf_writer.Finalize())) { + throw MiscError ("error in finalizing video MXF"); + } + + _finalized = true; + _asset->set_intrinsic_duration (_frames_written); +} + +MonoPictureAssetWriter::~MonoPictureAssetWriter () +{ + assert (_finalized); +} diff --git a/src/picture_asset.h b/src/picture_asset.h index d2c6f656..059e5926 100644 --- a/src/picture_asset.h +++ b/src/picture_asset.h @@ -22,6 +22,7 @@ */ #include +#include "AS_DCP.h" #include "mxf_asset.h" #include "util.h" @@ -35,7 +36,7 @@ class StereoPictureFrame; class PictureAsset : public MXFAsset { public: - PictureAsset (std::string directory, std::string mxf_name, boost::signals2::signal* progress, int fps, int intrinsic_duration); + PictureAsset (std::string directory, std::string mxf_name, boost::signals2::signal* progress, int fps, int intrinsic_duration, Size size); /** Write details of this asset to a CPL stream. * @param s Stream. @@ -59,6 +60,31 @@ protected: Size _size; }; +class MonoPictureAsset; + +class MonoPictureAssetWriter +{ +public: + ~MonoPictureAssetWriter (); + + void write (uint8_t* data, int size); + void finalize (); + +private: + friend class MonoPictureAsset; + + MonoPictureAssetWriter (MonoPictureAsset *); + + ASDCP::JP2K::CodestreamParser _j2k_parser; + ASDCP::JP2K::FrameBuffer _frame_buffer; + ASDCP::JP2K::MXFWriter _mxf_writer; + ASDCP::WriterInfo _writer_info; + ASDCP::JP2K::PictureDescriptor _picture_descriptor; + MonoPictureAsset* _asset; + int _frames_written; + bool _finalized; +}; + /** A 2D (monoscopic) picture asset */ class MonoPictureAsset : public PictureAsset { @@ -103,6 +129,15 @@ public: Size size ); + MonoPictureAsset ( + std::string directory, + std::string mxf_name, + int fps, + Size size + ); + + boost::shared_ptr start_write (); + MonoPictureAsset (std::string directory, std::string mxf_name, int fps, int intrinsic_duration); boost::shared_ptr get_frame (int n) const; diff --git a/src/sound_asset.cc b/src/sound_asset.cc index be77739a..04ca88da 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -157,7 +157,7 @@ SoundAsset::construct (boost::function get_path) frame_buffer.Size (ASDCP::PCM::CalcFrameBufferSize (audio_desc)); ASDCP::WriterInfo writer_info; - fill_writer_info (&writer_info); + fill_writer_info (&writer_info, _uuid); ASDCP::PCM::MXFWriter mxf_writer; if (ASDCP_FAILURE (mxf_writer.OpenWrite (path().string().c_str(), writer_info, audio_desc))) { -- 2.30.2