Changeset 320 for py-tcpmultiplexer

Timestamp:

Jul 19, 2011, 8:05:20 PM (13 years ago)

Author:

Rick van der Zwet

Message:

Making the boundry work

Location:

py-tcpmultiplexer

Files:

• TCPMultiplexer.py (modified) (2 diffs)
• htdocs/browser.html (modified) (1 diff)
• streams.yaml (added)

py-tcpmultiplexer/TCPMultiplexer.py

@@ -113 +113 @@
         datatype = 'wav'
       elif urltype == 'multipart/x-mixed-replace':
-        datatype = 'mjeg'
+        datatype = 'mjpeg'
       else:
         logger.warning("Cannot find file type of '%s'", url)
@@ -123 +123 @@
         # WAV header
         dataheader[urlid] = f.read(44)
-      elif datatype == 'mjeg':
-        # Get rid of Content-Length as not all pictures suits this setup
-        headers = f.read(100).splitlines()[0:3]
+      elif datatype == 'mjpeg':
+        data  = f.read(1024 * 1024)
+
+        # Get the required headers
+        headers = []
+        for header in data.splitlines():
+          if not header.strip(): break
+          headers.append(header)
+        boundry = headers[0]
+        logger.info("Boundry line: %s", boundry)
         logger.info("Image headers %s", headers)
-        valid_image = headers[0] + f.read(100000).split(headers[0])[1]
-        dataheader[urlid] = valid_image + '\n'.join([h for h in headers if not h.startswith('Content-length:')]) + '\n'
+
+        valid_image = boundry + data.split(boundry)[1]
+        dataheader[urlid] = valid_image + '\n'.join(headers) + '\n'
       else:
         dataheader[urlid] = ''

py-tcpmultiplexer/htdocs/browser.html

@@ -32 +32 @@
 
 <input type="button" onclick="changeVideo('/cam1/video')" value="Click to display Cam1" />
-<input type="button" onclick="changeVideo('/cam2/video')" value="Click to display Cam2" /><br />
+<input type="button" onclick="changeVideo('/cam2/video')" value="Click to display Cam2" />
+<input type="button" onclick="changeVideo('/cam3/video')" value="Click to display Cam3" />
+<br />
 <img id="player" src="img/logo.png" alt="Video feeds"/><br/>