[vlc-commits] demux: adaptive: always set minimal pts-delay

Francois Cartegnie git at videolan.org
Wed Feb 1 16:11:27 CET 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Feb  1 13:41:27 2017 +0100| [bc75607f9fcb9afc0b848bfbfb06ff123adb0a06] | committer: Francois Cartegnie

demux: adaptive: always set minimal pts-delay

always starts after min buffering

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

 modules/demux/adaptive/PlaylistManager.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index e26bd0d..b3dad99 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -600,15 +600,7 @@ int PlaylistManager::doControl(int i_query, va_list args)
         }
 
         case DEMUX_GET_PTS_DELAY:
-            if( logicType != AbstractAdaptationLogic::RateBased )
-            {
-                *va_arg (args, int64_t *) = INT64_C(1000) *
-                    var_InheritInteger(p_demux, "network-caching");
-            }
-            else
-            {
-                *va_arg (args, int64_t *) = 1000 * INT64_C(1000);
-            }
+            *va_arg (args, int64_t *) = 1000 * INT64_C(1000);
             break;
 
         default:



More information about the vlc-commits mailing list