From b84c10f838fd23b1690865e8f59be75790fdd30a Mon Sep 17 00:00:00 2001
From: unknown <taylerporter@gmail.com>
Date: Fri, 14 Aug 2020 12:14:54 +0900
Subject: [PATCH] Added time.sleeps to non blocking while loops to lower CPU
 requirements.

---
 pyVoIP/RTP.py      | 14 ++++++++++----
 pyVoIP/SIP.py      |  4 ++--
 pyVoIP/VoIP.py     | 20 ++++++++++----------
 pyVoIP/__init__.py |  2 +-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pyVoIP/RTP.py b/pyVoIP/RTP.py
index c68adaa..6e5bab7 100644
--- a/pyVoIP/RTP.py
+++ b/pyVoIP/RTP.py
@@ -112,7 +112,7 @@ def __init__(self):
     
   def read(self, length=160):
     while self.rebuilding: #This acts functionally as a lock while the buffer is being rebuilt.
-      print("Rebuilding")
+      time.sleep(0.01)
     self.bufferLock.acquire()
     packet = self.buffer.read(length)
     if len(packet)<length:
@@ -249,8 +249,14 @@ def stop(self):
     self.sin.close()
     self.sout.close()
     
-  def read(self, length=160):
-    return self.pmin.read(length)
+  def read(self, length=160, blocking=False):
+    if not blocking:
+      return self.pmin.read(length)
+    packet = self.pmin.read(length)
+    while packet == bytes(length) and self.NSD:
+      time.sleep(0.01)
+      packet = self.pmin.read(length)
+    return packet
     
   def write(self, data):
     self.pmout.write(self.outOffset, data)
@@ -262,7 +268,7 @@ def recv(self):
         packet = self.sin.recv(8192)
         self.parsePacket(packet)
       except BlockingIOError:
-        pass
+        time.sleep(0.01)
       except RTPParseError as e:
         print(str(e))
       except OSError:
diff --git a/pyVoIP/SIP.py b/pyVoIP/SIP.py
index 76c9675..ff02348 100644
--- a/pyVoIP/SIP.py
+++ b/pyVoIP/SIP.py
@@ -517,7 +517,7 @@ def recv(self):
         else:
           print("TODO: Add 400 Error on non processable request")
       except BlockingIOError:
-        pass
+        time.sleep(0.01)
       except SIPParseError as e:
         if "SIP Version" in str(e):
           request = self.genSIPVersionNotSupported(message)
@@ -712,7 +712,7 @@ def register(self):
     self.out.sendto(regRequest.encode('utf8'), (self.server, self.port))
     
     response = SIPMessage(self.s.recv(8192))
-    
+    print(response.summary())
     if response.status != SIPStatus(401):
       if response.status == SIPStatus(500):
         self.recvLock.release()
diff --git a/pyVoIP/VoIP.py b/pyVoIP/VoIP.py
index 5258b5a..481de67 100644
--- a/pyVoIP/VoIP.py
+++ b/pyVoIP/VoIP.py
@@ -34,6 +34,8 @@ def __init__(self, phone, request, session_id, myIP, rtpPortLow, rtpPortHigh):
     self.dtmfLock = Lock()
     self.dtmf = io.StringIO()
     
+    self.RTPClients = []
+    
     self.connections = 0
     self.audioPorts = 0
     self.videoPorts = 0
@@ -68,7 +70,7 @@ def __init__(self, phone, request, session_id, myIP, rtpPortLow, rtpPortHigh):
       print("Unable to assign ports for RTP.") 
       return
     
-    self.RTPClients = []
+    
     
     for i in request.body['m']:
       assoc = {}
@@ -111,7 +113,6 @@ def getDTMF(self, length=1):
     packet = self.dtmf.read(length)
     self.dtmfLock.release()
     return packet
-    
 
   def answer(self):
     if self.state != CallState.RINGING:
@@ -152,17 +153,16 @@ def writeAudio(self, data):
     for x in self.RTPClients:
       x.write(data)
       
-  def readAudio(self, length = 160):
+  def readAudio(self, length=160, blocking=False):
+    if len(self.RTPClients) == 1:
+      return self.RTPClients[0].read(length, blocking)
     data = []
     for x in self.RTPClients:
       data.append(x.read(length))
-    if len(data) == 1:
-      return data[0]
-    else:
-      nd = audioop.add(data.pop(0), data.pop(0), 1) #Mix audio from different sources before returning
-      for d in data:
-        nd = audioop.add(nd, d, 1)
-      return nd
+    nd = audioop.add(data.pop(0), data.pop(0), 1) #Mix audio from different sources before returning
+    for d in data:
+      nd = audioop.add(nd, d, 1)
+    return nd
       
 
 class VoIPPhone():
diff --git a/pyVoIP/__init__.py b/pyVoIP/__init__.py
index a7f523d..4735b30 100644
--- a/pyVoIP/__init__.py
+++ b/pyVoIP/__init__.py
@@ -1,6 +1,6 @@
 __all__ = ['SIP', 'RTP', 'VoIP']
 
-version_info = (0, 5, 0, 'Beta')
+version_info = (0, 5, 2, '')
 
 __version__ = ".".join([str(x) for x in version_info])