summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hurst <jhurst@cinecert.com>2020-02-10 08:57:06 -0800
committerGitHub <noreply@github.com>2020-02-10 08:57:06 -0800
commit73654fbe490c25c5b9bad8cd137ab72f71ac706a (patch)
tree03a985cccac07ac8c6b77890af36e57aa34bda7d
parent5d86f368b2bade7bca7700c74f198ef7f4129b44 (diff)
parent66b458bf91d5d73943bd1b6f632d4d5431de4828 (diff)
Merge pull request #26 from remia/fix/st_wrap_error_diagnostic
Improve error diagnostic in timed text parser
-rw-r--r--src/TimedText_Parser.cpp21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp
index 6b6d006..020baf3 100644
--- a/src/TimedText_Parser.cpp
+++ b/src/TimedText_Parser.cpp
@@ -380,16 +380,21 @@ 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;