demux: adaptative: avoid drops when not restarting on seek

d5ddecc8 · Francois Cartegnie · 25575cbe · d5ddecc8
Commit d5ddecc8 authored Jul 16, 2015 by Francois Cartegnie
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

modules/demux/adaptative/Streams.cpp modules/demux/adaptative/Streams.cpp +7 -5

No files found.
--- a/modules/demux/adaptative/Streams.cpp
+++ b/modules/demux/adaptative/Streams.cpp
@@ -392,15 +392,17 @@ void BaseStreamOutput::setPosition(mtime_t nztime)
    {
        (*it)->drop();
    }
-    /* disable appending until restarted */
-    b_drop = true;
-    vlc_mutex_unlock(&lock);

    if(reinitsOnSeek())
+    {
+        /* disable appending until restarted */
+        b_drop = true;
+        vlc_mutex_unlock(&lock);
        restart();
+        vlc_mutex_lock(&lock);
+        b_drop = false;
+    }

-    vlc_mutex_lock(&lock);
-    b_drop = false;
    pcr = VLC_TS_INVALID;
    vlc_mutex_unlock(&lock);