o Fixed Partiton and Preface version numbers in AS-02 files
[asdcplib.git] / src / AS_DCP_internal.h
index 493fae6efa69e00c78d4818f38609bd6550ab8c6..aaa9e606e09058ada3a0b38307b9d3d9b7db5ce4 100755 (executable)
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2013, John Hurst
+Copyright (c) 2004-2016, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,6 @@ extern MXF::RIP *g_RIP;
 
 namespace ASDCP
 {
-  void default_md_object_init();
 
   //
   static std::vector<int>
@@ -74,14 +73,14 @@ namespace ASDCP
       {
        assert(r >= pstr);
        if ( r > pstr )
-         result.push_back(atoi(pstr));
+         result.push_back(strtol(pstr, 0, 10));
 
        pstr = r + 1;
        r = strchr(pstr, '.');
       }
 
     if( strlen(pstr) > 0 )
-      result.push_back(atoi(pstr));
+      result.push_back(strtol(pstr, 0, 10));
 
     assert(result.size() == 3);
     return result;
@@ -123,19 +122,42 @@ namespace ASDCP
   { 0x43, 0x48, 0x55, 0x4b, 0x43, 0x48, 0x55, 0x4b,
     0x43, 0x48, 0x55, 0x4b, 0x43, 0x48, 0x55, 0x4b };
 
+  // Version of MXF spec to which an MXF file conforms
+  enum MXFVersion
+  {
+    MXFVersion_2004,
+    MXFVersion_2011,
+    MXFVersion_MAX
+  };
+
   //------------------------------------------------------------------------------------------
   //
 
+  ui32_t derive_timecode_rate_from_edit_rate(const ASDCP::Rational& edit_rate);
+
   Result_t MD_to_WriterInfo(MXF::Identification*, WriterInfo&);
   Result_t MD_to_CryptoInfo(MXF::CryptographicContext*, WriterInfo&, const Dictionary&);
+
   Result_t EncryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESEncContext*);
   Result_t DecryptFrameBuffer(const ASDCP::FrameBuffer&, ASDCP::FrameBuffer&, AESDecContext*);
+
+  Result_t MD_to_JP2K_PDesc(const ASDCP::MXF::GenericPictureEssenceDescriptor&  EssenceDescriptor,
+                           const ASDCP::MXF::JPEG2000PictureSubDescriptor& EssenceSubDescriptor,
+                           const ASDCP::Rational& EditRate, const ASDCP::Rational& SampleRate,
+                           ASDCP::JP2K::PictureDescriptor& PDesc);
+
+  Result_t JP2K_PDesc_to_MD(const JP2K::PictureDescriptor& PDesc,
+                           const ASDCP::Dictionary& dict,
+                           ASDCP::MXF::GenericPictureEssenceDescriptor& EssenceDescriptor,
+                           ASDCP::MXF::JPEG2000PictureSubDescriptor& EssenceSubDescriptor);
+
   Result_t PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, ASDCP::MXF::WaveAudioDescriptor* ADescObj);
   Result_t MD_to_PCM_ADesc(ASDCP::MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor& ADesc);
+
   void     AddDMScrypt(Partition& HeaderPart, SourcePackage& Package,
                       WriterInfo& Descr, const UL& WrappingUL, const Dictionary*& Dict);
 
-  Result_t Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict, const MXF::OP1aHeader& HeaderPart,
+  Result_t Read_EKLV_Packet(Kumu::FileReader& File, const ASDCP::Dictionary& Dict,
                            const ASDCP::WriterInfo& Info, Kumu::fpos_t& LastPosition, ASDCP::FrameBuffer& CtFrameBuf,
                            ui32_t FrameNum, ui32_t SequenceNum, ASDCP::FrameBuffer& FrameBuf,
                            const byte_t* EssenceUL, AESDecContext* Ctx, HMACContext* HMAC);
@@ -198,7 +220,7 @@ namespace ASDCP
        const MXF::RIP& GetRIP() const { return m_RIP; }
 
        //
-       Result_t OpenMXFRead(const char* filename)
+       Result_t OpenMXFRead(const std::string& filename)
        {
          m_LastPosition = 0;
          Result_t result = m_File.OpenRead(filename);
@@ -271,7 +293,8 @@ namespace ASDCP
        }
 
        // positions file before reading
-       Result_t ReadEKLVFrame(const ASDCP::MXF::Partition& CurrentPartition,
+       // allows external control of index offset
+       Result_t ReadEKLVFrame(const ui64_t& body_offset,
                               ui32_t FrameNum, ASDCP::FrameBuffer& FrameBuf,
                               const byte_t* EssenceUL, AESDecContext* Ctx, HMACContext* HMAC)
        {
@@ -284,8 +307,8 @@ namespace ASDCP
              return RESULT_RANGE;
            }
 
-         // get frame position and go read the frame's key and length
-         Kumu::fpos_t FilePosition = CurrentPartition.BodyOffset + TmpEntry.StreamOffset;
+         // get relative frame position, apply offset and go read the frame's key and length
+         Kumu::fpos_t FilePosition = body_offset + TmpEntry.StreamOffset;
          Result_t result = RESULT_OK;
 
          if ( FilePosition != m_LastPosition )
@@ -294,7 +317,36 @@ namespace ASDCP
              result = m_File.Seek(FilePosition);
            }
 
-         if( KM_SUCCESS(result) )
+         if ( KM_SUCCESS(result) )
+           result = ReadEKLVPacket(FrameNum, FrameNum + 1, FrameBuf, EssenceUL, Ctx, HMAC);
+
+         return result;
+       }
+
+       // positions file before reading
+       // assumes "processed" index entries have absolute positions
+       Result_t ReadEKLVFrame(ui32_t FrameNum, ASDCP::FrameBuffer& FrameBuf,
+                              const byte_t* EssenceUL, AESDecContext* Ctx, HMACContext* HMAC)
+       {
+         // look up frame index node
+         IndexTableSegment::IndexEntry TmpEntry;
+
+         if ( KM_FAILURE(m_IndexAccess.Lookup(FrameNum, TmpEntry)) )
+           {
+             DefaultLogSink().Error("Frame value out of range: %u\n", FrameNum);
+             return RESULT_RANGE;
+           }
+
+         // get absolute frame position and go read the frame's key and length
+         Result_t result = RESULT_OK;
+
+         if ( TmpEntry.StreamOffset != m_LastPosition )
+           {
+             m_LastPosition = TmpEntry.StreamOffset;
+             result = m_File.Seek(TmpEntry.StreamOffset);
+           }
+
+         if ( KM_SUCCESS(result) )
            result = ReadEKLVPacket(FrameNum, FrameNum + 1, FrameBuf, EssenceUL, Ctx, HMAC);
 
          return result;
@@ -305,12 +357,12 @@ namespace ASDCP
                                const byte_t* EssenceUL, AESDecContext* Ctx, HMACContext* HMAC)
        {
          assert(m_Dict);
-         return Read_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_LastPosition, m_CtFrameBuf,
+         return Read_EKLV_Packet(m_File, *m_Dict, m_Info, m_LastPosition, m_CtFrameBuf,
                                  FrameNum, SequenceNum, FrameBuf, EssenceUL, Ctx, HMAC);
        }
 
        // Get the position of a frame from a track file
-       Result_t LocateFrame(const ASDCP::MXF::Partition& CurrentPartition,
+       Result_t LocateFrame(const ui64_t& body_offset,
                             ui32_t FrameNum, Kumu::fpos_t& streamOffset,
                             i8_t& temporalOffset, i8_t& keyFrameOffset)
        {
@@ -324,7 +376,7 @@ namespace ASDCP
            }
 
          // get frame position, temporal offset, and key frame ofset
-         streamOffset = CurrentPartition.BodyOffset + TmpEntry.StreamOffset;
+         streamOffset = body_offset + TmpEntry.StreamOffset;
          temporalOffset = TmpEntry.TemporalOffset;
          keyFrameOffset = TmpEntry.KeyFrameOffset;
          
@@ -338,8 +390,9 @@ namespace ASDCP
        }
       };
       
-
+      //------------------------------------------------------------------------------------------
       //
+
       //
       template <class ClipT>
        struct TrackSet
@@ -355,13 +408,13 @@ namespace ASDCP
       template <class PackageT, class ClipT>
        TrackSet<ClipT>
        CreateTrackAndSequence(OP1aHeader& Header, PackageT& Package, const std::string TrackName,
-                              const MXF::Rational& EditRate, const UL& Definition, ui32_t TrackID, const Dictionary*& Dict)
+                              const MXF::Rational& clip_edit_rate, const UL& Definition, ui32_t TrackID, const Dictionary*& Dict)
        {
          TrackSet<ClipT> NewTrack;
 
          NewTrack.Track = new Track(Dict);
          Header.AddChildObject(NewTrack.Track);
-         NewTrack.Track->EditRate = EditRate;
+         NewTrack.Track->EditRate = clip_edit_rate;
          Package.Tracks.push_back(NewTrack.Track->InstanceUID);
          NewTrack.Track->TrackID = TrackID;
          NewTrack.Track->TrackName = TrackName.c_str();
@@ -378,17 +431,19 @@ namespace ASDCP
       template <class PackageT>
        TrackSet<TimecodeComponent>
        CreateTimecodeTrack(OP1aHeader& Header, PackageT& Package,
-                           const MXF::Rational& EditRate, ui32_t TCFrameRate, ui64_t TCStart, const Dictionary*& Dict)
+                           const MXF::Rational& tc_edit_rate, ui32_t tc_frame_rate, ui64_t TCStart, const Dictionary*& Dict)
        {
          assert(Dict);
          UL TCUL(Dict->ul(MDD_TimecodeDataDef));
 
-         TrackSet<TimecodeComponent> NewTrack = CreateTrackAndSequence<PackageT, TimecodeComponent>(Header, Package, "Timecode Track", EditRate, TCUL, 1, Dict);
+         TrackSet<TimecodeComponent> NewTrack =
+           CreateTrackAndSequence<PackageT, TimecodeComponent>(Header, Package, "Timecode Track",
+                                                               tc_edit_rate, TCUL, 1, Dict);
 
          NewTrack.Clip = new TimecodeComponent(Dict);
          Header.AddChildObject(NewTrack.Clip);
          NewTrack.Sequence->StructuralComponents.push_back(NewTrack.Clip->InstanceUID);
-         NewTrack.Clip->RoundedTimecodeBase = TCFrameRate;
+         NewTrack.Clip->RoundedTimecodeBase = tc_frame_rate;
          NewTrack.Clip->StartTimecode = TCStart;
          NewTrack.Clip->DataDefinition = TCUL;
 
@@ -403,6 +458,7 @@ namespace ASDCP
        ST_READY,   // ready to write frames
        ST_RUNNING, // one or more frames written
        ST_FINAL,   // index written, file closed
+       ST_MAX
       };
 
       // implementation of h__WriterState class Goto_* methods
@@ -433,7 +489,9 @@ namespace ASDCP
        inline Result_t Goto_FINAL()   { Goto_body(ST_RUNNING, ST_FINAL); }
       };
 
+      //------------------------------------------------------------------------------------------
       //
+
       //
       template <class HeaderType>
        class TrackFileWriter
@@ -447,10 +505,10 @@ namespace ASDCP
        ui32_t             m_HeaderSize;
        HeaderType         m_HeaderPart;
        RIP                m_RIP;
-       ui64_t             m_EssenceStart;
 
        MaterialPackage*   m_MaterialPackage;
        SourcePackage*     m_FilePackage;
