From f4061a21fffad4fdf8dbb2f193f0f0960b25421c Mon Sep 17 00:00:00 2001 From: jhurst Date: Mon, 6 Aug 2018 22:07:03 +0000 Subject: o Added support for SMPTE RDD 47 "ISXD Track File" o Added generic support for SMPTE RP 2057 "Text-Based Metadata Carriage in MXF" o Re-factored AS-02 frame-wrap index write to use a common implementation o Re-factored support for SMPTE ST 410 to use a common implementation (affects o AS-DCP and AS-02 timed-text MXF (SMPTE 429-5) o Patched several ambiguous integer casts. o Added new essence type identifiers ESS_AS02_ISXD and ESS_AS02_ACES o Fixed a bug wherein the Generic Container data tarck clip was instead being o written as a DM track o Fixed UL values DCDataDescriptor and ContainerConstraintSubDescriptor to have o a byte 6 value of 0x53 (Tag Set) instead of 0x07 (coding sentinel) o Added UL values 492 - 511 to the dictionary o Added ApplicationSchemes and ConformsToSpecifications to the Preface set o Added default initializer to MXF::LineMapPair o Added sets DescriptiveFramework, DescriptiveObject, TextBasedDMFramework, o TextBasedObject, GenericStreamTextBasedSet and ISXDDataEssenceDescriptor o Added ISXD support and options '-G', '-u' to as-02-wrap o Added ISXD support and option '-g' to as-02-unwrap --- src/h__02_Writer.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/h__02_Writer.cpp') diff --git a/src/h__02_Writer.cpp b/src/h__02_Writer.cpp index 62f21f2..37393ca 100644 --- a/src/h__02_Writer.cpp +++ b/src/h__02_Writer.cpp @@ -57,7 +57,7 @@ AS_02::MXF::AS02IndexWriterVBR::WriteToFile(Kumu::FileWriter& Writer) { assert(m_Dict); ASDCP::FrameBuffer index_body_buffer; - ui32_t index_body_size = m_PacketList->m_List.size() * MaxIndexSegmentSize; // segment-count * max-segment-size + ui32_t index_body_size = (ui32_t)m_PacketList->m_List.size() * MaxIndexSegmentSize; // segment-count * max-segment-size Result_t result = index_body_buffer.Capacity(index_body_size); ui64_t start_position = 0; @@ -140,7 +140,7 @@ AS_02::MXF::AS02IndexWriterVBR::GetDuration() const IndexTableSegment* segment = dynamic_cast(*i); if ( segment != 0 ) { - duration += segment->IndexEntryArray.size(); + duration += (ui32_t)segment->IndexEntryArray.size(); } } @@ -193,9 +193,8 @@ AS_02::h__AS02WriterFrame::WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf,co if ( m_FramesWritten > 1 && ( ( m_FramesWritten + 1 ) % m_PartitionSpace ) == 0 ) { - m_IndexWriter.ThisPartition = m_File.Tell(); - m_IndexWriter.WriteToFile(m_File); - m_RIP.PairArray.push_back(RIP::PartitionPair(0, m_IndexWriter.ThisPartition)); + assert(m_IndexWriter.GetDuration() > 0); + FlushIndexPartition(); UL body_ul(m_Dict->ul(MDD_ClosedCompleteBodyPartition)); Partition body_part(m_Dict); @@ -374,8 +373,6 @@ AS_02::h__AS02WriterClip::FinalizeClip(ui32_t bytes_per_frame) return result; } - - // // end h__02_Writer.cpp // -- cgit v1.2.3