From 1d4a906682d19207b0885d90f25fe3e5fd9bb844 Mon Sep 17 00:00:00 2001
From: jelkins <jelkins@cinecert.com>
Date: Thu, 8 Oct 2020 17:29:11 -0700
Subject: check values for ContainerDuration.

---
 src/AS_DCP_PCM.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/AS_DCP_PCM.cpp')

diff --git a/src/AS_DCP_PCM.cpp b/src/AS_DCP_PCM.cpp
index de8dbc0..6241d15 100755
--- a/src/AS_DCP_PCM.cpp
+++ b/src/AS_DCP_PCM.cpp
@@ -51,12 +51,8 @@ ASDCP::PCM_ADesc_to_MD(PCM::AudioDescriptor& ADesc, MXF::WaveAudioDescriptor* AD
   ADescObj->QuantizationBits = ADesc.QuantizationBits;
   ADescObj->BlockAlign = ADesc.BlockAlign;
   ADescObj->AvgBps = ADesc.AvgBps;
-  if ( ! ADesc.LinkedTrackID.empty() )
-    {
-      ADescObj->LinkedTrackID = ADesc.LinkedTrackID;
-    }
+  ADescObj->LinkedTrackID = ADesc.LinkedTrackID;
   ADescObj->ContainerDuration = ADesc.ContainerDuration;
-
   ADescObj->ChannelAssignment.get().Reset();
 
   switch ( ADesc.ChannelFormat )
@@ -101,13 +97,15 @@ ASDCP::MD_to_PCM_ADesc(MXF::WaveAudioDescriptor* ADescObj, PCM::AudioDescriptor&
   ADesc.QuantizationBits = ADescObj->QuantizationBits;
   ADesc.BlockAlign = ADescObj->BlockAlign;
   ADesc.AvgBps = ADescObj->AvgBps;
-  if ( ! ADescObj.LinkedTrackID.empty() )
+  if ( ! ADescObj->LinkedTrackID.empty() )
     {
       ADesc.LinkedTrackID = ADescObj->LinkedTrackID;
     }
-  assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL);
-  ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration;
-
+  if ( ! ADescObj->ContainerDuration.empty() )
+    {
+      assert(ADescObj->ContainerDuration <= 0xFFFFFFFFL);
+      ADesc.ContainerDuration = (ui32_t) ADescObj->ContainerDuration;
+    }
   ADesc.ChannelFormat = PCM::CF_NONE;
 
   if ( ! ADescObj->ChannelAssignment.empty() )
-- 
cgit v1.2.3