From f758bec505d45084d2563f20514ab4a81b27283a Mon Sep 17 00:00:00 2001 From: jhurst Date: Fri, 9 Oct 2015 23:41:11 +0000 Subject: o General review of Batch/Array distinction throughout the project o Fixed a bug that caused incorrect failure when parsing JPEG 2000 codestreams having fewer than five decomposition levels. o Fixed missing UUID generation in some instances of the MCALinkID property o Added -w option to asdcp-wrap to support use of WTF label with MCA --- src/h__Writer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/h__Writer.cpp') diff --git a/src/h__Writer.cpp b/src/h__Writer.cpp index b407ce6..07d418f 100755 --- a/src/h__Writer.cpp +++ b/src/h__Writer.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004-2013, John Hurst +Copyright (c) 2004-2015, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -106,7 +106,7 @@ ASDCP::h__ASDCPWriter::CreateBodyPart(const MXF::Rational& EditRate, ui32_t Byte m_BodyPart.BodySID = 1; UL OPAtomUL(m_Dict->ul(MDD_OPAtom)); m_BodyPart.OperationalPattern = OPAtomUL; - m_RIP.PairArray.push_back(RIP::Pair(1, m_BodyPart.ThisPartition)); // Second RIP Entry + m_RIP.PairArray.push_back(RIP::PartitionPair(1, m_BodyPart.ThisPartition)); // Second RIP Entry UL BodyUL(m_Dict->ul(MDD_ClosedCompleteBodyPartition)); result = m_BodyPart.WriteToFile(m_File, BodyUL); @@ -146,11 +146,11 @@ ASDCP::h__ASDCPWriter::WriteASDCPHeader(const std::string& PackageLabel, const U // First RIP Entry if ( m_Info.LabelSetType == LS_MXF_SMPTE ) // ERK { - m_RIP.PairArray.push_back(RIP::Pair(0, 0)); // 3-part, no essence in header + m_RIP.PairArray.push_back(RIP::PartitionPair(0, 0)); // 3-part, no essence in header } else { - m_RIP.PairArray.push_back(RIP::Pair(1, 0)); // 2-part, essence in header + m_RIP.PairArray.push_back(RIP::PartitionPair(1, 0)); // 2-part, essence in header } // timecode rate and essence rate are the same @@ -191,7 +191,7 @@ ASDCP::h__ASDCPWriter::WriteASDCPFooter() m_FooterPart.PreviousPartition = m_RIP.PairArray.back().ByteOffset; Kumu::fpos_t here = m_File.Tell(); - m_RIP.PairArray.push_back(RIP::Pair(0, here)); // Last RIP Entry + m_RIP.PairArray.push_back(RIP::PartitionPair(0, here)); // Last RIP Entry m_HeaderPart.FooterPartition = here; assert(m_Dict); -- cgit v1.2.3