[vlc-devel] [PATCH 1/5] adaptive: PlaylistManager: remove savecancel

Alexandre Janniaux ajanni at videolabs.io
Sun Nov 1 12:34:17 CET 2020


We don't use cancellation in this code.
---
 modules/demux/adaptive/PlaylistManager.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index 0e7b62a141..447f4b0365 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -646,21 +646,17 @@ void PlaylistManager::Run()

         if(needsUpdate())
         {
-            int canc = vlc_savecancel();
             if(updatePlaylist())
                 scheduleNextUpdate();
             else
                 failedupdates++;
-            vlc_restorecancel(canc);
         }

         vlc_mutex_lock(&demux.lock);
         vlc_tick_t i_nzpcr = demux.i_nzpcr;
         vlc_mutex_unlock(&demux.lock);

-        int canc = vlc_savecancel();
         AbstractStream::buffering_status i_return = bufferize(i_nzpcr, i_min_buffering, i_extra_buffering);
-        vlc_restorecancel( canc );

         if(i_return != AbstractStream::buffering_lessthanmin)
         {
--
2.29.2


More information about the vlc-devel mailing list