[vlc-commits] demux: adaptive: remove buffering defaults from playlist

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Mar 30 13:59:51 2020 +0200| [81fbb77b62a2fd0d98b05a0b575bc3630ad698a9] | committer: Francois Cartegnie

demux: adaptive: remove buffering defaults from playlist

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

 modules/demux/adaptive/playlist/AbstractPlaylist.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
index 52839a5dff..cf1f930140 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
@@ -118,14 +118,12 @@ void AbstractPlaylist::setMaxBuffering( vlc_tick_t max )
 
 vlc_tick_t AbstractPlaylist::getMinBuffering() const
 {
-    return std::max(minBufferTime, VLC_TICK_FROM_SEC(6));
+    return minBufferTime;
 }
 
 vlc_tick_t AbstractPlaylist::getMaxBuffering() const
 {
-    const vlc_tick_t minbuf = getMinBuffering();
-    const vlc_tick_t maxbuf = maxBufferTime ? maxBufferTime : VLC_TICK_FROM_SEC(60);
-    return std::max(minbuf, maxbuf);
+    return maxBufferTime;
 }
 
 Url AbstractPlaylist::getUrlSegment() const