working j2c as-02

1 files changed, 18 insertions, 12 deletions

diff --git a/src/AS_DCP_ATMOS.cpp b/src/AS_DCP_ATMOS.cpp
index 63b5557..e8a2a8a 100644
--- a/src/AS_DCP_ATMOS.cpp
+++ b/src/AS_DCP_ATMOS.cpp
@@ -147,20 +147,26 @@ ASDCP::ATMOS::MXFReader::h__Reader::OpenRead(const char* filename)
   Result_t result = DCData::h__Reader::OpenRead(filename);
 
   if( ASDCP_SUCCESS(result) )
-  {
-
-    if (NULL == m_EssenceSubDescriptor)
-    {
-      InterchangeObject* iObj = NULL;
-      result = m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(DolbyAtmosSubDescriptor), &iObj);
-      m_EssenceSubDescriptor = static_cast<MXF::DolbyAtmosSubDescriptor*>(iObj);
-    }
-
-    if ( ASDCP_SUCCESS(result) )
     {
-      result = MD_to_Atmos_ADesc(m_ADesc);
+      
+      if (NULL == m_EssenceSubDescriptor)
+	{
+	  InterchangeObject* iObj = NULL;
+	  result = m_HeaderPart.GetMDObjectByType(OBJ_TYPE_ARGS(DolbyAtmosSubDescriptor), &iObj);
+	  m_EssenceSubDescriptor = static_cast<MXF::DolbyAtmosSubDescriptor*>(iObj);
+	  
+	  if ( iObj == 0 )
+	    {
+	      DefaultLogSink().Error("DolbyAtmosSubDescriptor object not found.\n");
+	      return RESULT_FORMAT;
+	    }
+	}
+
+      if ( ASDCP_SUCCESS(result) )
+	{
+	  result = MD_to_Atmos_ADesc(m_ADesc);
+	}
     }
-  }
 
   return result;
 }