dash: Rework profile handling.

Profile was parsed twice.

modules/stream_filter/dash/mpd/BasicCMParser.cpp

@@ -75,12 +75,6 @@ bool    BasicCMParser::setMPD()
     this->mpd = new MPD;
 
     std::map<std::string, std::string>::const_iterator  it;
-    it = attr.find( "profile" );
-    if ( it == attr.end() )
-        it = attr.find( "profiles" ); //The standard spells it the two ways...
-    if ( it != attr.end() )
-        this->mpd->setProfile( it->second );
-
     it = attr.find("mediaPresentationDuration");
     /*
         Standard specifies a default of "On-Demand",

modules/stream_filter/dash/mpd/IsoffMainParser.cpp

@@ -62,10 +62,6 @@ void    IsoffMainParser::setMPDAttributes   ()
 
     std::map<std::string, std::string>::const_iterator it;
 
-    it = attr.find("profiles");
-    if(it != attr.end())
-        this->mpd->setProfile(it->second);
-
     it = attr.find("mediaPresentationDuration");
     if(it != attr.end())
         this->mpd->setDuration(str_duration(it->second.c_str()));

modules/stream_filter/dash/mpd/MPD.cpp

@@ -167,15 +167,3 @@ void MPD::setProfile(Profile profile)
 {
     this->profile = profile;
 }
-
-void MPD::setProfile( const std::string &strProfile )
-{
-    if( strProfile == "urn:mpeg:mpegB:profile:dash:isoff-basic-on-demand:cm" )
-        this->profile = dash::mpd::BasicCM;
-    else if ( strProfile == "urn:mpeg:mpegB:profile:dash:full:2011" )
-        this->profile = dash::mpd::Full2011;
-    else if ( strProfile == "urn:mpeg:dash:profile:isoff-main:2011" )
-        this->profile = dash::mpd::IsoffMain;
-    else
-        this->profile = dash::mpd::UnknownProfile;
-}

modules/stream_filter/dash/mpd/MPD.h

@@ -45,7 +45,6 @@ namespace dash
                 virtual ~MPD();
 
                 Profile                         getProfile() const;
-                void                            setProfile( const std::string &strProfile );
                 void                            setProfile( Profile profile );
                 bool                            isLive() const;
                 void                            setLive( bool live );

modules/stream_filter/dash/mpd/MPDFactory.cpp

@@ -49,7 +49,7 @@ MPD* MPDFactory::createBasicCMMPD    (dash::xml::Node *root, stream_t *p_stream)
 
     if(mpdParser.parse() == false || mpdParser.getMPD() == NULL)
         return NULL;
-
+    mpdParser.getMPD()->setProfile( dash::mpd::BasicCM );
     return mpdParser.getMPD();
 }
 MPD* MPDFactory::createIsoffMainMPD  (dash::xml::Node *root, stream_t *p_stream)
@@ -58,6 +58,6 @@ MPD* MPDFactory::createIsoffMainMPD  (dash::xml::Node *root, stream_t *p_stream)
 
     if(mpdParser.parse() == false || mpdParser.getMPD() == NULL)
         return NULL;
-
+    mpdParser.getMPD()->setProfile( dash::mpd::IsoffMain );
     return mpdParser.getMPD();
 }

modules/stream_filter/dash/xml/DOMParser.cpp

@@ -157,7 +157,9 @@ Profile DOMParser::getProfile               ()
     if(this->root == NULL)
         return dash::mpd::UnknownProfile;
 
-    const std::string profile = this->root->getAttributeValue("profiles");
+    std::string profile = this->root->getAttributeValue("profiles");
+    if ( profile.length() == 0 )
+        profile = this->root->getAttributeValue("profile"); //The standard spells it the both ways...
 
     if(profile.find("urn:mpeg:mpegB:profile:dash:isoff-basic-on-demand:cm") != std::string::npos ||
             profile.find("urn:mpeg:dash:profile:isoff-ondemand:2011") != std::string::npos ||