Added loopcount, fixed seeking issue

Author: dschreij

mediadecoder/decoder.py

@@ -7,7 +7,6 @@
 # MoviePy
 try:
 	from moviepy.video.io.VideoFileClip import VideoFileClip
-	from moviepy.tools import cvsecs
 	import numpy as np
 except ImportError as e:
 	print("""Error importing dependencies:
@@ -126,6 +125,8 @@ def reset(self):
 		self.status = UNINITIALIZED
 		self.clock.reset()
 
+		self.loop_count = 0
+
 	def load_media(self, mediafile, play_audio=True):
 		""" Loads a media file to decode. 
 
@@ -323,7 +324,8 @@ def seek(self, value):
 		"""
 		# Pause the stream
 		self.pause()
-		self.clock.time = value
+		# Make sure the movie starts at 1s as 0s gives trouble.
+		self.clock.time = max(0.5, value)
 		logger.debug("Seeking to {} seconds; frame {}".format(self.clock.time, 
 			self.clock.current_frame))
 		if self.audioformat:
@@ -334,7 +336,7 @@ def seek(self, value):
 	def rewind(self):
 		""" Rewinds the video to the beginning.
 		Convenience function simply calling seek(0). """
-		self.seek(0)
+		self.seek(0.5)
 
 	def __calculate_audio_frames(self):
 		""" Aligns audio with video. 
@@ -374,7 +376,8 @@ def __render(self):
 				if self.loop:
 					logger.debug("Looping: restarting stream")
 					# Seek to the start
-					self.seek(0)
+					self.rewind()
+					self.loop_count += 1
 				else:
 					# End of stream has been reached
 					self.status = EOS

mediadecoder/soundrenderers/pyaudiorenderer2.py

@@ -39,7 +39,7 @@ def __init__(self, audioformat, queue=None):
 		self.stream = self.pa.open(
 			channels  	= audioformat["nchannels"],
 			rate 		= audioformat["fps"],
-			frames_per_buffer = audioformat['buffersize'],
+			#frames_per_buffer = audioformat['buffersize']/2,
 			format 	= pyaudio.get_format_from_width(audioformat["nbytes"]),
 			output 	= True,
 		)

mediadecoder/soundrenderers/sounddevicerenderer2.py

@@ -36,6 +36,7 @@ def __init__(self, audioformat, queue=None):
 		global sd
 		import sounddevice as sd
 
+		# Init thread
 		super(SoundrendererSounddevice, self).__init__()
 
 		if not queue is None: