logging re-write

[asdcplib.git] / src / AS_DCP_MXF.cpp

diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp
index 247c2dadbca4411a1075fd027ccf079cd378163d..192965d78416c8f4d905a4cb8328bf8589594429 100755 (executable)
--- a/src/AS_DCP_MXF.cpp
+++ b/src/AS_DCP_MXF.cpp
@@ -148,22 +148,18 @@ ASDCP::EssenceType(const char* filename, EssenceType_t& type)
     {
       type = ESS_UNKNOWN;
       if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(RGBAEssenceDescriptor))) )
-       type = ESS_JPEG_2000;
-      else
        {
-         if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor))) )
-           type = ESS_PCM_24b_48k;
+         if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(StereoscopicPictureSubDescriptor))) )
+           type = ESS_JPEG_2000_S;
          else
-           {
-             if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(MPEG2VideoDescriptor))) )
-               type = ESS_MPEG2_VES;
-             else
-               {
-                 if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(DCTimedTextDescriptor))) )
-                   type = ESS_TIMED_TEXT;
-               }
-           }
+           type = ESS_JPEG_2000;
        }
+      else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(WaveAudioDescriptor))) )
+       type = ESS_PCM_24b_48k;
+      else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(MPEG2VideoDescriptor))) )
+       type = ESS_MPEG2_VES;
+      else if ( ASDCP_SUCCESS(TestHeader.GetMDObjectByType(OBJ_TYPE_ARGS(TimedTextDescriptor))) )
+       type = ESS_TIMED_TEXT;
     }
 
   return result;
@@ -206,14 +202,14 @@ ASDCP::RawEssenceType(const char* filename, EssenceType_t& type)
          if ( i > 1 && p[i] == 1 &&  (p[i+1] == ASDCP::MPEG2::SEQ_START || p[i+1] == ASDCP::MPEG2::PIC_START) )
            type = ESS_MPEG2_VES;
 
-         else if ( Kumu::StringIsXML((const char*)p, FB.Size()) )
-           type = ESS_TIMED_TEXT;
-
          else if ( ASDCP_SUCCESS(WavHeader.ReadFromBuffer(p, read_count, &data_offset)) )
            type = ESS_PCM_24b_48k;
 
          else if ( ASDCP_SUCCESS(AIFFHeader.ReadFromBuffer(p, read_count, &data_offset)) )
            type = ESS_PCM_24b_48k;
+
+         else if ( Kumu::StringIsXML((const char*)p, FB.Size()) )
+           type = ESS_TIMED_TEXT;
        }
     }
   else if ( Kumu::PathIsDirectory(filename) )