From ac29693ab6af42c1babba8a3b5c359c7c1726e3c Mon Sep 17 00:00:00 2001 From: Arnaud Bienner Date: Wed, 18 Dec 2019 14:37:41 +0100 Subject: Fix Object ref not being written: this prevented GenericStreamTextBasedSet to be correctly linked to TextBasedDMFramework --- src/MXF.h | 2 +- src/h__Writer.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/MXF.h b/src/MXF.h index b8d1193..d730b8c 100755 --- a/src/MXF.h +++ b/src/MXF.h @@ -253,7 +253,7 @@ namespace ASDCP } bool operator==(const PropertyType& rhs) const { return this->m_property == rhs; } bool operator==(const optional_property& rhs) const { return this->m_property == rhs.m_property; } - operator PropertyType&() { return this->m_property; } + operator const PropertyType&() const { return this->m_property; } void set(const PropertyType& rhs) { this->m_property = rhs; this->m_has_value = true; } void set_has_value(bool has_value = true) { this->m_has_value = has_value; } void reset(const PropertyType& rhs) { this->m_has_value = false; } diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp index 71e9ce6..fc7f060 100755 --- a/src/h__Writer.cpp +++ b/src/h__Writer.cpp @@ -180,7 +180,8 @@ ASDCP::AddDmsTrackGenericPartUtf8Text(Kumu::FileWriter& file_writer, MXF::OP1aHe assert(dmf_obj); header_part.AddChildObject(dmf_obj); Segment->DMFramework = dmf_obj->InstanceUID; - GenRandomValue(dmf_obj->ObjectRef); + GenRandomValue(dmf_obj->ObjectRef.get()); + dmf_obj->ObjectRef.set_has_value(); // Create a new SID on the RIP, located at the current file position ui32_t max_sid = 0; -- cgit v1.2.3 From 0e18995c6a3eab16ddb428d6e5f734e88ae7c131 Mon Sep 17 00:00:00 2001 From: Arnaud Bienner Date: Fri, 3 Jan 2020 18:23:23 +0100 Subject: Fix typo. I believe this actually references SMPTE RP 2057 "Text-Based Metadata Carriage in MXF" (implemented as part of commit f4061a21fffad4fdf8dbb2f193f0f0960b25421c). --- src/AS_02.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/AS_02.h b/src/AS_02.h index 502a236..61a2c1e 100644 --- a/src/AS_02.h +++ b/src/AS_02.h @@ -530,7 +530,7 @@ namespace AS_02 // error occurs. Result_t WriteFrame(const ASDCP::FrameBuffer&, ASDCP::AESEncContext* = 0, ASDCP::HMACContext* = 0); - // Writes an XML text document to the MXF file as per RP 2067. If the + // Writes an XML text document to the MXF file as per RP 2057. If the // optional AESEncContext argument is present, the document is encrypted // prior to writing. Fails if the file is not open, is finalized, or an // operating system error occurs. -- cgit v1.2.3