+       ContentStorage*    m_ContentStorage;
 
        FileDescriptor*    m_EssenceDescriptor;
        std::list<InterchangeObject*> m_EssenceSubDescriptorList;
@@ -465,22 +523,24 @@ namespace ASDCP
        DurationElementList_t m_DurationUpdateList;
 
       TrackFileWriter(const Dictionary& d) :
-       m_Dict(&d), m_HeaderPart(m_Dict), m_RIP(m_Dict),
-         m_HeaderSize(0), m_EssenceStart(0), m_EssenceDescriptor(0),
-         m_FramesWritten(0), m_StreamOffset(0)
+       m_Dict(&d), m_HeaderSize(0), m_HeaderPart(m_Dict), m_RIP(m_Dict),
+         m_MaterialPackage(0), m_FilePackage(0), m_ContentStorage(0),
+         m_EssenceDescriptor(0), m_FramesWritten(0), m_StreamOffset(0)
          {
            default_md_object_init();
          }
 
-       virtual ~TrackFileWriter() {}
+       virtual ~TrackFileWriter() {
+         Close();
+       }
 
        const MXF::RIP& GetRIP() const { return m_RIP; }
 
-       void InitHeader()
+       void InitHeader(const MXFVersion& mxf_ver)
        {
          assert(m_Dict);
          assert(m_EssenceDescriptor);
-
          m_HeaderPart.m_Primer.ClearTagList();
          m_HeaderPart.m_Preface = new Preface(m_Dict);
          m_HeaderPart.AddChildObject(m_HeaderPart.m_Preface);
@@ -490,6 +550,20 @@ namespace ASDCP
          m_HeaderPart.m_Preface->OperationalPattern = UL(m_Dict->ul(MDD_OP1a));
          m_HeaderPart.OperationalPattern = m_HeaderPart.m_Preface->OperationalPattern;
 
+         if ( mxf_ver == MXFVersion_2004 )
+           {
+             m_HeaderPart.MinorVersion = 2;
+             m_HeaderPart.m_Preface->Version = 258;
+             m_HeaderPart.m_Preface->ObjectModelVersion = 1;
+           }
+         else
+           {
+             assert(mxf_ver == MXFVersion_2011);
+             m_HeaderPart.MinorVersion = 3;
+             m_HeaderPart.m_Preface->Version = 259;
+             m_HeaderPart.m_Preface->ObjectModelVersion = 1;
+           }
+
          // Identification
          Identification* Ident = new Identification(m_Dict);
          m_HeaderPart.AddChildObject(Ident);
@@ -512,18 +586,21 @@ namespace ASDCP
        }
 
        //
-       void AddSourceClip(const MXF::Rational& EditRate, ui32_t TCFrameRate,
+       void AddSourceClip(const MXF::Rational& clip_edit_rate,
+                          const MXF::Rational& tc_edit_rate, ui32_t TCFrameRate,
                           const std::string& TrackName, const UL& EssenceUL,
                           const UL& DataDefinition, const std::string& PackageLabel)
        {
-         //
-         ContentStorage* Storage = new ContentStorage(m_Dict);
-         m_HeaderPart.AddChildObject(Storage);
-         m_HeaderPart.m_Preface->ContentStorage = Storage->InstanceUID;
+         if ( m_ContentStorage == 0 )
+           {
+             m_ContentStorage = new ContentStorage(m_Dict);
+             m_HeaderPart.AddChildObject(m_ContentStorage);
+             m_HeaderPart.m_Preface->ContentStorage = m_ContentStorage->InstanceUID;
+           }
 
          EssenceContainerData* ECD = new EssenceContainerData(m_Dict);
          m_HeaderPart.AddChildObject(ECD);
-         Storage->EssenceContainerData.push_back(ECD->InstanceUID);
+         m_ContentStorage->EssenceContainerData.push_back(ECD->InstanceUID);
          ECD->IndexSID = 129;
          ECD->BodySID = 1;
 
@@ -539,19 +616,23 @@ namespace ASDCP
          m_MaterialPackage->Name = "AS-DCP Material Package";
          m_MaterialPackage->PackageUID = MaterialPackageUMID;
          m_HeaderPart.AddChildObject(m_MaterialPackage);
-         Storage->Packages.push_back(m_MaterialPackage->InstanceUID);
+         m_ContentStorage->Packages.push_back(m_MaterialPackage->InstanceUID);
 
          TrackSet<TimecodeComponent> MPTCTrack =
            CreateTimecodeTrack<MaterialPackage>(m_HeaderPart, *m_MaterialPackage,
-                                                EditRate, TCFrameRate, 0, m_Dict);
-         m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration));
-         m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration));
+                                                tc_edit_rate, TCFrameRate, 0, m_Dict);
+
+         MPTCTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration.get()));
+         MPTCTrack.Clip->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration.get()));
 
          TrackSet<SourceClip> MPTrack =
            CreateTrackAndSequence<MaterialPackage, SourceClip>(m_HeaderPart, *m_MaterialPackage,
-                                                               TrackName, EditRate, DataDefinition,
+                                                               TrackName, clip_edit_rate, DataDefinition,
                                                                2, m_Dict);
