Merge pull request #9 from dcbullock/master

[asdcplib.git] / src / AS_02_TimedText.cpp

diff --git a/src/AS_02_TimedText.cpp b/src/AS_02_TimedText.cpp
index 4965859978234bcd0ebeeb06e8793f70b48485df..68683954959b463dfd5139588409eff2a752a8a2 100644 (file)
--- a/src/AS_02_TimedText.cpp
+++ b/src/AS_02_TimedText.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008-2016, John Hurst
+Copyright (c) 2008-2018, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -186,7 +186,7 @@ AS_02::TimedText::MXFReader::h__Reader::ReadTimedTextResource(ASDCP::TimedText::
 //
 ASDCP::Result_t
 AS_02::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const Kumu::UUID& uuid,
-                                                             ASDCP::TimedText::FrameBuffer& FrameBuf,
+                                                             ASDCP::TimedText::FrameBuffer& frame_buf,
                                                              AESDecContext* Ctx, HMACContext* HMAC)
 {
   ResourceMap_t::const_iterator ri = m_ResourceMap.find(uuid);
@@ -197,70 +197,23 @@ AS_02::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const Kumu::UUID&
       return RESULT_RANGE;
     }
 
-  TimedTextResourceSubDescriptor* DescObject = 0;
   // get the subdescriptor
   InterchangeObject* tmp_iobj = 0;
   Result_t result = m_HeaderPart.GetMDObjectByID((*ri).second, &tmp_iobj);
-  DescObject = static_cast<TimedTextResourceSubDescriptor*>(tmp_iobj);
+  TimedTextResourceSubDescriptor* desc_object = dynamic_cast<TimedTextResourceSubDescriptor*>(tmp_iobj);
 
   if ( KM_SUCCESS(result) )
     {
-      RIP::const_pair_iterator pi;
-      RIP::PartitionPair TmpPair;
-      ui32_t sequence = 0;
-
-      // Look up the partition start in the RIP using the SID.
-      // Count the sequence length in because this is the sequence
-      // value needed to  complete the HMAC.
-      for ( pi = m_RIP.PairArray.begin(); pi != m_RIP.PairArray.end(); ++pi, ++sequence )
-       {
-         if ( (*pi).BodySID == DescObject->EssenceStreamID )
-           {
-             TmpPair = *pi;
-             break;
-           }
-       }
-
-      if ( TmpPair.ByteOffset == 0 )
-       {
-         DefaultLogSink().Error("Body SID not found in RIP set: %d\n", DescObject->EssenceStreamID);
-         return RESULT_FORMAT;
-       }
-
-      if ( KM_SUCCESS(result) )
-       {
-         FrameBuf.AssetID(uuid.Value());
-         FrameBuf.MIMEType(DescObject->MIMEMediaType);
-
-         // seek tp the start of the partition
-         if ( (Kumu::fpos_t)TmpPair.ByteOffset != m_LastPosition )
-           {
-             m_LastPosition = TmpPair.ByteOffset;
-             result = m_File.Seek(TmpPair.ByteOffset);
-           }
-
-         // read the partition header
-         ASDCP::MXF::Partition GSPart(m_Dict);
-         result = GSPart.InitFromFile(m_File);
-
-         if( ASDCP_SUCCESS(result) )
-           {
-             // check the SID
-             if ( DescObject->EssenceStreamID != GSPart.BodySID )
-               {
-                 char buf[64];
-                 DefaultLogSink().Error("Generic stream partition body differs: %s\n", uuid.EncodeHex(buf, 64));
-                 return RESULT_FORMAT;
-               }
-
-             // read the essence packet
-             assert(m_Dict);
-             if( ASDCP_SUCCESS(result) )
-               result = ReadEKLVPacket(0, sequence, FrameBuf, m_Dict->ul(MDD_GenericStream_DataElement), Ctx, HMAC);
-           }
-       }
+      assert(desc_object);
+      result = ReadGenericStreamPartitionPayload(desc_object->EssenceStreamID, frame_buf, Ctx, HMAC);
     }
 
+  if ( KM_SUCCESS(result) )
+    {
+      frame_buf.AssetID(uuid.Value());
+      frame_buf.MIMEType(desc_object->MIMEMediaType);
+    }
+  
   return result;
 }
 
@@ -570,7 +523,7 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteTimedTextResource(const std::string
       index_entry.StreamOffset = m_StreamOffset;
       
       result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
-                                m_StreamOffset, FrameBuf, m_EssenceUL, Ctx, HMAC);
+                                m_StreamOffset, FrameBuf, m_EssenceUL, MXF_BER_LENGTH, Ctx, HMAC);
     }
 
   if ( KM_SUCCESS(result) )
@@ -602,6 +555,8 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteTimedTextResource(const std::string
       assert(m_Dict);
 
       ASDCP::MXF::Partition partition(m_Dict);
+      partition.MajorVersion = m_HeaderPart.MajorVersion;
+      partition.MinorVersion = m_HeaderPart.MinorVersion;
       partition.ThisPartition = here;
       partition.BodySID = 0;
       partition.IndexSID = 129;
@@ -650,6 +605,8 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteAncillaryResource(const ASDCP::Time
   static UL GenericStream_DataElement(m_Dict->ul(MDD_GenericStream_DataElement));
   ASDCP::MXF::Partition GSPart(m_Dict);
 
+  GSPart.MajorVersion = m_HeaderPart.MajorVersion;
+  GSPart.MinorVersion = m_HeaderPart.MinorVersion;
   GSPart.ThisPartition = here;
   GSPart.PreviousPartition = m_RIP.PairArray.back().ByteOffset;
   GSPart.BodySID = m_EssenceStreamID;
@@ -663,7 +620,8 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteAncillaryResource(const ASDCP::Time
   if ( KM_SUCCESS(result) )
     {
       result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
-                                m_StreamOffset, FrameBuf, GenericStream_DataElement.Value(), Ctx, HMAC);
+                                m_StreamOffset, FrameBuf, GenericStream_DataElement.Value(),
+                                MXF_BER_LENGTH, Ctx, HMAC);
     }
 
   m_FramesWritten++;