[vlc-commits] demux: dash: make playlist update failure non fatal

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jun 10 16:30:23 2015 +0200| [f801e7d750256c2695a4999e6197691fb0713291] | committer: Francois Cartegnie

demux: dash: make playlist update failure non fatal

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f801e7d750256c2695a4999e6197691fb0713291
---

 modules/demux/dash/DASHManager.cpp |    2 ++
 modules/demux/dash/dash.cpp        |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
index 94d7bcc..e39ef6b 100644
--- a/modules/demux/dash/DASHManager.cpp
+++ b/modules/demux/dash/DASHManager.cpp
@@ -83,6 +83,7 @@ bool DASHManager::updatePlaylist()
         if(!mpdstream)
         {
             free(p_data);
+            nextPlaylistupdate = now + playlist->minUpdatePeriod.Get();
             return false;
         }
 
@@ -90,6 +91,7 @@ bool DASHManager::updatePlaylist()
         if(!parser.parse())
         {
             stream_Delete(mpdstream);
+            nextPlaylistupdate = now + playlist->minUpdatePeriod.Get();
             return false;
         }
 
diff --git a/modules/demux/dash/dash.cpp b/modules/demux/dash/dash.cpp
index 72e2507..e5a17ef 100644
--- a/modules/demux/dash/dash.cpp
+++ b/modules/demux/dash/dash.cpp
@@ -202,7 +202,7 @@ static int Demux(demux_t *p_demux)
     }
 
     if( !p_sys->p_dashManager->updatePlaylist() )
-        return VLC_DEMUXER_EOF;
+        msg_Warn(p_demux, "Can't update MPD");
 
     return VLC_DEMUXER_SUCCESS;
 }