-         m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration));
+         MPTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration.get()));
 
          MPTrack.Clip = new SourceClip(m_Dict);
          m_HeaderPart.AddChildObject(MPTrack.Clip);
@@ -559,7 +640,9 @@ namespace ASDCP
          MPTrack.Clip->DataDefinition = DataDefinition;
          MPTrack.Clip->SourcePackageID = SourcePackageUMID;
          MPTrack.Clip->SourceTrackID = 2;
-         m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration));
+
+         MPTrack.Clip->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration.get()));
 
   
          //
@@ -571,19 +654,25 @@ namespace ASDCP
          ECD->LinkedPackageUID = SourcePackageUMID;
 
          m_HeaderPart.AddChildObject(m_FilePackage);
-         Storage->Packages.push_back(m_FilePackage->InstanceUID);
+         m_ContentStorage->Packages.push_back(m_FilePackage->InstanceUID);
 
          TrackSet<TimecodeComponent> FPTCTrack =
            CreateTimecodeTrack<SourcePackage>(m_HeaderPart, *m_FilePackage,
-                                              EditRate, TCFrameRate,
+                                              tc_edit_rate, TCFrameRate,
                                               ui64_C(3600) * TCFrameRate, m_Dict);
-         m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration));
-         m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration));
+
+         FPTCTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration.get()));
+         FPTCTrack.Clip->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration.get()));
+
          TrackSet<SourceClip> FPTrack =
            CreateTrackAndSequence<SourcePackage, SourceClip>(m_HeaderPart, *m_FilePackage,
-                                                             TrackName, EditRate, DataDefinition,
+                                                             TrackName, clip_edit_rate, DataDefinition,
                                                              2, m_Dict);
-         m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration));
+
+         FPTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration.get()));
 
          // Consult ST 379:2004 Sec. 6.3, "Element to track relationship" to see where "12" comes from.
          FPTrack.Track->TrackNumber = KM_i32_BE(Kumu::cp2i<ui32_t>((EssenceUL.Value() + 12)));
@@ -596,24 +685,29 @@ namespace ASDCP
          // for now we do not allow setting this value, so all files will be 'original'
          FPTrack.Clip->SourceTrackID = 0;
          FPTrack.Clip->SourcePackageID = NilUMID;
-         m_DurationUpdateList.push_back(&(FPTrack.Clip->Duration));
+
+         FPTrack.Clip->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTrack.Clip->Duration.get()));
 
          m_EssenceDescriptor->LinkedTrackID = FPTrack.Track->TrackID;
        }
 
        //
