[vlc-commits] dash: added buffer size to prefs

[Christopher Mueller]

vlc | branch: master | Christopher Mueller <christopher.mueller at itec.aau.at> | Tue Feb 14 16:43:46 2012 +0100| [dfd6aafed587f402d15391ad7700c8374cc4795e] | committer: Hugo Beauzée-Luyssen

dash: added buffer size to prefs

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h at gmail.com>

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

 modules/stream_filter/dash/buffer/BlockBuffer.cpp |    2 +-
 modules/stream_filter/dash/dash.cpp               |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/stream_filter/dash/buffer/BlockBuffer.cpp b/modules/stream_filter/dash/buffer/BlockBuffer.cpp
index 4dfdb21..7b983d6 100644
--- a/modules/stream_filter/dash/buffer/BlockBuffer.cpp
+++ b/modules/stream_filter/dash/buffer/BlockBuffer.cpp
@@ -36,7 +36,7 @@ BlockBuffer::BlockBuffer    (stream_t *stream) :
              isEOF          (false)
 
 {
-    this->capacityMicroSec  = var_InheritInteger(stream, "dash-bufferSize") * 1000000;
+    this->capacityMicroSec  = var_InheritInteger(stream, "dash-buffersize") * 1000000;
 
     if(this->capacityMicroSec <= 0)
         this->capacityMicroSec = DEFAULTBUFFERLENGTH;
diff --git a/modules/stream_filter/dash/dash.cpp b/modules/stream_filter/dash/dash.cpp
index 3b1ac7a..d1ca988 100644
--- a/modules/stream_filter/dash/dash.cpp
+++ b/modules/stream_filter/dash/dash.cpp
@@ -54,6 +54,9 @@ static void Close   (vlc_object_t *);
 #define DASH_HEIGHT_TEXT N_("Preferred Height")
 #define DASH_HEIGHT_LONGTEXT N_("Preferred Height")
 
+#define DASH_BUFFER_TEXT N_("Buffer Size (Seconds)")
+#define DASH_BUFFER_LONGTEXT N_("Buffer size in seconds")
+
 vlc_module_begin ()
         set_shortname( N_("DASH"))
         set_description( N_("Dynamic Adaptive Streaming over HTTP") )
@@ -62,6 +65,7 @@ vlc_module_begin ()
         set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
         add_integer( "dash-prefwidth",  480, DASH_WIDTH_TEXT,  DASH_WIDTH_LONGTEXT,  true )
         add_integer( "dash-prefheight", 360, DASH_HEIGHT_TEXT, DASH_HEIGHT_LONGTEXT, true )
+        add_integer( "dash-buffersize", 30, DASH_BUFFER_TEXT, DASH_BUFFER_LONGTEXT, true )
         set_callbacks( Open, Close )
 vlc_module_end ()
 
@@ -116,9 +120,10 @@ static int Open(vlc_object_t *p_obj)
             new dash::DASHManager( p_conManager, p_sys->p_mpd,
                                    dash::logic::IAdaptationLogic::RateBased, p_stream);
 
-    if ( p_dashManager->getMpdManager() == NULL ||
-         p_dashManager->getMpdManager()->getMPD() == NULL ||
-         p_dashManager->getAdaptionLogic() == NULL )
+    if ( p_dashManager->getMpdManager()           == NULL   ||
+         p_dashManager->getMpdManager()->getMPD() == NULL   ||
+         p_dashManager->getAdaptionLogic()        == NULL   ||
+         p_dashManager->start()                   == false)
     {
         delete p_conManager;
         delete p_dashManager;