[xine-cvs] HG: xine-lib-1.2: Optimize tickets 7.

[Torsten J. <t....@gm...>]

# HG changeset patch
# User Torsten Jager <t....@gm...>
# Date 1516642825 -3600
# Node ID 2d5b2f9b1257ca18af1cb8484263100d175c66b2
# Branch  default
# Parent  74cd6a4532ed148ea8b5ab6fc9a16ffa291e73f9
Optimize tickets 7.
 - Now that engine respects pause consistently, do an
   explicit live pause during network buffering.

diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2017 the xine project
+ * Copyright (C) 2000-2018 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -36,8 +36,11 @@
 #define LOG
 */
 
+#include "net_buf_ctrl.h"
 
-#include "net_buf_ctrl.h"
+#ifndef XINE_LIVE_PAUSE_ON
+# define XINE_LIVE_PAUSE_ON 0x7ffffffd
+#endif
 
 #define DEFAULT_HIGH_WATER_MARK 5000 /* in 1/1000 s */
 
@@ -114,6 +117,8 @@
 
   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "\nnet_buf_ctrl: nbc_set_speed_pause\n");
   _x_set_speed (stream, XINE_SPEED_PAUSE);
+  /* allow decoding while paused */
+  _x_set_fine_speed (stream, XINE_LIVE_PAUSE_ON);
   stream->xine->clock->set_option (stream->xine->clock, CLOCK_SCR_ADJUSTABLE, 0);
 }
 
@@ -214,6 +219,8 @@
         /* Pause on first a/v buffer. Decoder headers went through at this time
            already, and xine_play is done waiting for that */
         _x_set_fine_speed (this->stream, 0);
+        /* allow decoding while paused */
+        _x_set_fine_speed (this->stream, XINE_LIVE_PAUSE_ON);
         xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "net_buf_ctrl: prebuffering...\n");
         break;
       }