-       void AddDMSegment(const MXF::Rational& EditRate, ui32_t TCFrameRate,
+       void AddDMSegment(const MXF::Rational& clip_edit_rate,
+                         const MXF::Rational& tc_edit_rate, ui32_t tc_frame_rate,
                          const std::string& TrackName, const UL& DataDefinition,
                          const std::string& PackageLabel)
        {
-         //
-         ContentStorage* Storage = new ContentStorage(m_Dict);
-         m_HeaderPart.AddChildObject(Storage);
-         m_HeaderPart.m_Preface->ContentStorage = Storage->InstanceUID;
+         if ( m_ContentStorage == 0 )
+           {
+             m_ContentStorage = new ContentStorage(m_Dict);
+             m_HeaderPart.AddChildObject(m_ContentStorage);
+             m_HeaderPart.m_Preface->ContentStorage = m_ContentStorage->InstanceUID;
+           }
 
          EssenceContainerData* ECD = new EssenceContainerData(m_Dict);
          m_HeaderPart.AddChildObject(ECD);
-         Storage->EssenceContainerData.push_back(ECD->InstanceUID);
+         m_ContentStorage->EssenceContainerData.push_back(ECD->InstanceUID);
          ECD->IndexSID = 129;
          ECD->BodySID = 1;
 
@@ -629,19 +723,23 @@ namespace ASDCP
          m_MaterialPackage->Name = "AS-DCP Material Package";
          m_MaterialPackage->PackageUID = MaterialPackageUMID;
          m_HeaderPart.AddChildObject(m_MaterialPackage);
-         Storage->Packages.push_back(m_MaterialPackage->InstanceUID);
+         m_ContentStorage->Packages.push_back(m_MaterialPackage->InstanceUID);
 
          TrackSet<TimecodeComponent> MPTCTrack =
            CreateTimecodeTrack<MaterialPackage>(m_HeaderPart, *m_MaterialPackage,
-                                                EditRate, TCFrameRate, 0, m_Dict);
-         m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration));
-         m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration));
+                                                tc_edit_rate, tc_frame_rate, 0, m_Dict);
+
+         MPTCTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTCTrack.Sequence->Duration.get()));
+         MPTCTrack.Clip->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTCTrack.Clip->Duration.get()));
 
          TrackSet<DMSegment> MPTrack =
            CreateTrackAndSequence<MaterialPackage, DMSegment>(m_HeaderPart, *m_MaterialPackage,
-                                                              TrackName, EditRate, DataDefinition,
+                                                              TrackName, clip_edit_rate, DataDefinition,
                                                               2, m_Dict);
-         m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration));
+         MPTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(MPTrack.Sequence->Duration.get()));
 
          MPTrack.Clip = new DMSegment(m_Dict);
          m_HeaderPart.AddChildObject(MPTrack.Clip);
@@ -649,6 +747,7 @@ namespace ASDCP
          MPTrack.Clip->DataDefinition = DataDefinition;
          //  MPTrack.Clip->SourcePackageID = SourcePackageUMID;
          //  MPTrack.Clip->SourceTrackID = 2;
+
          m_DurationUpdateList.push_back(&(MPTrack.Clip->Duration));
 
   
@@ -661,28 +760,34 @@ namespace ASDCP
          ECD->LinkedPackageUID = SourcePackageUMID;
 
          m_HeaderPart.AddChildObject(m_FilePackage);
-         Storage->Packages.push_back(m_FilePackage->InstanceUID);
+         m_ContentStorage->Packages.push_back(m_FilePackage->InstanceUID);
 
          TrackSet<TimecodeComponent> FPTCTrack =
            CreateTimecodeTrack<SourcePackage>(m_HeaderPart, *m_FilePackage,
-                                              EditRate, TCFrameRate,
-                                              ui64_C(3600) * TCFrameRate, m_Dict);
-         m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration));
-         m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration));
+                                              clip_edit_rate, tc_frame_rate,
+                                              ui64_C(3600) * tc_frame_rate, m_Dict);
+
+         FPTCTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTCTrack.Sequence->Duration.get()));
+         FPTCTrack.Clip->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTCTrack.Clip->Duration.get()));
 
          TrackSet<DMSegment> FPTrack =
            CreateTrackAndSequence<SourcePackage, DMSegment>(m_HeaderPart, *m_FilePackage,
-                                                            TrackName, EditRate, DataDefinition,
+                                                            TrackName, clip_edit_rate, DataDefinition,
                                                             2, m_Dict);
