fix #155

Author: previ

Diff for: api.py

@@ -135,7 +135,8 @@ def turn(data):
 
 def exec(data):
     program = prog_engine.create(data["name"], data["code"])
-    return json.dumps(program.execute())
+    options = data["options"]
+    return json.dumps(program.execute(options))
 
 ## System
 

Diff for: cv/camera.py

@@ -29,7 +29,7 @@
 
 class Camera(object):
 
-    FFMPEG_CMD = 'MP4Box'
+    FFMPEG_CMD = 'ffmpeg'
     PHOTO_FILE_EXT = ".jpg"
     VIDEO_FILE_EXT = ".mp4"
     VIDEO_FILE_EXT_H264 = '.h264'
@@ -90,7 +90,10 @@ def video_stop(self):
         self.camera.stop_recording(2)
 
         # pack in mp4 container
-        params = " -fps " + str(self.camera.framerate) + " -add "  + self.video_filename + self.VIDEO_FILE_EXT_H264 + "  " + self.video_filename + self.VIDEO_FILE_EXT
+        params = " -loglevel quiet -stats -framerate " + str(self.camera.framerate) + \
+                 " -i "  + self.video_filename + self.VIDEO_FILE_EXT_H264 + \
+                 " -c copy " + self.video_filename + self.VIDEO_FILE_EXT
+
         os.system(self.FFMPEG_CMD + params)
         # remove h264 file
         os.remove(self.video_filename + self.VIDEO_FILE_EXT_H264)

Diff for: program.py

@@ -148,21 +148,19 @@ def dom_code(self):
         return self._dom_code
 
     def __init__(self, name, code=None, dom_code=None, default=False):
-        #super(Program, self).__init__()
         self._thread = None
         self.name = name
         self._dom_code = dom_code
         self._code = code
         self._default = default
 
-    def execute(self):
+    def execute(self, options={}):
         if self._running:
             raise RuntimeError('already running')
 
         self._running = True
-
         try:
-            self._thread = threading.Thread(target=self.run)
+            self._thread = threading.Thread(target=self.run, args=(options,))
             self._thread.start()
         except RuntimeError as re:
             logging.error("RuntimeError: %s", str(re))
@@ -187,15 +185,16 @@ def is_running(self):
     def is_default(self):
         return self._default
 
-    def run(self):
+    def run(self, *args):
+        options = args[0]
         try:
             program = self
             try:
-                if config.Config.get().get("prog_video_rec") == "true":
-                    get_cam().video_rec(program.name)
+                if options.get("autoRecVideo") == True:
+                    get_cam().video_rec(program.name.replace(" ", "_"))
                     logging.debug("starting video")
-            except Exception:
-                logging.error("Camera not available")
+            except Exception as e:
+                logging.error("Camera not available: " + str(e))
 
             self._log = "" #clear log
             imports = "import json\n"