add more empty() checks and adjust whitespace

2 files changed, 22 insertions, 6 deletions

diff --git a/src/AS_DCP_MPEG2.cpp b/src/AS_DCP_MPEG2.cpp
index 2a11de2..b7e6252 100755
--- a/src/AS_DCP_MPEG2.cpp
+++ b/src/AS_DCP_MPEG2.cpp
@@ -60,13 +60,29 @@ MD_to_MPEG2_VDesc(MXF::MPEG2VideoDescriptor* VDescObj, MPEG2::VideoDescriptor& V
 
   VDesc.ComponentDepth         = VDescObj->ComponentDepth;
   VDesc.HorizontalSubsampling  = VDescObj->HorizontalSubsampling;
-  VDesc.VerticalSubsampling    = VDescObj->VerticalSubsampling;
-  VDesc.ColorSiting            = VDescObj->ColorSiting;
-  VDesc.CodedContentType       = VDescObj->CodedContentType;
+  if ( ! VDescObj->VerticalSubsampling.empty() )
+    {
+      VDesc.VerticalSubsampling    = VDescObj->VerticalSubsampling;
+    }
+  if ( ! VDescObj->ColorSiting.empty() )
+    {
+      VDesc.ColorSiting            = VDescObj->ColorSiting;
+    }
+  if ( ! VDescObj->CodedContentType.empty() )
+    {
+      VDesc.CodedContentType       = VDescObj->CodedContentType;
+    }
 
   VDesc.LowDelay               = VDescObj->LowDelay.get() == 0 ? false : true;
-  VDesc.BitRate                = VDescObj->BitRate;
-  VDesc.ProfileAndLevel        = VDescObj->ProfileAndLevel;
+  if ( ! VDescObj->BitRate.empty() )
+    {
+      VDesc.BitRate                = VDescObj->BitRate;
+    }
+  if ( ! VDescObj->ProfileAndLevel.empty() )
+    {
+      VDesc.ProfileAndLevel        = VDescObj->ProfileAndLevel;
+    }
+
   return RESULT_OK;
 }
 
diff --git a/src/PCMParserList.cpp b/src/PCMParserList.cpp
index 67e7ef8..b814951 100755
--- a/src/PCMParserList.cpp
+++ b/src/PCMParserList.cpp
@@ -194,7 +194,7 @@ ASDCP::PCMParserList::OpenRead(const Kumu::PathList_t& argv, const Rational& Pic
 		}
 
               if ( I->ADesc.ContainerDuration < m_ADesc.ContainerDuration )
-	        m_ADesc.ContainerDuration = I->ADesc.ContainerDuration;
+                m_ADesc.ContainerDuration = I->ADesc.ContainerDuration;
 
 	      m_ADesc.BlockAlign += I->ADesc.BlockAlign;
 	    }