-         m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration));
+
+         FPTrack.Sequence->Duration.set_has_value();
+         m_DurationUpdateList.push_back(&(FPTrack.Sequence->Duration.get()));
 
          FPTrack.Clip = new DMSegment(m_Dict);
          m_HeaderPart.AddChildObject(FPTrack.Clip);
          FPTrack.Sequence->StructuralComponents.push_back(FPTrack.Clip->InstanceUID);
          FPTrack.Clip->DataDefinition = DataDefinition;
-         FPTrack.Clip->EventComment = "D-Cinema Timed Text";
+         FPTrack.Clip->EventComment = "ST 429-5 Timed Text";
 
          m_DurationUpdateList.push_back(&(FPTrack.Clip->Duration));
+
          m_EssenceDescriptor->LinkedTrackID = FPTrack.Track->TrackID;
        }
 
@@ -708,6 +813,7 @@ namespace ASDCP
              m_HeaderPart.EssenceContainers.push_back(CryptEssenceUL);
              m_HeaderPart.m_Preface->DMSchemes.push_back(UL(m_Dict->ul(MDD_CryptographicFrameworkLabel)));
              AddDMScrypt(m_HeaderPart, *m_FilePackage, m_Info, WrappingUL, m_Dict);
+             //// TODO: fix DMSegment Duration value
            }
          else
            {
@@ -724,13 +830,6 @@ namespace ASDCP
          m_FilePackage->Descriptor = m_EssenceDescriptor->InstanceUID;
        }
 
-       //      
-       Result_t WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf,const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext* HMAC)
-       {
-         return Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
-                                  m_StreamOffset, FrameBuf, EssenceUL, Ctx, HMAC);
-       }
-
        //
        void Close()
        {
@@ -741,6 +840,9 @@ namespace ASDCP
       
   }/// namespace MXF
 
+  //------------------------------------------------------------------------------------------
+  //
+
   //
   class h__ASDCPReader : public MXF::TrackFileReader<OP1aHeader, OPAtomIndexFooter>
     {
@@ -753,7 +855,7 @@ namespace ASDCP
       h__ASDCPReader(const Dictionary&);
       virtual ~h__ASDCPReader();
 
-      Result_t OpenMXFRead(const char* filename);
+      Result_t OpenMXFRead(const std::string& filename);
       Result_t ReadEKLVFrame(ui32_t FrameNum, ASDCP::FrameBuffer& FrameBuf,
                             const byte_t* EssenceUL, AESDecContext* Ctx, HMACContext* HMAC);
       Result_t LocateFrame(ui32_t FrameNum, Kumu::fpos_t& streamOffset,
@@ -773,14 +875,15 @@ namespace ASDCP
       h__ASDCPWriter(const Dictionary&);
       virtual ~h__ASDCPWriter();
 
-      Result_t CreateBodyPart(const MXF::Rational& EditRate, ui32_t BytesPerEditUnit = 0);
-
       // all the above for a single source clip
       Result_t WriteASDCPHeader(const std::string& PackageLabel, const UL& WrappingUL,
                                const std::string& TrackName, const UL& EssenceUL,
                                const UL& DataDefinition, const MXF::Rational& EditRate,
                                ui32_t TCFrameRate, ui32_t BytesPerEditUnit = 0);
 
+      Result_t CreateBodyPart(const MXF::Rational& EditRate, ui32_t BytesPerEditUnit = 0);
+      Result_t WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf,const byte_t* EssenceUL,
+                              AESEncContext* Ctx, HMACContext* HMAC);
       Result_t WriteASDCPFooter();
     };