From b14d706a72c706c9c59dbdf64a9e41f32465e060 Mon Sep 17 00:00:00 2001 From: jhurst Date: Tue, 13 Apr 2021 15:50:50 -0700 Subject: o Added a Clone() method to InterchangeObject and derivatives that allows making a descriptor copy that is not owned by any other strucure. The caller must arrange to delete the object pointer returned. o While implementing the above it became obvious that the reference-to-a-pointer-to-the-dictionary idiom that is used throughout the lower levels of the MXF library was the cause of much more grief than it was originally designed to prevent. This was made even more obvious when I replaced all of it with simple pointers, which revealed several shadow instances of m_Dict that were only reliable while the object that held them was valid. --- src/AS_02_PHDR.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/AS_02_PHDR.cpp') diff --git a/src/AS_02_PHDR.cpp b/src/AS_02_PHDR.cpp index 471d226..d08c823 100644 --- a/src/AS_02_PHDR.cpp +++ b/src/AS_02_PHDR.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2011-2018, John Hurst +Copyright (c) 2011-2021, John Hurst All rights reserved. @@ -76,7 +76,7 @@ class AS_02::PHDR::MXFReader::h__Reader : public AS_02::h__AS02Reader ASDCP_NO_COPY_CONSTRUCT(h__Reader); public: - h__Reader(const Dictionary& d) : + h__Reader(const Dictionary *d) : AS_02::h__AS02Reader(d) {} virtual ~h__Reader() {} @@ -235,7 +235,7 @@ AS_02::PHDR::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, AS_02::PHDR::Frame AS_02::PHDR::MXFReader::MXFReader() { - m_Reader = new h__Reader(DefaultCompositeDict()); + m_Reader = new h__Reader(&DefaultCompositeDict()); } @@ -355,7 +355,7 @@ public: byte_t m_EssenceUL[SMPTE_UL_LENGTH]; byte_t m_MetadataUL[SMPTE_UL_LENGTH]; - h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_EssenceSubDescriptor(0), m_MetadataTrackSubDescriptor(0) { + h__Writer(const Dictionary *d) : h__AS02WriterFrame(d), m_EssenceSubDescriptor(0), m_MetadataTrackSubDescriptor(0) { memset(m_EssenceUL, 0, SMPTE_UL_LENGTH); memset(m_MetadataUL, 0, SMPTE_UL_LENGTH); } @@ -735,7 +735,7 @@ AS_02::PHDR::MXFWriter::OpenWrite(const std::string& filename, const ASDCP::Writ return RESULT_PARAM; } - m_Writer = new AS_02::PHDR::MXFWriter::h__Writer(DefaultSMPTEDict()); + m_Writer = new AS_02::PHDR::MXFWriter::h__Writer(&DefaultSMPTEDict()); m_Writer->m_Info = Info; Result_t result = m_Writer->OpenWrite(filename, essence_descriptor, essence_sub_descriptor_list, -- cgit v1.2.3