Changeset 324

Timestamp:

Jul 19, 2011, 10:22:19 PM (13 years ago)

Author:

Rick van der Zwet

Message:

Be smarter about the datasize

File:

• py-tcpmultiplexer/TCPMultiplexer.py (modified) (2 diffs)

py-tcpmultiplexer/TCPMultiplexer.py

@@ -135 +135 @@
         dataheader[urlid] = f.read(44)
       elif datatype == 'mjpeg':
-        data  = f.read(1024 * 1024)
-
-        # Get the required headers
+        data  = f.read(1024)
+
+        # Get the required headers and acurate datasize
         headers = []
+        datasize = 1024 * 1024
         for header in data.splitlines():
           if not header.strip():
@@ -146 +147 @@
             else:
               continue
+          if header.startswith('DataLen:') or header.startswith('Content-length:'):
+            datasize = int(header.split(':')[1])
           headers.append(header)
         boundry = headers[0]
+
+        logger.info("Data Length: %s", datasize)
         logger.info("Boundry line: %s", boundry)
         logger.info("Image headers %s", headers)
 
+        data = data + f.read(datasize * 2)
         valid_image = boundry + data.split(boundry)[1]
         dataheader[urlid] = valid_image + '\n'.join(headers) + '\n'