summaryrefslogtreecommitdiff
path: root/src/h__02_Reader.cpp
diff options
context:
space:
mode:
authorJohn Hurst <jhurst@cinecert.com>2021-05-20 16:52:29 -0700
committerGitHub <noreply@github.com>2021-05-20 16:52:29 -0700
commitface28d822719aa6028ffca21097225c2a94e4ca (patch)
tree9063c8d62dd0309632c69c86d00b77993efae615 /src/h__02_Reader.cpp
parent7db1295803aa777fc9bfe3c0f1b06c75f183102e (diff)
parente5b0a7dbeaaa2b16ea63d7265ed7413f8de2df10 (diff)
Merge pull request #84 from cinecert/mxf_types_constructor
Dictionary reference refactor
Diffstat (limited to 'src/h__02_Reader.cpp')
-rw-r--r--src/h__02_Reader.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp
index e807387..ff4af7c 100644
--- a/src/h__02_Reader.cpp
+++ b/src/h__02_Reader.cpp
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2011-2018, Robert Scheler, Heiko Sparenberg Fraunhofer IIS,
+Copyright (c) 2011-2021, Robert Scheler, Heiko Sparenberg Fraunhofer IIS,
John Hurst
All rights reserved.
@@ -63,9 +63,10 @@ AS_02::default_md_object_init()
//
-AS_02::MXF::AS02IndexReader::AS02IndexReader(const ASDCP::Dictionary*& d) :
- ASDCP::MXF::Partition(d),
- m_Duration(0), m_BytesPerEditUnit(0), m_Dict(d) {}
+AS_02::MXF::AS02IndexReader::AS02IndexReader(const ASDCP::Dictionary* d) :
+ ASDCP::MXF::Partition(d), m_Duration(0), m_BytesPerEditUnit(0) {
+ assert(d);
+}
AS_02::MXF::AS02IndexReader::~AS02IndexReader() {}
@@ -251,6 +252,7 @@ AS_02::MXF::AS02IndexReader::InitFromFile(const Kumu::FileReader& reader, const
ASDCP::Result_t
AS_02::MXF::AS02IndexReader::InitFromBuffer(const byte_t* p, ui32_t l, const ui64_t& body_offset, const ui64_t& essence_container_offset)
{
+ assert(m_Dict);
Result_t result = RESULT_OK;
const byte_t* end_p = p + l;
@@ -393,7 +395,8 @@ AS_02::MXF::AS02IndexReader::Lookup(ui32_t frame_num, ASDCP::MXF::IndexTableSegm
//
-AS_02::h__AS02Reader::h__AS02Reader(const ASDCP::Dictionary& d) : ASDCP::MXF::TrackFileReader<ASDCP::MXF::OP1aHeader, AS_02::MXF::AS02IndexReader>(d) {}
+AS_02::h__AS02Reader::h__AS02Reader(const ASDCP::Dictionary *d) :
+ ASDCP::MXF::TrackFileReader<ASDCP::MXF::OP1aHeader, AS_02::MXF::AS02IndexReader>(d) {}
AS_02::h__AS02Reader::~h__AS02Reader() {}