-

previ · previ · commit 11fafe0000f0 · 2015-10-25T09:51:54.000Z
diff --git a/camera.py b/camera.py
@@ -42,7 +42,7 @@ class Camera(Thread):
 
   _instance = None
   _img_template = image.Image.load("coderdojo-logo.png")
-  stream_port = 9080
+  stream_port = 8080
 
   @classmethod
   def get_instance(cls):
@@ -55,7 +55,7 @@ def __init__(self):
     logging.info("starting camera")
     cam_props = {"width":640, "height":480, "cv_image_factor":config.Config.get().get("cv_image_factor", 4), "exposure_mode": config.Config.get().get("camera_exposure_mode"), "jpeg_quality": int(config.Config.get().get("camera_jpeg_quality", 20))}
     self._camera = camera.Camera(props=cam_props)
-    self._streamer = streamer.JpegStreamer("0.0.0.0:"+str(self.stream_port), st=0.1)
+    #self._streamer = streamer.JpegStreamer("0.0.0.0:"+str(self.stream_port), st=0.1)
     self.recording = False
     self.video_start_time = time.time() + 8640000
     self._run = True
@@ -107,9 +107,12 @@ def get_image(self, maxage = MAX_IMAGE_AGE):
     return image.Image(self._camera.get_image_bgr())
 
   def save_image(self, image_jpeg):
-    self._streamer.set_image(image_jpeg)
+    #self._streamer.set_image(image_jpeg)
     self._image_time=time.time()
 
+  def get_image_jpeg(self):
+    return copy.copy (self._camera.get_image_jpeg())
+
   def set_text(self, text):
     self._camera.set_overlay_text(str(text))
 
@@ -186,8 +189,8 @@ def delete_photo(self, filename):
     self._photos.remove(filename)
 
   def exit(self):
-    self._streamer.server.shutdown()
-    self._streamer.server_thread.join()
+    #self._streamer.server.shutdown()
+    #self._streamer.server_thread.join()
     self._run = False
     self.join()
 
diff --git a/main.py b/main.py
@@ -20,6 +20,7 @@
 import os
 import json
 import logging
+import time
 import logging.handlers
 
 from coderbot import CoderBot, PIN_PUSHBUTTON
@@ -29,7 +30,7 @@
 from program import ProgramEngine, Program
 from config import Config
 
-from flask import Flask, render_template, request, send_file, redirect
+from flask import Flask, render_template, request, send_file, redirect, Response
 from flask.ext.babel import Babel
 #from flask_sockets import Sockets
 
@@ -136,6 +137,40 @@ def handle_bot_status():
     logging.info( "bot_status" )
     return json.dumps({'status': 'ok'}) 
 
+def video_stream(cam):
+    refresh_timeout = float(app.bot_config.get("camera_refresh_timeout", "0.1")) 
+    while True:
+        last_refresh_time = time.time()
+        frame = cam.get_image_jpeg()
+        yield ("--BOUNDARYSTRING\r\n" +
+               "Content-type: image/jpeg\r\n" +
+               "Content-Length: " + str(len(frame)) + "\r\n\r\n" +
+               frame + "\r\n")
+        now = time.time()
+        if now - last_refresh_time < refresh_timeout:
+            time.sleep(refresh_timeout - (now - last_refresh_time))
+
+@app.route("/video")
+def handle_video():
+    return """
+<html>
+<head>
+<style type=text/css>
+    body { background-image: url(http://github.com/video/stream); background-repeat:no-repeat; background-position:center top; background-attachment:fixed; height:100% }
+</style>
+</head>
+<body>
+&nbsp;
+</body>
+</html>
+"""
+
+@app.route("/video/stream")
+def handle_video_stream():
+    try:
+        return Response(video_stream(cam), mimetype="multipart/x-mixed-replace; boundary=--BOUNDARYSTRING")
+    except: pass
+
 @app.route("/photos", methods=["GET"])
 def handle_photos():
     logging.info("photos")
diff --git a/templates/config_params.html b/templates/config_params.html
@@ -31,7 +31,7 @@
 </script>
 <style>
 .ui-content-stream {
-background:url('http://{{host}}:{{stream_port}}/stream') no-repeat;
+background:url('http://{{host}}:{{stream_port}}/video/stream') no-repeat;
 background-size: auto 100% !important;
 background-position: center;
 padding:0px;
