Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Find Period element under MPD 

It assumed that the first element is Period but it could be a BaseURL
which caused a DCHECK crash.

Change-Id: I75bdafdd312bfbcdf81cc76b44f8e2d0f1542976
This commit is contained in:
Rintaro Kuroiwa 2014-02-03 18:01:45 -08:00
parent d07007a5d2
commit e8714a1374
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mpd/base/mpd_builder.cc
View File

@ -9,6 +9,7 @@
#include "mpd/base/mpd_utils.h" #include "mpd/base/mpd_utils.h"
#include "mpd/base/xml/xml_node.h" #include "mpd/base/xml/xml_node.h"
#include "third_party/libxml/src/include/libxml/tree.h" #include "third_party/libxml/src/include/libxml/tree.h"
#include "third_party/libxml/src/include/libxml/xmlstring.h"
// TODO(rkuroiwa): If performance is a problem work on fine grained locking. // TODO(rkuroiwa): If performance is a problem work on fine grained locking.
namespace dash_packager { namespace dash_packager {
@ -54,6 +55,29 @@ void AddMpdNameSpaceInfo(XmlNode* mpd) {
mpd->SetStringAttribute("xsi:schemaLocation", kDashSchemaMpd2011); mpd->SetStringAttribute("xsi:schemaLocation", kDashSchemaMpd2011);
} }
bool IsPeriodNode(xmlNodePtr node) {
DCHECK(node);
int kEqual = 0;
return xmlStrcmp(node->name, reinterpret_cast<const xmlChar*>("Period")) ==
kEqual;
}
// Find the first <Period> element. This does not recurse down the tree,
// only checks direct children. Returns the pointer to Period element on
// success, otherwise returns false.
// As noted here, we must traverse.
// http://www.xmlsoft.org/tutorial/ar01s04.html
xmlNodePtr FindPeriodNode(XmlNode* xml_node) {
for (xmlNodePtr node = xml_node->GetRawPtr()->xmlChildrenNode;
node != NULL;
node = node->next) {
if (IsPeriodNode(node))
return node;
}
return NULL;
}
} // namespace } // namespace
MpdBuilder::MpdBuilder(MpdType type) MpdBuilder::MpdBuilder(MpdType type)
@ -184,10 +208,9 @@ float MpdBuilder::GetStaticMpdDuration(XmlNode* mpd_node) {
DCHECK(mpd_node); DCHECK(mpd_node);
DCHECK_EQ(MpdBuilder::kStatic, type_); DCHECK_EQ(MpdBuilder::kStatic, type_);
xmlNodePtr period_node = xmlFirstElementChild(mpd_node->GetRawPtr()); xmlNodePtr period_node = FindPeriodNode(mpd_node);
DCHECK(period_node); DCHECK(period_node) << "Period element must be a child of mpd_node.";
DCHECK_EQ(strcmp(reinterpret_cast<const char*>(period_node->name), "Period"), DCHECK(IsPeriodNode(period_node));
0);
// Attribute mediaPresentationDuration must be present for 'static' MPD. So // Attribute mediaPresentationDuration must be present for 'static' MPD. So
// setting "PT0S" is required even if none of the representaions have duration // setting "PT0S" is required even if none of the representaions have duration