Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
thisiselijah committed May 18, 2024
1 parent 5decacd commit 7a2631d
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 12 deletions.
Binary file modified .DS_Store
Binary file not shown.
63 changes: 52 additions & 11 deletions Client.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,17 @@ class Client:
PLAY = 1
PAUSE = 2
TEARDOWN = 3

SPEED0 = 4
SPEED1 = 5
SPEED2 = 6
SPEED3 = 7
SPEED4 = 8

RTSP_VER = "RTSP/1.0"
TRANSPORT = "RTP/UDP"





Expand All @@ -38,7 +46,9 @@ def __init__(self, master, serveraddr, serverport, rtpport, filename):
self.master = master
self.master.protocol("WM_DELETE_WINDOW", self.handler)
self.user_os = platform.system()
self.speed = ['x0.5', 'x0.75', 'x1.0', 'x1.25', '1.5']
self.createWidgets()

self.serverAddr = serveraddr
self.serverPort = int(serverport)
self.rtpPort = int(rtpport)
Expand All @@ -50,6 +60,9 @@ def __init__(self, master, serveraddr, serverport, rtpport, filename):
self.connectToServer()
self.frameNbr = 0






def createWidgets(self):
Expand Down Expand Up @@ -93,10 +106,11 @@ def createWidgets(self):
self.menu_0 = Menu(self.menubar)
self.menu_1 = Menu(self.menu_0)

self.menu_1.add_command(label="x1.0")
self.menu_1.add_command(label="x1.5")
self.menu_1.add_command(label="x1.75")
self.menu_1.add_command(label="x2.0")
self.var = StringVar(value="")
for element in self.speed:
if element=='x1.0':
self.var.set(element)
self.menu_1.add_radiobutton(label=element, variable=self.var, value=element, command=self.playSpeed)
self.menu_0.add_cascade(label='Speed', menu=self.menu_1)
self.menubar.add_cascade(label='Option', menu=self.menu_0)
self.master.config(menu=self.menubar)
Expand Down Expand Up @@ -129,6 +143,26 @@ def playMovie(self):
self.playEvent = threading.Event()
self.playEvent.clear()
self.sendRtspRequest(self.PLAY)
def playSpeed(self):
try:
ps = self.var.get()
if ps == 'x0.5':
self.sendRtspRequest(self.SPEED0)
elif ps == 'x0.75':
self.sendRtspRequest(self.SPEED1)
elif ps == 'x1.0':
self.sendRtspRequest(self.SPEED2)
elif ps == 'x1.25':
self.sendRtspRequest(self.SPEED3)
elif ps == 'x1.5':
self.sendRtspRequest(self.SPEED4)
else:
self.sendRtspRequest(self.SPEED2)
except:
pass




def listenRtp(self):
"""Listen for RTP packets."""
Expand Down Expand Up @@ -211,7 +245,7 @@ def sendRtspRequest(self, requestCode):

# Pause request
elif requestCode == self.PAUSE and self.state == self.PLAYING:
pass

# Update RTSP sequence number.
self.rtspSeq+=1

Expand All @@ -223,7 +257,7 @@ def sendRtspRequest(self, requestCode):

# Teardown request
elif requestCode == self.TEARDOWN and not self.state == self.INIT:
pass

# Update RTSP sequence number.
self.rtspSeq+=1

Expand All @@ -232,6 +266,17 @@ def sendRtspRequest(self, requestCode):

# Keep track of the sent request.
self.requestSent = self.TEARDOWN

elif requestCode == self.SPEED0:
pass
elif requestCode == self.SPEED1:
pass
elif requestCode == self.SPEED2:
pass
elif requestCode == self.SPEED3:
pass
elif requestCode == self.SPEED4:
pass
else:
return

Expand Down Expand Up @@ -320,8 +365,4 @@ def handler(self):
self.exitClient()
else: # When the user presses cancel, resume playing.
self.playMovie()

def playSpeed(self):
label = self.filemenu.entrycget(0, 'label')
pass


2 changes: 1 addition & 1 deletion ServerWorker.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def recvRtspRequest(self):
while True:
data = connSocket.recv(256)
if data:
print ("DATA RECEIVED: \n", data)
print ("DATA RECEIVED: \n"+data.decode('utf-8'))
self.processRtspRequest(data)

def processRtspRequest(self, data):
Expand Down
Binary file modified __pycache__/Client.cpython-311.pyc
Binary file not shown.
Binary file modified __pycache__/ServerWorker.cpython-311.pyc
Binary file not shown.
Binary file added cache-472055.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added cache-800644.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed test‎.mp4
Binary file not shown.

0 comments on commit 7a2631d

Please sign in to comment.