From 18b3b0d5e04287ebb6354ce3a1968feebacfac66 Mon Sep 17 00:00:00 2001 From: Sven Koehler Date: Mon, 13 Oct 2014 01:44:05 +0200 Subject: [PATCH] Still that strange issue with sometimes crashing pygame --- FrameHandler.py | 6 +++--- MirrorHandler.py | 2 +- yuv2mp4.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FrameHandler.py b/FrameHandler.py index b702852..fffc5ca 100644 --- a/FrameHandler.py +++ b/FrameHandler.py @@ -17,7 +17,7 @@ def __del__(self): self.finish() def sessionName(self): - return str(self.streamInfo.get('deviceID', 'Unknown client')) + return str(self.streamInfo.get('deviceID', 'UnknownClient')) def start(self): """ Called on initialization. Reimplement in subclass if needed """ @@ -91,11 +91,11 @@ def handle(self, frame, timestamp): self.setupWindow(frame) # No idea why I need to keep that, but otherwise overlay.display crashes - dummyBufBecauseItSucks = frame.y + frame.u + frame.v + dummyBufBecauseItSucks = "%s%s%s" % (frame.y, frame.u, frame.v) self.overlay.display((frame.y, frame.u, frame.v)) dummyBufBecauseItSucks = "" pygame.event.get() - #self.clock.tick(5) + self.clock.tick(10) def finish(self): pygame.display.quit() diff --git a/MirrorHandler.py b/MirrorHandler.py index 05fcc32..1cad48a 100644 --- a/MirrorHandler.py +++ b/MirrorHandler.py @@ -85,7 +85,7 @@ def handlePacket(self, packet): elif packet.payloadType == MirroringPacket.TYPE_CODECDATA: self.decoder = h264decode.Decoder(packet.data) - self.frameHandler = FrameHandler.YUVFileStorage(self.streamInfo) + self.frameHandler = FrameHandler.SDLRenderer(self.streamInfo) def sendCapabilities(self): self.log_message("Sending capabilities") diff --git a/yuv2mp4.sh b/yuv2mp4.sh index c85bb6b..8c732ed 100755 --- a/yuv2mp4.sh +++ b/yuv2mp4.sh @@ -5,4 +5,4 @@ if [ $# -lt 1 ]; then exit 1 fi -ffmpeg -vcodec rawvideo -f rawvideo -pix_fmt yuv420p -s:v 1036x648 -r 25 -i $1 -c:v libx264 ${1%.yuv}.mp4 +ffmpeg -vcodec rawvideo -f rawvideo -pix_fmt yuv420p -s:v 1036x648 -r 25 -i "$1" -c:v libx264 "${1%.yuv}.mp4"