Commit 110b6818 authored by Christopher Mueller's avatar Christopher Mueller Committed by Hugo Beauzée-Luyssen

dash: added generic mpd generation

Signed-off-by: default avatarHugo Beauzée-Luyssen <beauze.h@gmail.com>
parent 1def2aa7
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "xml/DOMParser.h" #include "xml/DOMParser.h"
#include "http/HTTPConnectionManager.h" #include "http/HTTPConnectionManager.h"
#include "adaptationlogic/IAdaptationLogic.h" #include "adaptationlogic/IAdaptationLogic.h"
#include "mpd/BasicCMParser.h" #include "mpd/MPDFactory.h"
#define SEEK 0 #define SEEK 0
...@@ -90,19 +90,18 @@ static int Open(vlc_object_t *p_obj) ...@@ -90,19 +90,18 @@ static int Open(vlc_object_t *p_obj)
msg_Dbg( p_stream, "Could not parse mpd file." ); msg_Dbg( p_stream, "Could not parse mpd file." );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
//Begin the actual MPD parsing: //Begin the actual MPD parsing:
dash::mpd::BasicCMParser mpdParser( parser.getRootNode(), p_stream->p_source ); dash::mpd::MPD *mpd = dash::mpd::MPDFactory::create(parser.getRootNode(), p_stream->p_source, parser.getProfile());
if ( mpdParser.parse() == false || mpdParser.getMPD() == NULL )
{ if(mpd == NULL)
msg_Err( p_obj, "MPD file parsing failed." );
return VLC_EGENERIC; return VLC_EGENERIC;
}
stream_sys_t *p_sys = (stream_sys_t *) malloc(sizeof(stream_sys_t)); stream_sys_t *p_sys = (stream_sys_t *) malloc(sizeof(stream_sys_t));
if (unlikely(p_sys == NULL)) if (unlikely(p_sys == NULL))
return VLC_ENOMEM; return VLC_ENOMEM;
p_sys->p_mpd = mpdParser.getMPD(); p_sys->p_mpd = mpd;
dash::http::HTTPConnectionManager *p_conManager = dash::http::HTTPConnectionManager *p_conManager =
new dash::http::HTTPConnectionManager( p_stream ); new dash::http::HTTPConnectionManager( p_stream );
dash::DASHManager*p_dashManager = dash::DASHManager*p_dashManager =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment