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-02-info.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/as-02-info.cpp')

diff --git a/src/as-02-info.cpp b/src/as-02-info.cpp
index b469591..dd769a8 100644
--- a/src/as-02-info.cpp
+++ b/src/as-02-info.cpp
@@ -1,5 +1,7 @@
 /*
 Copyright (c) 2003-2016, John Hurst, Wolfgang Ruppel
+
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -238,12 +240,18 @@ class MyPictureDescriptor : public JP2K::PictureDescriptor
     if ( m_RGBADescriptor != 0 )
       {
     	SampleRate = m_RGBADescriptor->SampleRate;
-    	ContainerDuration = m_RGBADescriptor->ContainerDuration;
+        if ( ! m_RGBADescriptor->ContainerDuration.empty() )
+          {
+            ContainerDuration = m_RGBADescriptor->ContainerDuration;
+          }
       }
     else if ( m_CDCIDescriptor != 0 )
       {
     	SampleRate = m_CDCIDescriptor->SampleRate;
-    	ContainerDuration = m_CDCIDescriptor->ContainerDuration;
+        if ( ! m_CDCIDescriptor->ContainerDuration.empty() )
+          {
+            ContainerDuration = m_CDCIDescriptor->ContainerDuration;
+          }
       }
     else
       {
@@ -376,7 +384,10 @@ class MyACESPictureDescriptor : public AS_02::ACES::PictureDescriptor
     if ( m_RGBADescriptor != 0 )
       {
     	SampleRate = m_RGBADescriptor->SampleRate;
-    	ContainerDuration = m_RGBADescriptor->ContainerDuration;
+        if ( ! m_RGBADescriptor->ContainerDuration.empty() )
+          {
+            ContainerDuration = m_RGBADescriptor->ContainerDuration;
+          }
       }
     else
       {
@@ -475,7 +486,10 @@ class MyAudioDescriptor : public PCM::AudioDescriptor
     if ( m_WaveAudioDescriptor != 0 )
       {
 	AudioSamplingRate = m_WaveAudioDescriptor->SampleRate;
-	ContainerDuration = m_WaveAudioDescriptor->ContainerDuration;
+        if ( ! m_WaveAudioDescriptor->ContainerDuration.empty() )
+          {
+            ContainerDuration = m_WaveAudioDescriptor->ContainerDuration;
+          }
       }
     else
       {
-- 
cgit v1.2.3