introduce HLSSettings.minBufferLengthCapping

minimum buffer length capping value (max value) if minBufferLength is set to -1
mangui · Sep 28, 2015 · 0f5aa7b · 0f5aa7b
1 parent 053f713
commit 0f5aa7b
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -63,6 +63,7 @@ The plugin accepts several **optional** configuration options, such as:
   - `hls_debug2` (default false) - Toggle _verbose debug_ traces, outputted on JS console
   - `hls_minbufferlength` (default -1) - Minimum buffer length in _seconds_ that needs to be reached before playback can start (after seeking) or restart (in case of empty buffer)
     - If set to `-1` some heuristics based on past metrics are used to define an accurate value that should prevent buffer to stall
+  - `minBufferLengthCapping` (default -1) - minimum buffer length capping value (max value) if minBufferLength is set to -1
   - `hls_lowbufferlength` (default 3) - Low buffer threshold in _seconds_. When crossing down this threshold, HLS will switch to buffering state, usually the player will report this buffering state through a rotating icon. Playback will still continue.
   - `hls_maxbufferlength` (default 300) - Maximum buffer length in _seconds_ (0 means infinite buffering)
   - `hls_maxbackbufferlength` (default 30) - Maximum back buffer length in _seconds_ (0 means infinite back buffering). back buffer is seekable without redownloading segments.

diff --git a/bin/debug/flashls.swc b/bin/debug/flashls.swc
diff --git a/bin/debug/flashlsChromeless.swf b/bin/debug/flashlsChromeless.swf
diff --git a/bin/debug/flashlsFlowPlayer.swf b/bin/debug/flashlsFlowPlayer.swf
diff --git a/bin/debug/flashlsOSMF.swc b/bin/debug/flashlsOSMF.swc
diff --git a/bin/debug/flashlsOSMF.swf b/bin/debug/flashlsOSMF.swf
diff --git a/bin/release/flashls.swc b/bin/release/flashls.swc
diff --git a/bin/release/flashlsChromeless.swf b/bin/release/flashlsChromeless.swf
diff --git a/bin/release/flashlsFlowPlayer.swf b/bin/release/flashlsFlowPlayer.swf
diff --git a/bin/release/flashlsOSMF.swc b/bin/release/flashlsOSMF.swc
diff --git a/bin/release/flashlsOSMF.swf b/bin/release/flashlsOSMF.swf
diff --git a/src/org/mangui/hls/HLSSettings.as b/src/org/mangui/hls/HLSSettings.as
@@ -58,6 +58,17 @@ package org.mangui.hls {
          */
         public static var minBufferLength : Number = -1;
 
+
+        /**
+         * minBufferLengthCapping
+         *
+         * Defines minimum buffer length capping value (max value) if minBufferLength is set to -1
+         *
+         * Default is -1 = no capping
+         */
+        public static var minBufferLengthCapping : Number = -1;
+
+
         /**
          * maxBufferLength
          *

diff --git a/src/org/mangui/hls/controller/BufferThresholdController.as b/src/org/mangui/hls/controller/BufferThresholdController.as
@@ -93,6 +93,12 @@ package org.mangui.hls.controller {
                 if (HLSSettings.maxBufferLength) {
                     _minBufferLength = Math.min(HLSSettings.maxBufferLength, _minBufferLength);
                 }
+
+                // avoid _minBufferLength > minBufferLengthCapping
+                if (HLSSettings.minBufferLengthCapping > 0) {
+                    _minBufferLength = Math.min(HLSSettings.minBufferLengthCapping, _minBufferLength);
+                }
+
                 CONFIG::LOGGING {
                     Log.debug2("AutoBufferController:minBufferLength:" + _minBufferLength);
                 }