From 1ae4158e789f1baa998126c4780666046933bf23 Mon Sep 17 00:00:00 2001 From: Rémi Achard Date: Thu, 23 Jan 2020 00:12:49 +0000 Subject: Improve error diagnostic in timed text parser --- src/TimedText_Parser.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/TimedText_Parser.cpp') diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp index 6b6d006..ff53e67 100644 --- a/src/TimedText_Parser.cpp +++ b/src/TimedText_Parser.cpp @@ -380,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; } -- cgit v1.2.3 From 66b458bf91d5d73943bd1b6f632d4d5431de4828 Mon Sep 17 00:00:00 2001 From: Rémi Achard Date: Thu, 23 Jan 2020 00:20:34 +0000 Subject: Style fix --- src/TimedText_Parser.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/TimedText_Parser.cpp') diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp index ff53e67..020baf3 100644 --- a/src/TimedText_Parser.cpp +++ b/src/TimedText_Parser.cpp @@ -396,7 +396,6 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::ReadAncillaryResource(con { DefaultLogSink().Error("Resource not found: %s (%s)\n", TmpID.EncodeHex(buf, 64), resourceType.c_str()); } - return result; } -- cgit v1.2.3