Improve error diagnostic in timed text parser

[asdcplib.git] / src / TimedText_Parser.cpp

diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp
index 5aeacf17139253a685d0ac56b1702c6e6b8b14b5..ff53e6748c1776434756c42656c485ee4ad62681 100644 (file)
--- a/src/TimedText_Parser.cpp
+++ b/src/TimedText_Parser.cpp
@@ -151,7 +151,12 @@ get_UUID_from_element(XMLElement* Element, UUID& ID)
 {
   assert(Element);
   const char* p = Element->GetBody().c_str();
-  if ( strncmp(p, "urn:uuid:", 9) == 0 )    p += 9;
+
+  if ( strncmp(p, "urn:uuid:", 9) == 0 )
+    {
+      p += 9;
+    }
+  
   return ID.DecodeHex(p);
 }
 
@@ -159,9 +164,15 @@ get_UUID_from_element(XMLElement* Element, UUID& ID)
 bool
 get_UUID_from_child_element(const char* name, XMLElement* Parent, UUID& outID)
 {
-  assert(name); assert(Parent);
+  assert(name);
+  assert(Parent);
   XMLElement* Child = Parent->GetChildWithName(name);
-  if ( Child == 0 )    return false;
+
+  if ( Child == 0 )
+    {
+      return false;
+    }
+
   return get_UUID_from_element(Child, outID);
 }
 
@@ -200,7 +211,7 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead(const std::strin
 Result_t
 ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead()
 {
-  if ( ! m_Root.ParseString(m_XMLDoc.c_str()) )
+  if ( ! m_Root.ParseString(m_XMLDoc) )
     return RESULT_FORMAT;
 
   m_TDesc.EncodingName = "UTF-8"; // the XML parser demands UTF-8
@@ -249,7 +260,10 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead()
        && m_TDesc.EditRate != EditRate_60
        && m_TDesc.EditRate != EditRate_96
        && m_TDesc.EditRate != EditRate_100
-       && m_TDesc.EditRate != EditRate_120 )
+       && m_TDesc.EditRate != EditRate_120
+       && m_TDesc.EditRate != EditRate_192
+       && m_TDesc.EditRate != EditRate_200
+       && m_TDesc.EditRate != EditRate_240 )
     {
       DefaultLogSink(). Error("Unexpected EditRate: %d/%d\n",
                              m_TDesc.EditRate.Numerator, m_TDesc.EditRate.Denominator);
@@ -366,17 +380,23 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::ReadAncillaryResource(con
 
   Result_t result = Resolver.ResolveRID(uuid, FrameBuf);
 
+  std::string resourceType;
+  if ( (*rmi).second == MT_PNG )
+    resourceType = "image/png";
+  else if ( (*rmi).second == MT_OPENTYPE )
+    resourceType = "application/x-font-opentype";
+  else
+    resourceType = "application/octet-stream";
+
   if ( KM_SUCCESS(result) )
     {
-      if ( (*rmi).second == MT_PNG )
-       FrameBuf.MIMEType("image/png");
-             
-      else if ( (*rmi).second == MT_OPENTYPE )
-       FrameBuf.MIMEType("application/x-font-opentype");
-
-      else
-       FrameBuf.MIMEType("application/octet-stream");
+      FrameBuf.MIMEType(resourceType);
+    }
+  else
+    {
+      DefaultLogSink().Error("Resource not found: %s (%s)\n", TmpID.EncodeHex(buf, 64), resourceType.c_str());
     }
+    
 
   return result;
 }