diff --git a/floppies/giulia/main.py b/floppies/giulia/main.py index 83091ea..93d9241 100644 --- a/floppies/giulia/main.py +++ b/floppies/giulia/main.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python import subprocess diff --git a/floppies/giulia/noweb/cgi-bin/index.cgi b/floppies/giulia/noweb/cgi-bin/index.cgi index b313494..fe114c5 100755 --- a/floppies/giulia/noweb/cgi-bin/index.cgi +++ b/floppies/giulia/noweb/cgi-bin/index.cgi @@ -67,7 +67,7 @@ print Template(u"""
{% for i in items %} - +

{{i.mp4}}

{% endfor %}
diff --git a/floppies/giulia/scripts/recordwalk.py b/floppies/giulia/scripts/recordwalk.py index f2327d9..7133696 100644 --- a/floppies/giulia/scripts/recordwalk.py +++ b/floppies/giulia/scripts/recordwalk.py @@ -11,8 +11,8 @@ from picamera import PiCamera p = ArgumentParser("") p.add_argument("--video", type=int, default=0, help="video, default: 0") p.add_argument("--output", default=None, help="path to save movie, default: None (show live)") -p.add_argument("--width", type=int, default=640, help="pre-detect resize width") -p.add_argument("--height", type=int, default=480, help="pre-detect resize height") +p.add_argument("--width", type=int, default=160, help="pre-detect resize width") +p.add_argument("--height", type=int, default=128, help="pre-detect resize height") p.add_argument("--fourcc", default="XVID", help="MJPG,mp4v,XVID") p.add_argument("--framerate", type=float, default=25, help="output frame rate") p.add_argument("--show", default=False, action="store_true") @@ -20,9 +20,9 @@ p.add_argument("--frames", type=int, default=100) args = p.parse_args() fourcc = None -cam = cv2.VideoCapture(args.video) -cam.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, args.width) -cam.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, args.height) +#cam = cv2.VideoCapture(args.video) +#cam.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, args.width) +#cam.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, args.height) if args.output: try: @@ -36,7 +36,7 @@ else: print ("Starting camera", file=sys.stderr) cam = PiCamera() -framesize = (160, 128) +framesize = (args.width, args.height) cam.resolution = framesize cam.framerate = 32 rawCapture = PiRGBArray(cam, size=framesize) diff --git a/floppies/giulia/scripts/voiceguide.sh b/floppies/giulia/scripts/voiceguide.sh old mode 100644 new mode 100755