By Anders Holst:

* My previous code for "slow rewind" (aka "SeekBackHack") is not
  required any more. Indeed, since the change in "decoder states"
  some time ago my code stopped working and is now only destructively
  interfering with the new winding approach, effectively ruining the
  speed accuracy for slow rewind. Similarly, the "non-smooth winding"
  code ruins the accuracy for high winding speeds. The patch below
  removes the "SeekBackHack", and temporarily disables the
  "non-smooth winding" code until we know whether the decoder states
  will allow simultaneous repeat and skip rates
  again. (InfoBarGenerics.py)

* Due to a bug in 'eDVBTSTools::findNextPicture', rewind was always
  at the required speed minus one. (The frame just played was counted
  as one when skipping backwards.) Fixed below. (tstools.cpp)

* A piece of code to apparently increase precision in seeking, by
  always aligning to an i-frame start, had exactly the opposite
  effect: GOP single-stepping fails completely on DM7025 and gets
  highly unreliable on DM800. The piece of code is removed.
  (It destructively interferes with previous code by me to hit frames
  somewhat before the GOP start. As an alternative, my previous code
  can be removed instead, and the currently removed piece of code
  adjusted to work. But then it has to be done differently on the two
  platforms.) (dvb.cpp)

* By some reason eDVBVideo::getPTS only returns even numbers on DM800
  even when it should be odd. This ruins GOP single stepping in 50%
  of the cases. This is easy to compensate for by adding a margin of
  1 in getAccessPoint. (pvrparse.cpp)

* After the above, when GOP single-stepping works reliable on both
  platforms and on SD/HD, the correct step lengths can be
  used. (InfoBarGenerics.py)

1 files changed, 12 insertions, 19 deletions

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2f830616..5336f9a0 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -692,8 +692,6 @@ class InfoBarSeek:
 				iPlayableService.evSOF: self.__evSOF,
 			})
 
-		self.minSpeedBackward = useSeekBackHack and 16 or 0
-
 		class InfoBarSeekActionMap(HelpableActionMap):
 			def __init__(self, screen, *args, **kwargs):
 				HelpableActionMap.__init__(self, screen, *args, **kwargs)
@@ -740,24 +738,19 @@ class InfoBarSeek:
 		self.__seekableStatusChanged()
 
 	def makeStateForward(self, n):
-		minspeed = config.seek.stepwise_minspeed.value
-		repeat = int(config.seek.stepwise_repeat.value)
-		if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-			return (0, n * repeat, repeat, ">> %dx" % n)
-		else:
+#		minspeed = config.seek.stepwise_minspeed.value
+#		repeat = int(config.seek.stepwise_repeat.value)
+#		if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
+#			return (0, n * repeat, repeat, ">> %dx" % n)
+#		else:
 			return (0, n, 0, ">> %dx" % n)
 
 	def makeStateBackward(self, n):
-		minspeed = config.seek.stepwise_minspeed.value
-		repeat = int(config.seek.stepwise_repeat.value)
-		if self.minSpeedBackward and n < self.minSpeedBackward:
-			r = (self.minSpeedBackward - 1)/ n + 1
-			if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-				r = max(r, repeat)
-			return (0, -n * r, r, "<< %dx" % n)
-		elif minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-			return (0, -n * repeat, repeat, "<< %dx" % n)
-		else:
+#		minspeed = config.seek.stepwise_minspeed.value
+#		repeat = int(config.seek.stepwise_repeat.value)
+#		if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
+#			return (0, -n * repeat, repeat, "<< %dx" % n)
+#		else:
 			return (0, -n, 0, "<< %dx" % n)
 
 	def makeStateSlowMotion(self, n):
@@ -877,7 +870,7 @@ class InfoBarSeek:
 			if config.seek.on_pause.value == "play":
 				self.unPauseService()
 			elif config.seek.on_pause.value == "step":
-				self.doSeekRelative(0)
+				self.doSeekRelative(1)
 			elif config.seek.on_pause.value == "last":
 				self.setSeekState(self.lastseekstate)
 				self.lastseekstate = self.SEEK_STATE_PLAY
@@ -950,7 +943,7 @@ class InfoBarSeek:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 			self.doSeekRelative(-6)
 		elif seekstate == self.SEEK_STATE_PAUSE:
-			self.doSeekRelative(-3)
+			self.doSeekRelative(-1)
 		elif self.isStateForward(seekstate):
 			speed = seekstate[1]
 			if seekstate[2]: